diff --git a/DEPS b/DEPS
index d374861..35c747f5 100644
--- a/DEPS
+++ b/DEPS

@@ -44,7 +44,7 @@
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
-  'v8_revision': '60617ee5d1815677b0aeb7321390b635f6be902e',
+  'v8_revision': '03ab3db7e516b4d71a0d372bc1fa7dc79ecefe31',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling swarming_client
   # and whatever else without interference from each other.
@@ -90,13 +90,13 @@
   # and whatever else without interference from each other.
   'nacl_revision': 'c948e9b82582e695d16ee6696a484f82239a86d7',
   # Three lines of non-changing comments so that
-  # the commit queue can handle CLs rolling freetype-android
+  # the commit queue can handle CLs rolling freetype
   # and whatever else without interference from each other.
-  'freetype_android_revision': '66725768cdf758cfb3f9abf03cbf5e5a77f42088',
+  'freetype_revision': '66725768cdf758cfb3f9abf03cbf5e5a77f42088',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling catapult
   # and whatever else without interference from each other.
-  'catapult_revision': '61ceb4a8f878ac2ab668e0eaede6755907b6905f',
+  'catapult_revision': '2de8e90be0fce0badb911dfdc460dc1688797bd8',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling libFuzzer
   # and whatever else without interference from each other.
@@ -413,8 +413,8 @@
     'src/third_party/cros_system_api':
       Var('chromium_git') + '/chromiumos/platform/system_api.git' + '@' + 'c08ae470458b06cf23c1907817490d2fc917ac29',
 
-    'src/third_party/freetype-android/src':
-      Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + Var('freetype_android_revision'),
+    'src/third_party/freetype/src':
+      Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + Var('freetype_revision'),
 
     # Build tools for Chrome OS. Note: This depends on third_party/pyelftools.
     'src/third_party/chromite':
@@ -479,8 +479,8 @@
     'src/third_party/findbugs':
       Var('chromium_git') + '/chromium/deps/findbugs.git' + '@' + '57f05238d3ac77ea0a194813d3065dd780c6e566',
 
-    'src/third_party/freetype-android/src':
-      Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + Var('freetype_android_revision'),
+    'src/third_party/freetype/src':
+      Var('chromium_git') + '/chromium/src/third_party/freetype2.git' + '@' + Var('freetype_revision'),
 
     'src/third_party/elfutils/src':
       Var('chromium_git') + '/external/elfutils.git' + '@' + '249673729a7e5dbd5de4f3760bdcaa3d23d154d7',

diff --git a/base/json/json_parser.cc b/base/json/json_parser.cc
index 1666c12..c6f6409d 100644
--- a/base/json/json_parser.cc
+++ b/base/json/json_parser.cc

@@ -444,7 +444,7 @@
   if (!ConsumeStringRaw(&string))
     return nullptr;
 
-  return base::MakeUnique<StringValue>(string.DestructiveAsString());
+  return base::MakeUnique<Value>(string.DestructiveAsString());
 }
 
 bool JSONParser::ConsumeStringRaw(StringBuilder* out) {

diff --git a/base/json/json_parser.h b/base/json/json_parser.h
index d2850e5..4f264583 100644
--- a/base/json/json_parser.h
+++ b/base/json/json_parser.h

@@ -31,7 +31,7 @@
 // to be used directly; it encapsulates logic that need not be exposed publicly.
 //
 // This parser guarantees O(n) time through the input string. It also optimizes
-// base::StringValue by using StringPiece where possible when returning Value
+// base::Value by using StringPiece where possible when returning Value
 // objects by using "hidden roots," discussed in the implementation.
 //
 // Iteration happens on the byte level, with the functions CanConsume and

diff --git a/base/json/json_perftest.cc b/base/json/json_perftest.cc
index 345f226..15222468 100644
--- a/base/json/json_perftest.cc
+++ b/base/json/json_perftest.cc

@@ -26,7 +26,7 @@
   list->Set(0, MakeUnique<Value>(2.718));
   list->Set(1, MakeUnique<Value>(false));
   list->Set(2, MakeUnique<Value>(123));
-  list->Set(3, MakeUnique<StringValue>("Bar"));
+  list->Set(3, MakeUnique<Value>("Bar"));
   root->Set("List", std::move(list));
 
   return root;

diff --git a/base/json/json_writer_unittest.cc b/base/json/json_writer_unittest.cc
index 083fdc7..6cb236f 100644
--- a/base/json/json_writer_unittest.cc
+++ b/base/json/json_writer_unittest.cc

@@ -47,7 +47,7 @@
   EXPECT_EQ("-0.8", output_js);
 
   // Test String values.
-  EXPECT_TRUE(JSONWriter::Write(StringValue("foo"), &output_js));
+  EXPECT_TRUE(JSONWriter::Write(Value("foo"), &output_js));
   EXPECT_EQ("\"foo\"", output_js);
 }
 

diff --git a/base/test/values_test_util.cc b/base/test/values_test_util.cc
index 6c1ee7d..ab12cfb 100644
--- a/base/test/values_test_util.cc
+++ b/base/test/values_test_util.cc

@@ -53,9 +53,8 @@
   EXPECT_EQ(expected_value, string_value) << key;
 }
 
-void ExpectStringValue(const std::string& expected_str,
-                       StringValue* actual) {
-  std::unique_ptr<StringValue> scoped_actual(actual);
+void ExpectStringValue(const std::string& expected_str, Value* actual) {
+  std::unique_ptr<Value> scoped_actual(actual);
   std::string actual_str;
   EXPECT_TRUE(scoped_actual->GetAsString(&actual_str));
   EXPECT_EQ(expected_str, actual_str);

diff --git a/base/test/values_test_util.h b/base/test/values_test_util.h
index 04af92e5..e545660 100644
--- a/base/test/values_test_util.h
+++ b/base/test/values_test_util.h

@@ -14,7 +14,6 @@
 class DictionaryValue;
 class ListValue;
 class Value;
-using StringValue = Value;
 
 // All the functions below expect that the value for the given key in
 // the given dictionary equals the given expected value.
@@ -40,8 +39,7 @@
                            const std::string& key);
 
 // Takes ownership of |actual|.
-void ExpectStringValue(const std::string& expected_str,
-                       StringValue* actual);
+void ExpectStringValue(const std::string& expected_str, Value* actual);
 
 namespace test {
 

diff --git a/base/trace_event/trace_event_argument.cc b/base/trace_event/trace_event_argument.cc
index da33c6d..db702b6 100644
--- a/base/trace_event/trace_event_argument.cc
+++ b/base/trace_event/trace_event_argument.cc

@@ -268,7 +268,7 @@
     } break;
 
     case base::Value::Type::STRING: {
-      const StringValue* string_value;
+      const Value* string_value;
       value.GetAsString(&string_value);
       SetStringWithCopiedName(name, string_value->GetString());
     } break;
@@ -322,7 +322,7 @@
     } break;
 
     case base::Value::Type::STRING: {
-      const StringValue* string_value;
+      const Value* string_value;
       value.GetAsString(&string_value);
       AppendString(string_value->GetString());
     } break;

diff --git a/base/trace_event/trace_event_memory_overhead.cc b/base/trace_event/trace_event_memory_overhead.cc
index 48a0d29f..8d56e1d8 100644
--- a/base/trace_event/trace_event_memory_overhead.cc
+++ b/base/trace_event/trace_event_memory_overhead.cc

@@ -77,9 +77,9 @@
       break;
 
     case Value::Type::STRING: {
-      const StringValue* string_value = nullptr;
+      const Value* string_value = nullptr;
       value.GetAsString(&string_value);
-      Add("StringValue", sizeof(StringValue));
+      Add("StringValue", sizeof(Value));
       AddString(string_value->GetString());
     } break;
 

diff --git a/base/value_conversions.cc b/base/value_conversions.cc
index a461e2c..9320fee 100644
--- a/base/value_conversions.cc
+++ b/base/value_conversions.cc

@@ -17,8 +17,8 @@
 
 // |Value| internally stores strings in UTF-8, so we have to convert from the
 // system native code to UTF-8 and back.
-StringValue* CreateFilePathValue(const FilePath& in_value) {
-  return new StringValue(in_value.AsUTF8Unsafe());
+Value* CreateFilePathValue(const FilePath& in_value) {
+  return new Value(in_value.AsUTF8Unsafe());
 }
 
 bool GetValueAsFilePath(const Value& value, FilePath* file_path) {
@@ -32,9 +32,9 @@
 
 // |Value| does not support 64-bit integers, and doubles do not have enough
 // precision, so we store the 64-bit time value as a string instead.
-StringValue* CreateTimeDeltaValue(const TimeDelta& time) {
+Value* CreateTimeDeltaValue(const TimeDelta& time) {
   std::string string_value = base::Int64ToString(time.ToInternalValue());
-  return new StringValue(string_value);
+  return new Value(string_value);
 }
 
 bool GetValueAsTimeDelta(const Value& value, TimeDelta* time) {

diff --git a/base/value_conversions.h b/base/value_conversions.h
index 6ce1bff..8a464ab 100644
--- a/base/value_conversions.h
+++ b/base/value_conversions.h

@@ -15,13 +15,12 @@
 class FilePath;
 class TimeDelta;
 class Value;
-using StringValue = Value;
 
 // The caller takes ownership of the returned value.
-BASE_EXPORT StringValue* CreateFilePathValue(const FilePath& in_value);
+BASE_EXPORT Value* CreateFilePathValue(const FilePath& in_value);
 BASE_EXPORT bool GetValueAsFilePath(const Value& value, FilePath* file_path);
 
-BASE_EXPORT StringValue* CreateTimeDeltaValue(const TimeDelta& time);
+BASE_EXPORT Value* CreateTimeDeltaValue(const TimeDelta& time);
 BASE_EXPORT bool GetValueAsTimeDelta(const Value& value, TimeDelta* time);
 
 }  // namespace base

diff --git a/base/values.cc b/base/values.cc
index 9aa04f33..18be7c79 100644
--- a/base/values.cc
+++ b/base/values.cc

@@ -290,9 +290,9 @@
   return is_string();
 }
 
-bool Value::GetAsString(const StringValue** out_value) const {
+bool Value::GetAsString(const Value** out_value) const {
   if (out_value && is_string()) {
-    *out_value = static_cast<const StringValue*>(this);
+    *out_value = static_cast<const Value*>(this);
     return true;
   }
   return is_string();
@@ -359,14 +359,12 @@
       return new Value(int_value_);
     case Type::DOUBLE:
       return new Value(double_value_);
-    // For now, make StringValues for backward-compatibility. Convert to
-    // Value when that code is deleted.
     case Type::STRING:
-      return new StringValue(*string_value_);
+      return new Value(*string_value_);
     // For now, make BinaryValues for backward-compatibility. Convert to
     // Value when that code is deleted.
     case Type::BINARY:
-      return new BinaryValue(*binary_value_);
+      return new Value(*binary_value_);
 
     // TODO(crbug.com/646113): Clean this up when DictionaryValue and ListValue
     // are completely inlined.
@@ -683,11 +681,11 @@
 }
 
 void DictionaryValue::SetString(StringPiece path, StringPiece in_value) {
-  Set(path, new StringValue(in_value));
+  Set(path, new Value(in_value));
 }
 
 void DictionaryValue::SetString(StringPiece path, const string16& in_value) {
-  Set(path, new StringValue(in_value));
+  Set(path, new Value(in_value));
 }
 
 void DictionaryValue::SetWithoutPathExpansion(StringPiece key,
@@ -717,12 +715,12 @@
 
 void DictionaryValue::SetStringWithoutPathExpansion(StringPiece path,
                                                     StringPiece in_value) {
-  SetWithoutPathExpansion(path, base::MakeUnique<base::StringValue>(in_value));
+  SetWithoutPathExpansion(path, base::MakeUnique<base::Value>(in_value));
 }
 
 void DictionaryValue::SetStringWithoutPathExpansion(StringPiece path,
                                                     const string16& in_value) {
-  SetWithoutPathExpansion(path, base::MakeUnique<base::StringValue>(in_value));
+  SetWithoutPathExpansion(path, base::MakeUnique<base::Value>(in_value));
 }
 
 bool DictionaryValue::Get(StringPiece path,
@@ -1281,11 +1279,11 @@
 }
 
 void ListValue::AppendString(StringPiece in_value) {
-  Append(MakeUnique<StringValue>(in_value));
+  Append(MakeUnique<Value>(in_value));
 }
 
 void ListValue::AppendString(const string16& in_value) {
-  Append(MakeUnique<StringValue>(in_value));
+  Append(MakeUnique<Value>(in_value));
 }
 
 void ListValue::AppendStrings(const std::vector<std::string>& in_values) {

diff --git a/base/values.h b/base/values.h
index a9578687..9610c281 100644
--- a/base/values.h
+++ b/base/values.h

@@ -39,7 +39,6 @@
 class DictionaryValue;
 class ListValue;
 class Value;
-using StringValue = Value;
 using BinaryValue = Value;
 
 // The Value class is the base class for Values. A Value can be instantiated
@@ -143,7 +142,7 @@
   bool GetAsDouble(double* out_value) const;
   bool GetAsString(std::string* out_value) const;
   bool GetAsString(string16* out_value) const;
-  bool GetAsString(const StringValue** out_value) const;
+  bool GetAsString(const Value** out_value) const;
   bool GetAsString(StringPiece* out_value) const;
   bool GetAsBinary(const BinaryValue** out_value) const;
   // ListValue::From is the equivalent for std::unique_ptr conversions.

diff --git a/base/values_unittest.cc b/base/values_unittest.cc
index b44f80c..3bcdc16 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc

@@ -43,42 +43,42 @@
 
 TEST(ValuesTest, ConstructStringFromConstCharPtr) {
   const char* str = "foobar";
-  StringValue value(str);
+  Value value(str);
   EXPECT_EQ(Value::Type::STRING, value.type());
   EXPECT_EQ("foobar", value.GetString());
 }
 
 TEST(ValuesTest, ConstructStringFromStdStringConstRef) {
   std::string str = "foobar";
-  StringValue value(str);
+  Value value(str);
   EXPECT_EQ(Value::Type::STRING, value.type());
   EXPECT_EQ("foobar", value.GetString());
 }
 
 TEST(ValuesTest, ConstructStringFromStdStringRefRef) {
   std::string str = "foobar";
-  StringValue value(std::move(str));
+  Value value(std::move(str));
   EXPECT_EQ(Value::Type::STRING, value.type());
   EXPECT_EQ("foobar", value.GetString());
 }
 
 TEST(ValuesTest, ConstructStringFromConstChar16Ptr) {
   string16 str = ASCIIToUTF16("foobar");
-  StringValue value(str.c_str());
+  Value value(str.c_str());
   EXPECT_EQ(Value::Type::STRING, value.type());
   EXPECT_EQ("foobar", value.GetString());
 }
 
 TEST(ValuesTest, ConstructStringFromString16) {
   string16 str = ASCIIToUTF16("foobar");
-  StringValue value(str);
+  Value value(str);
   EXPECT_EQ(Value::Type::STRING, value.type());
   EXPECT_EQ("foobar", value.GetString());
 }
 
 TEST(ValuesTest, ConstructStringFromStringPiece) {
   StringPiece str = "foobar";
-  StringValue value(str);
+  Value value(str);
   EXPECT_EQ(Value::Type::STRING, value.type());
   EXPECT_EQ("foobar", value.GetString());
 }
@@ -151,8 +151,8 @@
 }
 
 TEST(ValuesTest, CopyString) {
-  StringValue value("foobar");
-  StringValue copied_value(value);
+  Value value("foobar");
+  Value copied_value(value);
   EXPECT_EQ(value.type(), copied_value.type());
   EXPECT_EQ(value.GetString(), copied_value.GetString());
 
@@ -270,14 +270,14 @@
 }
 
 TEST(ValuesTest, MoveString) {
-  StringValue value("foobar");
-  StringValue moved_value(std::move(value));
+  Value value("foobar");
+  Value moved_value(std::move(value));
   EXPECT_EQ(Value::Type::STRING, moved_value.type());
   EXPECT_EQ("foobar", moved_value.GetString());
 
   Value blank;
 
-  blank = StringValue("foobar");
+  blank = Value("foobar");
   EXPECT_EQ(Value::Type::STRING, blank.type());
   EXPECT_EQ("foobar", blank.GetString());
 }
@@ -382,7 +382,7 @@
   mixed_list->Set(0, MakeUnique<Value>(true));
   mixed_list->Set(1, MakeUnique<Value>(42));
   mixed_list->Set(2, MakeUnique<Value>(88.8));
-  mixed_list->Set(3, MakeUnique<StringValue>("foo"));
+  mixed_list->Set(3, MakeUnique<Value>("foo"));
   ASSERT_EQ(4u, mixed_list->GetSize());
 
   Value *value = NULL;
@@ -459,17 +459,17 @@
 
 TEST(ValuesTest, StringValue) {
   // Test overloaded StringValue constructor.
-  std::unique_ptr<Value> narrow_value(new StringValue("narrow"));
+  std::unique_ptr<Value> narrow_value(new Value("narrow"));
   ASSERT_TRUE(narrow_value.get());
   ASSERT_TRUE(narrow_value->IsType(Value::Type::STRING));
-  std::unique_ptr<Value> utf16_value(new StringValue(ASCIIToUTF16("utf16")));
+  std::unique_ptr<Value> utf16_value(new Value(ASCIIToUTF16("utf16")));
   ASSERT_TRUE(utf16_value.get());
   ASSERT_TRUE(utf16_value->IsType(Value::Type::STRING));
 
   // Test overloaded GetAsString.
   std::string narrow = "http://google.com";
   string16 utf16 = ASCIIToUTF16("http://google.com");
-  const StringValue* string_value = NULL;
+  const Value* string_value = NULL;
   ASSERT_TRUE(narrow_value->GetAsString(&narrow));
   ASSERT_TRUE(narrow_value->GetAsString(&utf16));
   ASSERT_TRUE(narrow_value->GetAsString(&string_value));
@@ -487,8 +487,7 @@
   // Don't choke on NULL values.
   ASSERT_TRUE(narrow_value->GetAsString(static_cast<string16*>(NULL)));
   ASSERT_TRUE(narrow_value->GetAsString(static_cast<std::string*>(NULL)));
-  ASSERT_TRUE(narrow_value->GetAsString(
-                  static_cast<const StringValue**>(NULL)));
+  ASSERT_TRUE(narrow_value->GetAsString(static_cast<const Value**>(NULL)));
 }
 
 TEST(ValuesTest, ListDeletion) {
@@ -651,12 +650,11 @@
   std::unique_ptr<Value> scoped_double(new Value(3.14));
   Value* original_double = scoped_double.get();
   original_dict.Set("double", std::move(scoped_double));
-  std::unique_ptr<StringValue> scoped_string(new StringValue("hello"));
-  StringValue* original_string = scoped_string.get();
+  std::unique_ptr<Value> scoped_string(new Value("hello"));
+  Value* original_string = scoped_string.get();
   original_dict.Set("string", std::move(scoped_string));
-  std::unique_ptr<StringValue> scoped_string16(
-      new StringValue(ASCIIToUTF16("hello16")));
-  StringValue* original_string16 = scoped_string16.get();
+  std::unique_ptr<Value> scoped_string16(new Value(ASCIIToUTF16("hello16")));
+  Value* original_string16 = scoped_string16.get();
   original_dict.Set("string16", std::move(scoped_string16));
 
   std::vector<char> original_buffer(42, '!');
@@ -866,11 +864,10 @@
   std::unique_ptr<Value> scoped_double(new Value(3.14));
   Value* original_double = scoped_double.get();
   original_dict.Set("double", std::move(scoped_double));
-  std::unique_ptr<StringValue> scoped_string(new StringValue("hello"));
+  std::unique_ptr<Value> scoped_string(new Value("hello"));
   Value* original_string = scoped_string.get();
   original_dict.Set("string", std::move(scoped_string));
-  std::unique_ptr<StringValue> scoped_string16(
-      new StringValue(ASCIIToUTF16("hello16")));
+  std::unique_ptr<Value> scoped_string16(new Value(ASCIIToUTF16("hello16")));
   Value* original_string16 = scoped_string16.get();
   original_dict.Set("string16", std::move(scoped_string16));
 
@@ -972,7 +969,7 @@
   {
     std::unique_ptr<ListValue> inner(new ListValue);
     std::unique_ptr<ListValue> inner2(new ListValue);
-    inner2->Append(MakeUnique<StringValue>("hello"));
+    inner2->Append(MakeUnique<Value>("hello"));
     inner->Append(WrapUnique(new DictionaryValue));
     inner->Append(std::move(inner2));
     root->Set("list_with_empty_children", std::move(inner));
@@ -1070,7 +1067,7 @@
     ADD_FAILURE();
   }
 
-  StringValue value1("value1");
+  Value value1("value1");
   dict.Set("key1", value1.CreateDeepCopy());
   bool seen1 = false;
   for (DictionaryValue::Iterator it(dict); !it.IsAtEnd(); it.Advance()) {
@@ -1081,7 +1078,7 @@
   }
   EXPECT_TRUE(seen1);
 
-  StringValue value2("value2");
+  Value value2("value2");
   dict.Set("key2", value2.CreateDeepCopy());
   bool seen2 = seen1 = false;
   for (DictionaryValue::Iterator it(dict); !it.IsAtEnd(); it.Advance()) {
@@ -1110,7 +1107,7 @@
   Value bool_value(false);
   Value int_value(1234);
   Value double_value(12.34567);
-  StringValue string_value("foo");
+  Value string_value("foo");
   BinaryValue binary_value(Value::Type::BINARY);
   DictionaryValue dict_value;
   ListValue list_value;

diff --git a/build/linux/BUILD.gn b/build/linux/BUILD.gn
index 410f832a..4adeeb3 100644
--- a/build/linux/BUILD.gn
+++ b/build/linux/BUILD.gn

@@ -58,9 +58,8 @@
 group("freetype2") {
   if (is_chromecast) {
     # Chromecast platform doesn't provide freetype, so use Chromium's.
-    # The version in freetype-android is unmodified from freetype2 upstream.
     public_deps = [
-      "//third_party/freetype-android:freetype",
+      "//third_party/freetype",
     ]
   } else {
     public_configs = [ ":freetype2_config" ]

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/TileGroup.java b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/TileGroup.java
index 8c8b078..672f2d35 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/TileGroup.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/suggestions/TileGroup.java

@@ -23,6 +23,7 @@
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Log;
+import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.favicon.LargeIconBridge.LargeIconCallback;
@@ -240,34 +241,32 @@
     /**
      * Renders tile views in the given {@link TileGridLayout}, reusing existing tile views where
      * possible because view inflation and icon loading are slow.
-     * @param tileGridLayout The layout to render the tile views into.
+     * @param parent The layout to render the tile views into.
      * @param trackLoadTasks Whether to track load tasks.
      * @param condensed Whether to use a condensed layout.
      */
-    public void renderTileViews(
-            TileGridLayout tileGridLayout, boolean trackLoadTasks, boolean condensed) {
+    public void renderTileViews(ViewGroup parent, boolean trackLoadTasks, boolean condensed) {
         // Map the old tile views by url so they can be reused later.
         Map<String, TileView> oldTileViews = new HashMap<>();
-        int childCount = tileGridLayout.getChildCount();
+        int childCount = parent.getChildCount();
         for (int i = 0; i < childCount; i++) {
-            TileView tileView = (TileView) tileGridLayout.getChildAt(i);
+            TileView tileView = (TileView) parent.getChildAt(i);
             oldTileViews.put(tileView.getUrl(), tileView);
         }
 
         // Remove all views from the layout because even if they are reused later they'll have to be
         // added back in the correct order.
-        tileGridLayout.removeAllViews();
+        parent.removeAllViews();
 
         for (Tile tile : mTiles) {
             TileView tileView = oldTileViews.get(tile.getUrl());
             if (tileView == null) {
-                tileView = buildTileView(
-                        tile, tileGridLayout, trackLoadTasks, mTitleLinesCount, condensed);
+                tileView = buildTileView(tile, parent, trackLoadTasks, condensed);
             } else {
                 tileView.updateIfDataChanged(tile);
             }
 
-            tileGridLayout.addView(tileView);
+            parent.addView(tileView);
         }
     }
 
@@ -284,15 +283,15 @@
      * @param tile The tile that holds the data to populate the new tile view.
      * @param parentView The parent of the new tile view.
      * @param trackLoadTask Whether to track a load task.
-     * @param titleLines The number of text lines to use for each tile title.
      * @param condensed Whether to use a condensed layout.
      * @return The new tile view.
      */
-    private TileView buildTileView(Tile tile, ViewGroup parentView, boolean trackLoadTask,
-            int titleLines, boolean condensed) {
+    @VisibleForTesting
+    TileView buildTileView(
+            Tile tile, ViewGroup parentView, boolean trackLoadTask, boolean condensed) {
         TileView tileView = (TileView) LayoutInflater.from(parentView.getContext())
                                     .inflate(R.layout.tile_view, parentView, false);
-        tileView.initialize(tile, titleLines, condensed);
+        tileView.initialize(tile, mTitleLinesCount, condensed);
 
         // Note: It is important that the callbacks below don't keep a reference to the tile or
         // modify them as there is no guarantee that the same tile would be used to update the view.

diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
index 0f7f5b48..91faecf 100644
--- a/chrome/android/java_sources.gni
+++ b/chrome/android/java_sources.gni

@@ -1609,6 +1609,7 @@
   "junit/src/org/chromium/chrome/browser/physicalweb/UrlInfoTest.java",
   "junit/src/org/chromium/chrome/browser/snackbar/SnackbarCollectionUnitTest.java",
   "junit/src/org/chromium/chrome/browser/suggestions/TileGroupTest.java",
+  "junit/src/org/chromium/chrome/browser/suggestions/TileTest.java",
   "junit/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderUnitTest.java",
   "junit/src/org/chromium/chrome/browser/tabstate/TabStateUnitTest.java",
   "junit/src/org/chromium/chrome/browser/webapps/WebappDataStorageTest.java",

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/suggestions/TileGroupTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/suggestions/TileGroupTest.java
index fc193a7..045a9a0 100644
--- a/chrome/android/junit/src/org/chromium/chrome/browser/suggestions/TileGroupTest.java
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/suggestions/TileGroupTest.java

@@ -4,35 +4,54 @@
 
 package org.chromium.chrome.browser.suggestions;
 
-import static junit.framework.TestCase.assertNotNull;
-
-import static org.mockito.Mockito.inOrder;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
 
+import android.content.Context;
 import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.support.annotation.ColorRes;
 import android.support.annotation.DimenRes;
+import android.support.annotation.LayoutRes;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
 
+import org.hamcrest.CoreMatchers;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.InOrder;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.RealObject;
 import org.robolectric.shadows.ShadowResources;
 
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.EnableFeatures;
+import org.chromium.chrome.browser.favicon.LargeIconBridge.LargeIconCallback;
 import org.chromium.chrome.browser.ntp.ContextMenuManager;
-import org.chromium.chrome.browser.ntp.cards.NodeParent;
-import org.chromium.chrome.browser.ntp.cards.SuggestionsSection;
+import org.chromium.chrome.browser.ntp.NTPTileSource;
 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
 import org.chromium.testing.local.LocalRobolectricTestRunner;
 
@@ -40,7 +59,10 @@
  * Unit tests for {@link TileGroup}.
  */
 @RunWith(LocalRobolectricTestRunner.class)
-@Config(manifest = Config.NONE, shadows = {TileGroupTest.TileShadowResources.class})
+@Config(manifest = Config.NONE,
+        shadows = {TileGroupTest.TileShadowResources.class,
+                TileGroupTest.ShadowLayoutInflater.class})
+@EnableFeatures({})
 public class TileGroupTest {
     private static final int MAX_TILES_TO_FETCH = 4;
     private static final int TILE_TITLE_LINES = 1;
@@ -50,15 +72,7 @@
     public EnableFeatures.Processor mEnableFeatureProcessor = new EnableFeatures.Processor();
 
     @Mock
-    private SuggestionsSection.Delegate mDelegate;
-    @Mock
-    private NodeParent mParent;
-    @Mock
-    private SuggestionsUiDelegate mUiDelegate;
-    @Mock
     private TileGroup.Observer mTileGroupObserver;
-    @Mock
-    private OfflinePageBridge mOfflinePageBridge;
 
     private FakeTileGroupDelegate mTileGroupDelegate;
 
@@ -70,36 +84,243 @@
     }
 
     @Test
-    @EnableFeatures({ChromeFeatureList.NTP_OFFLINE_PAGES_FEATURE_NAME})
     public void testInitialiseWithEmptyTileList() {
-        TileGroup tileGroup = new TileGroup(RuntimeEnvironment.application, mUiDelegate,
-                mock(ContextMenuManager.class), mTileGroupDelegate, mTileGroupObserver,
-                mOfflinePageBridge, TILE_TITLE_LINES);
+        TileGroup tileGroup =
+                new TileGroup(RuntimeEnvironment.application, mock(SuggestionsUiDelegate.class),
+                        mock(ContextMenuManager.class), mTileGroupDelegate, mTileGroupObserver,
+                        mock(OfflinePageBridge.class), TILE_TITLE_LINES);
         tileGroup.startObserving(MAX_TILES_TO_FETCH);
         notifyTileUrlsAvailable();
 
+        // The TileGroup.Observer methods should be called even though no tiles are added, which is
+        // an initialisation but not real state change.
+        verify(mTileGroupObserver).onTileCountChanged();
+        verify(mTileGroupObserver).onLoadTaskCompleted();
+        verify(mTileGroupObserver).onTileDataChanged();
+    }
+
+    @Test
+    public void testInitialiseWithTileList() {
+        TileGroup tileGroup =
+                new TileGroup(RuntimeEnvironment.application, mock(SuggestionsUiDelegate.class),
+                        mock(ContextMenuManager.class), mTileGroupDelegate, mTileGroupObserver,
+                        mock(OfflinePageBridge.class), TILE_TITLE_LINES);
+        tileGroup.startObserving(MAX_TILES_TO_FETCH);
+
+        notifyTileUrlsAvailable(URLS);
+
         verify(mTileGroupObserver).onTileCountChanged();
         verify(mTileGroupObserver).onLoadTaskCompleted();
         verify(mTileGroupObserver).onTileDataChanged();
     }
 
     @Test
-    @EnableFeatures({ChromeFeatureList.NTP_OFFLINE_PAGES_FEATURE_NAME})
-    public void testInitialiseWithTileList() {
-        TileGroup tileGroup = new TileGroup(RuntimeEnvironment.application, mUiDelegate,
-                mock(ContextMenuManager.class), mTileGroupDelegate, mTileGroupObserver,
-                mOfflinePageBridge, TILE_TITLE_LINES);
+    public void testReceiveNewTilesWithoutChanges() {
+        TileGroup tileGroup =
+                new TileGroup(RuntimeEnvironment.application, mock(SuggestionsUiDelegate.class),
+                        mock(ContextMenuManager.class), mTileGroupDelegate, mTileGroupObserver,
+                        mock(OfflinePageBridge.class), TILE_TITLE_LINES);
         tileGroup.startObserving(MAX_TILES_TO_FETCH);
 
+        // First initialisation
         notifyTileUrlsAvailable(URLS);
+        reset(mTileGroupObserver);
 
-        InOrder inOrder = inOrder(mTileGroupObserver);
-        inOrder.verify(mTileGroupObserver).onTileCountChanged();
-        inOrder.verify(mTileGroupObserver).onLoadTaskCompleted();
-        inOrder.verify(mTileGroupObserver).onTileDataChanged();
-        inOrder.verifyNoMoreInteractions();
+        // Notify the same thing. No changes so|mTileGroupObserver| should not be notified.
+        notifyTileUrlsAvailable(URLS);
+        verifyNoMoreInteractions(mTileGroupObserver);
     }
 
+    @Test
+    public void testReceiveNewTilesWithDataChanges() {
+        TileGroup tileGroup =
+                new TileGroup(RuntimeEnvironment.application, mock(SuggestionsUiDelegate.class),
+                        mock(ContextMenuManager.class), mTileGroupDelegate, mTileGroupObserver,
+                        mock(OfflinePageBridge.class), TILE_TITLE_LINES);
+        tileGroup.startObserving(MAX_TILES_TO_FETCH);
+
+        // First initialisation
+        notifyTileUrlsAvailable(URLS);
+        reset(mTileGroupObserver);
+
+        // Notify the about different URLs, but the same number. #onTileCountChanged() should not be
+        // called.
+        notifyTileUrlsAvailable("foo", "bar");
+        verify(mTileGroupObserver, never()).onTileCountChanged(); // Tile count is still 2
+        verify(mTileGroupObserver, never()).onLoadTaskCompleted(); // No load task the second time.
+        verify(mTileGroupObserver).onTileDataChanged(); // Data DID change.
+    }
+
+    @Test
+    public void testReceiveNewTilesWithCountChanges() {
+        TileGroup tileGroup =
+                new TileGroup(RuntimeEnvironment.application, mock(SuggestionsUiDelegate.class),
+                        mock(ContextMenuManager.class), mTileGroupDelegate, mTileGroupObserver,
+                        mock(OfflinePageBridge.class), TILE_TITLE_LINES);
+        tileGroup.startObserving(MAX_TILES_TO_FETCH);
+
+        // First initialisation
+        notifyTileUrlsAvailable(URLS);
+        reset(mTileGroupObserver);
+
+        notifyTileUrlsAvailable(URLS[0]);
+        verify(mTileGroupObserver).onTileCountChanged(); // Tile count DID change.
+        verify(mTileGroupObserver, never()).onLoadTaskCompleted(); // No load task the second time.
+        verify(mTileGroupObserver).onTileDataChanged(); // Data DID change.
+    }
+
+    @Test
+    public void testRenderTileView() {
+        TileGroup tileGroup =
+                new TileGroup(RuntimeEnvironment.application, mock(SuggestionsUiDelegate.class),
+                        mock(ContextMenuManager.class), mTileGroupDelegate, mTileGroupObserver,
+                        mock(OfflinePageBridge.class), TILE_TITLE_LINES);
+        tileGroup.startObserving(MAX_TILES_TO_FETCH);
+        ViewGroup layout = new FrameLayout(RuntimeEnvironment.application, null);
+
+        // Initialise the internal list of tiles
+        notifyTileUrlsAvailable(URLS);
+
+        // Render them to the layout.
+        tileGroup.renderTileViews(layout, false, false);
+        assertThat(layout.getChildCount(), is(2));
+        assertThat(((TileView) layout.getChildAt(0)).getUrl(), is(URLS[0]));
+        assertThat(((TileView) layout.getChildAt(1)).getUrl(), is(URLS[1]));
+    }
+
+    @Test
+    public void testRenderTileViewReplacing() {
+        TileGroup tileGroup =
+                new TileGroup(RuntimeEnvironment.application, mock(SuggestionsUiDelegate.class),
+                        mock(ContextMenuManager.class), mTileGroupDelegate, mTileGroupObserver,
+                        mock(OfflinePageBridge.class), TILE_TITLE_LINES);
+        tileGroup.startObserving(MAX_TILES_TO_FETCH);
+        notifyTileUrlsAvailable(URLS);
+
+        // Initialise the layout with views whose URLs don't match the ones of the new tiles.
+        ViewGroup layout = new FrameLayout(RuntimeEnvironment.application, null);
+        TileView view1 = mock(TileView.class);
+        layout.addView(view1);
+
+        TileView view2 = mock(TileView.class);
+        layout.addView(view2);
+
+        // The tiles should be updated, the old ones removed.
+        tileGroup.renderTileViews(layout, false, false);
+        assertThat(layout.getChildCount(), is(2));
+        assertThat(layout.indexOfChild(view1), is(-1));
+        assertThat(layout.indexOfChild(view2), is(-1));
+        verify(view1, never()).updateIfDataChanged(tileGroup.getTiles()[0]);
+        verify(view2, never()).updateIfDataChanged(tileGroup.getTiles()[1]);
+    }
+
+    @Test
+    public void testRenderTileViewRecycling() {
+        TileGroup tileGroup =
+                new TileGroup(RuntimeEnvironment.application, mock(SuggestionsUiDelegate.class),
+                        mock(ContextMenuManager.class), mTileGroupDelegate, mTileGroupObserver,
+                        mock(OfflinePageBridge.class), TILE_TITLE_LINES);
+        tileGroup.startObserving(MAX_TILES_TO_FETCH);
+        notifyTileUrlsAvailable(URLS);
+
+        // Initialise the layout with views whose URLs match the ones of the new tiles.
+        ViewGroup layout = new FrameLayout(RuntimeEnvironment.application, null);
+        TileView view1 = mock(TileView.class);
+        when(view1.getUrl()).thenReturn(URLS[0]);
+        layout.addView(view1);
+
+        TileView view2 = mock(TileView.class);
+        when(view2.getUrl()).thenReturn(URLS[1]);
+        layout.addView(view2);
+
+        // The tiles should be updated, the old ones reused.
+        tileGroup.renderTileViews(layout, false, false);
+        assertThat(layout.getChildCount(), is(2));
+        assertThat(layout.getChildAt(0), CoreMatchers.<View>is(view1));
+        assertThat(layout.getChildAt(1), CoreMatchers.<View>is(view2));
+        verify(view1).updateIfDataChanged(tileGroup.getTiles()[0]);
+        verify(view2).updateIfDataChanged(tileGroup.getTiles()[1]);
+    }
+
+    @Test
+    public void testIconLoading() {
+        SuggestionsUiDelegate uiDelegate = mock(SuggestionsUiDelegate.class);
+        TileGroup tileGroup = new TileGroup(RuntimeEnvironment.application, uiDelegate,
+                mock(ContextMenuManager.class), mTileGroupDelegate, mTileGroupObserver,
+                mock(OfflinePageBridge.class), TILE_TITLE_LINES);
+        tileGroup.startObserving(MAX_TILES_TO_FETCH);
+        notifyTileUrlsAvailable(URLS); // Initialise the internal state to include the test tile.
+        reset(mTileGroupObserver);
+        Tile tile = tileGroup.getTiles()[0];
+
+        ViewGroup layout = new FrameLayout(RuntimeEnvironment.application, null);
+        tileGroup.buildTileView(tile, layout, /* trackLoadTask = */ true, /* condensed = */ false);
+
+        verify(mTileGroupObserver).onLoadTaskAdded();
+
+        ArgumentCaptor<LargeIconCallback> captor = ArgumentCaptor.forClass(LargeIconCallback.class);
+        verify(uiDelegate).getLargeIconForUrl(any(String.class), anyInt(), captor.capture());
+        for (LargeIconCallback cb : captor.getAllValues()) {
+            cb.onLargeIconAvailable(mock(Bitmap.class), Color.BLACK, /* isColorDefault = */ false);
+        }
+
+        verify(mTileGroupObserver).onLoadTaskCompleted();
+        verify(mTileGroupObserver).onTileIconChanged(tile);
+    }
+
+    @Test
+    public void testIconLoadingNoTask() {
+        SuggestionsUiDelegate uiDelegate = mock(SuggestionsUiDelegate.class);
+        TileGroup tileGroup = new TileGroup(RuntimeEnvironment.application, uiDelegate,
+                mock(ContextMenuManager.class), mTileGroupDelegate, mTileGroupObserver,
+                mock(OfflinePageBridge.class), TILE_TITLE_LINES);
+        tileGroup.startObserving(MAX_TILES_TO_FETCH);
+        notifyTileUrlsAvailable(URLS); // Initialise the internal state to include the test tile.
+        reset(mTileGroupObserver);
+        Tile tile = tileGroup.getTiles()[0];
+
+        ViewGroup layout = new FrameLayout(RuntimeEnvironment.application, null);
+        tileGroup.buildTileView(tile, layout, /* trackLoadTask = */ false, /* condensed = */ false);
+
+        verify(mTileGroupObserver, never()).onLoadTaskAdded();
+
+        ArgumentCaptor<LargeIconCallback> captor = ArgumentCaptor.forClass(LargeIconCallback.class);
+        verify(uiDelegate).getLargeIconForUrl(any(String.class), anyInt(), captor.capture());
+        for (LargeIconCallback cb : captor.getAllValues()) {
+            cb.onLargeIconAvailable(mock(Bitmap.class), Color.BLACK, /* isColorDefault = */ false);
+        }
+
+        verify(mTileGroupObserver, never()).onLoadTaskCompleted();
+        verify(mTileGroupObserver).onTileIconChanged(tile);
+    }
+
+    @Test
+    public void testIconLoadingWhenTileNotRegistered() {
+        SuggestionsUiDelegate uiDelegate = mock(SuggestionsUiDelegate.class);
+        TileGroup tileGroup = new TileGroup(RuntimeEnvironment.application, uiDelegate,
+                mock(ContextMenuManager.class), mTileGroupDelegate, mTileGroupObserver,
+                mock(OfflinePageBridge.class), TILE_TITLE_LINES);
+        tileGroup.startObserving(MAX_TILES_TO_FETCH);
+        reset(mTileGroupObserver);
+        Tile tile = new Tile("title", URLS[0], "", 0, NTPTileSource.POPULAR);
+
+        ViewGroup layout = new FrameLayout(RuntimeEnvironment.application, null);
+        tileGroup.buildTileView(tile, layout, /* trackLoadTask = */ true, /* condensed = */ false);
+        verify(mTileGroupObserver).onLoadTaskAdded();
+
+        ArgumentCaptor<LargeIconCallback> captor = ArgumentCaptor.forClass(LargeIconCallback.class);
+        verify(uiDelegate).getLargeIconForUrl(any(String.class), anyInt(), captor.capture());
+        captor.getValue().onLargeIconAvailable(mock(Bitmap.class), Color.BLACK, false);
+
+        verify(mTileGroupObserver).onLoadTaskCompleted();
+        verify(mTileGroupObserver, never()).onTileIconChanged(tile);
+    }
+
+    /**
+     * Notifies the tile group of new tiles created from the provided URLs. Requires
+     * {@link TileGroup#startObserving(int)} to have been called on the tile group under test.
+     * @see TileGroup#onMostVisitedURLsAvailable(String[], String[], String[], int[])
+     */
     private void notifyTileUrlsAvailable(String... urls) {
         assertNotNull("MostVisitedObserver has not been registered.", mTileGroupDelegate.mObserver);
 
@@ -111,6 +332,25 @@
                 titles, urls, whitelistIconPaths, sources);
     }
 
+    /**
+     * Creates a mocked {@link TileView} that will return the URL of the tile it has been
+     * initialised with.
+     */
+    private static TileView createMockTileView() {
+        final TileView tileView = mock(TileView.class);
+        doAnswer(new Answer<Void>() {
+            @Override
+            public Void answer(InvocationOnMock invocation) throws Throwable {
+                Tile tile = invocation.getArgument(0);
+                when(tileView.getUrl()).thenReturn(tile.getUrl());
+                return null;
+            }
+        })
+                .when(tileView)
+                .initialize(any(Tile.class), anyInt(), anyBoolean());
+        return tileView;
+    }
+
     private class FakeTileGroupDelegate implements TileGroup.Delegate {
         public MostVisitedSites.Observer mObserver;
 
@@ -140,17 +380,38 @@
      */
     @Implements(Resources.class)
     public static class TileShadowResources extends ShadowResources {
-        @RealObject
-        private Resources mRealResources;
+        @Implementation
         public int getDimensionPixelSize(@DimenRes int id) {
-            if (id == R.dimen.tile_view_icon_size) return 2;
-            return mRealResources.getDimensionPixelSize(id);
+            if (id == R.dimen.tile_view_icon_size) return 48;
+
+            throw new IllegalArgumentException();
         }
 
-        @SuppressWarnings("deprecation")
+        @Implementation
         public int getColor(@ColorRes int id) {
-            if (id == R.color.default_favicon_background_color) return 2;
-            return mRealResources.getColor(id);
+            if (id == R.color.default_favicon_background_color) return Color.BLACK;
+
+            throw new IllegalArgumentException();
+        }
+    }
+
+    /** Intercepts calls to inflate views to replace them with mocks. */
+    @Implements(LayoutInflater.class)
+    public static class ShadowLayoutInflater {
+        @Implementation
+        public static LayoutInflater from(Context context) {
+            LayoutInflater layoutInflater = mock(LayoutInflater.class);
+            when(layoutInflater.inflate(anyInt(), any(ViewGroup.class), anyBoolean()))
+                    .thenAnswer(new Answer<View>() {
+                        @Override
+                        public View answer(InvocationOnMock invocation) throws Throwable {
+                            @LayoutRes
+                            int layoutId = invocation.getArgument(0);
+                            if (layoutId != R.layout.tile_view) fail("Unexpected resource id.");
+                            return createMockTileView();
+                        }
+                    });
+            return layoutInflater;
         }
     }
 }

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/suggestions/TileTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/suggestions/TileTest.java
new file mode 100644
index 0000000..08ce230
--- /dev/null
+++ b/chrome/android/junit/src/org/chromium/chrome/browser/suggestions/TileTest.java

@@ -0,0 +1,114 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.chrome.browser.suggestions;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.GradientDrawable;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+
+import org.chromium.chrome.browser.ntp.MostVisitedTileType;
+import org.chromium.chrome.browser.ntp.NTPTileSource;
+import org.chromium.testing.local.LocalRobolectricTestRunner;
+
+/**
+ * Unit tests for {@link Tile}.
+ */
+@RunWith(LocalRobolectricTestRunner.class)
+@Config(manifest = Config.NONE)
+public class TileTest {
+    private static final String[] URLS = {"https://www.google.com", "https://tellmedadjokes.com"};
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void testImportDataWithNewTitle() {
+        Tile tile = new Tile("title", URLS[0], "", 0, NTPTileSource.TOP_SITES);
+        Tile oldTile = new Tile("oldTitle", URLS[0], "", 0, NTPTileSource.TOP_SITES);
+
+        // importData should report the change, and the new tile should keep its own data.
+        assertTrue(tile.importData(oldTile));
+        assertThat(tile.getTitle(), equalTo("title"));
+    }
+
+    @Test(expected = AssertionError.class)
+    public void testImportDataWithNewUrl() {
+        Tile tile = new Tile("title", URLS[0], "", 0, NTPTileSource.TOP_SITES);
+        Tile oldTile = new Tile("title", URLS[1], "", 0, NTPTileSource.TOP_SITES);
+
+        // Importing from a tile associated to a different URL should crash, as bug detection
+        // measure.
+        tile.importData(oldTile);
+    }
+
+    @Test
+    public void testImportDataWithNewWhitelistIconPath() {
+        Tile tile = new Tile("title", URLS[0], "", 0, NTPTileSource.TOP_SITES);
+        Tile oldTile = new Tile("title", URLS[0], "foobar", 0, NTPTileSource.TOP_SITES);
+
+        // importData should report the change, and the new tile should keep its own data.
+        assertTrue(tile.importData(oldTile));
+        assertThat(tile.getWhitelistIconPath(), equalTo(""));
+    }
+
+    @Test
+    public void testImportDataWithNewIndex() {
+        Tile tile = new Tile("title", URLS[0], "", 0, NTPTileSource.TOP_SITES);
+        Tile oldTile = new Tile("title", URLS[0], "", 1, NTPTileSource.TOP_SITES);
+
+        // importData should report the change, and the new tile should keep its own data.
+        assertTrue(tile.importData(oldTile));
+        assertThat(tile.getIndex(), equalTo(0));
+    }
+
+    @Test
+    public void testImportDataWithNewSource() {
+        Tile tile = new Tile("title", URLS[0], "", 0, NTPTileSource.TOP_SITES);
+        Tile oldTile = new Tile("title", URLS[0], "", 0, NTPTileSource.POPULAR);
+
+        // importData should not report the change since it has no visible impact. The new tile
+        // still keeps its own data.
+        assertFalse(tile.importData(oldTile));
+        assertThat(tile.getSource(), equalTo(NTPTileSource.TOP_SITES));
+    }
+
+    @Test
+    public void testTileImportWithSameData() {
+        Tile tile = new Tile("title", URLS[0], "", 0, NTPTileSource.TOP_SITES);
+        Tile oldTile = new Tile("title", URLS[0], "", 0, NTPTileSource.TOP_SITES);
+
+        // No change should be reported
+        assertFalse(tile.importData(oldTile));
+    }
+
+    @Test
+    public void testTileImportWithTransientData() {
+        Tile tile = new Tile("title", URLS[0], "", 0, NTPTileSource.TOP_SITES);
+
+        Drawable dummyDrawable = new GradientDrawable();
+        Tile oldTile = new Tile("title", URLS[0], "", 0, NTPTileSource.TOP_SITES);
+        oldTile.setOfflinePageOfflineId(42L);
+        oldTile.setIcon(dummyDrawable);
+        oldTile.setType(MostVisitedTileType.ICON_REAL);
+
+        // Old transient data should be copied over to the new tile without flagging the change.
+        assertFalse(tile.importData(oldTile));
+        assertThat(tile.getOfflinePageOfflineId(), equalTo(42L));
+        assertThat(tile.getIcon(), equalTo(dummyDrawable));
+        assertThat(tile.getType(), equalTo(MostVisitedTileType.ICON_REAL));
+    }
+}

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 8cb8591..3af8f5c 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn

@@ -187,6 +187,10 @@
     "browsing_data/local_data_container.h",
     "browsing_data/media_licenses_counter.cc",
     "browsing_data/media_licenses_counter.h",
+    "browsing_data/site_data_counter.cc",
+    "browsing_data/site_data_counter.h",
+    "browsing_data/site_data_counting_helper.cc",
+    "browsing_data/site_data_counting_helper.h",
     "browsing_data/site_data_size_collector.cc",
     "browsing_data/site_data_size_collector.h",
     "budget_service/budget_database.cc",

diff --git a/chrome/browser/browsing_data/browsing_data_counter_factory.cc b/chrome/browser/browsing_data/browsing_data_counter_factory.cc
index 2cdc16c..accd07d 100644
--- a/chrome/browser/browsing_data/browsing_data_counter_factory.cc
+++ b/chrome/browser/browsing_data/browsing_data_counter_factory.cc

@@ -11,6 +11,7 @@
 #include "chrome/browser/browsing_data/cache_counter.h"
 #include "chrome/browser/browsing_data/downloads_counter.h"
 #include "chrome/browser/browsing_data/media_licenses_counter.h"
+#include "chrome/browser/browsing_data/site_data_counter.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/web_history_service_factory.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
@@ -57,8 +58,14 @@
   }
 
   if (pref_name == browsing_data::prefs::kDeleteCache ||
-      pref_name == browsing_data::prefs::kDeleteCacheBasic)
+      pref_name == browsing_data::prefs::kDeleteCacheBasic) {
     return base::MakeUnique<CacheCounter>(profile);
+  }
+
+  if (pref_name == browsing_data::prefs::kDeleteCookies &&
+      IsSiteDataCounterEnabled()) {
+    return base::MakeUnique<SiteDataCounter>(profile);
+  }
 
   if (pref_name == browsing_data::prefs::kDeletePasswords) {
     return base::MakeUnique<browsing_data::PasswordsCounter>(

diff --git a/chrome/browser/browsing_data/browsing_data_counter_utils.cc b/chrome/browser/browsing_data/browsing_data_counter_utils.cc
index 568b30e..277cf06 100644
--- a/chrome/browser/browsing_data/browsing_data_counter_utils.cc
+++ b/chrome/browser/browsing_data/browsing_data_counter_utils.cc

@@ -5,6 +5,7 @@
 #include "chrome/browser/browsing_data/browsing_data_counter_utils.h"
 
 #include "base/command_line.h"
+#include "base/feature_list.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/cache_counter.h"
 #include "chrome/browser/browsing_data/media_licenses_counter.h"
@@ -25,6 +26,10 @@
 #include "chrome/browser/browsing_data/hosted_apps_counter.h"
 #endif
 
+#if defined(OS_ANDROID)
+#include "chrome/browser/android/chrome_feature_list.h"
+#endif
+
 bool AreCountersEnabled() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableClearBrowsingDataCounters)) {
@@ -40,6 +45,16 @@
   return true;
 }
 
+bool IsSiteDataCounterEnabled() {
+#if defined(OS_ANDROID)
+  // Only use the site data counter for the new CBD ui.
+  return base::FeatureList::IsEnabled(chrome::android::kTabsInCBD);
+#else
+  // Don't use the counter on other platforms that don't yet have the new ui.
+  return false;
+#endif
+}
+
 // A helper function to display the size of cache in units of MB or higher.
 // We need this, as 1 MB is the lowest nonzero cache size displayed by the
 // counter.
@@ -82,6 +97,17 @@
     return l10n_util::GetStringUTF16(IDS_DEL_CACHE_COUNTER_ALMOST_EMPTY);
   }
 
+  if (pref_name == browsing_data::prefs::kDeleteCookies) {
+    // Site data counter.
+    DCHECK(IsSiteDataCounterEnabled());
+    browsing_data::BrowsingDataCounter::ResultInt origins =
+        static_cast<const browsing_data::BrowsingDataCounter::FinishedResult*>(
+            result)
+            ->Value();
+    return l10n_util::GetPluralStringFUTF16(IDS_DEL_COOKIES_COUNTER_ADVANCED,
+                                            origins);
+  }
+
   if (pref_name == browsing_data::prefs::kDeleteMediaLicenses) {
     const MediaLicensesCounter::MediaLicenseResult* media_license_result =
         static_cast<const MediaLicensesCounter::MediaLicenseResult*>(result);

diff --git a/chrome/browser/browsing_data/browsing_data_counter_utils.h b/chrome/browser/browsing_data/browsing_data_counter_utils.h
index da576dc..a6a417b 100644
--- a/chrome/browser/browsing_data/browsing_data_counter_utils.h
+++ b/chrome/browser/browsing_data/browsing_data_counter_utils.h

@@ -12,6 +12,9 @@
 // Whether the browsing data counters experiment is enabled.
 bool AreCountersEnabled();
 
+// Whether the site data counter is enabled.
+bool IsSiteDataCounterEnabled();
+
 // Constructs the text to be displayed by a counter from the given |result|.
 base::string16 GetChromeCounterTextFromResult(
     const browsing_data::BrowsingDataCounter::Result* result);

diff --git a/chrome/browser/browsing_data/site_data_counter.cc b/chrome/browser/browsing_data/site_data_counter.cc
new file mode 100644
index 0000000..36397fd
--- /dev/null
+++ b/chrome/browser/browsing_data/site_data_counter.cc

@@ -0,0 +1,35 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/browsing_data/site_data_counter.h"
+
+#include "chrome/browser/browsing_data/site_data_counting_helper.h"
+#include "components/browsing_data/core/pref_names.h"
+#include "content/public/browser/browser_thread.h"
+
+using content::BrowserThread;
+
+SiteDataCounter::SiteDataCounter(Profile* profile)
+    : profile_(profile), weak_ptr_factory_(this) {}
+
+SiteDataCounter::~SiteDataCounter() {}
+
+const char* SiteDataCounter::GetPrefName() const {
+  return browsing_data::prefs::kDeleteCookies;
+}
+
+void SiteDataCounter::Count() {
+  base::Time begin = GetPeriodStart();
+  auto done_callback =
+      base::Bind(&SiteDataCounter::Done, weak_ptr_factory_.GetWeakPtr());
+  // Use a helper class that owns itself to avoid issues when SiteDataCounter is
+  // deleted before counting finished.
+  auto* helper = new SiteDataCountingHelper(profile_, begin, done_callback);
+  helper->CountAndDestroySelfWhenFinished();
+}
+
+void SiteDataCounter::Done(int origin_count) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  ReportResult(origin_count);
+}

diff --git a/chrome/browser/browsing_data/site_data_counter.h b/chrome/browser/browsing_data/site_data_counter.h
new file mode 100644
index 0000000..f6939db
--- /dev/null
+++ b/chrome/browser/browsing_data/site_data_counter.h

@@ -0,0 +1,28 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_BROWSING_DATA_SITE_DATA_COUNTER_H_
+#define CHROME_BROWSER_BROWSING_DATA_SITE_DATA_COUNTER_H_
+
+#include "base/memory/weak_ptr.h"
+#include "components/browsing_data/core/counters/browsing_data_counter.h"
+
+class Profile;
+
+class SiteDataCounter : public browsing_data::BrowsingDataCounter {
+ public:
+  explicit SiteDataCounter(Profile* profile);
+  ~SiteDataCounter() override;
+
+  const char* GetPrefName() const override;
+
+ private:
+  void Count() override;
+  void Done(int origin_count);
+
+  Profile* profile_;
+  base::WeakPtrFactory<SiteDataCounter> weak_ptr_factory_;
+};
+
+#endif  // CHROME_BROWSER_BROWSING_DATA_SITE_DATA_COUNTER_H_

diff --git a/chrome/browser/browsing_data/site_data_counting_helper.cc b/chrome/browser/browsing_data/site_data_counting_helper.cc
new file mode 100644
index 0000000..b2908c7
--- /dev/null
+++ b/chrome/browser/browsing_data/site_data_counting_helper.cc

@@ -0,0 +1,246 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/browsing_data/site_data_counting_helper.h"
+
+#include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
+#include "chrome/browser/profiles/profile.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/dom_storage_context.h"
+#include "content/public/browser/local_storage_usage_info.h"
+#include "content/public/browser/session_storage_usage_info.h"
+#include "content/public/browser/storage_partition.h"
+#include "net/cookies/cookie_store.h"
+#include "net/cookies/cookie_util.h"
+#include "net/ssl/channel_id_service.h"
+#include "net/ssl/channel_id_store.h"
+#include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_getter.h"
+#include "ppapi/features/features.h"
+#include "storage/browser/quota/quota_manager.h"
+
+using content::BrowserThread;
+
+SiteDataCountingHelper::SiteDataCountingHelper(
+    Profile* profile,
+    base::Time begin,
+    base::Callback<void(int)> completion_callback)
+    : profile_(profile),
+      begin_(begin),
+      completion_callback_(completion_callback),
+      tasks_(0) {}
+
+SiteDataCountingHelper::~SiteDataCountingHelper() {}
+
+void SiteDataCountingHelper::CountAndDestroySelfWhenFinished() {
+  content::StoragePartition* partition =
+      content::BrowserContext::GetDefaultStoragePartition(profile_);
+
+  scoped_refptr<storage::SpecialStoragePolicy> special_storage_policy(
+      profile_->GetSpecialStoragePolicy());
+
+  net::URLRequestContextGetter* rq_context = partition->GetURLRequestContext();
+
+  tasks_ += 1;
+  // Count origins with cookies.
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(&SiteDataCountingHelper::GetCookiesOnIOThread,
+                 base::Unretained(this), make_scoped_refptr(rq_context)));
+
+  storage::QuotaManager* quota_manager = partition->GetQuotaManager();
+  if (quota_manager) {
+    // Count origins with filesystem, websql, appcache, indexeddb,
+    // serviceworkers and cachestorage using quota manager.
+    storage::GetOriginsCallback origins_callback =
+        base::Bind(&SiteDataCountingHelper::GetQuotaOriginsCallback,
+                   base::Unretained(this));
+    const storage::StorageType types[] = {storage::kStorageTypeTemporary,
+                                          storage::kStorageTypePersistent,
+                                          storage::kStorageTypeSyncable};
+    for (auto type : types) {
+      tasks_ += 1;
+      BrowserThread::PostTask(
+          BrowserThread::IO, FROM_HERE,
+          base::Bind(&storage::QuotaManager::GetOriginsModifiedSince,
+                     quota_manager, type, begin_, origins_callback));
+    }
+  }
+
+  // Count origins with local storage or session storage.
+  content::DOMStorageContext* dom_storage = partition->GetDOMStorageContext();
+  if (dom_storage) {
+    tasks_ += 1;
+    auto local_callback =
+        base::Bind(&SiteDataCountingHelper::GetLocalStorageUsageInfoCallback,
+                   base::Unretained(this), special_storage_policy);
+    dom_storage->GetLocalStorageUsage(local_callback);
+    tasks_ += 1;
+    auto session_callback =
+        base::Bind(&SiteDataCountingHelper::GetSessionStorageUsageInfoCallback,
+                   base::Unretained(this), special_storage_policy);
+    dom_storage->GetSessionStorageUsage(session_callback);
+  }
+
+#if BUILDFLAG(ENABLE_PLUGINS)
+  // Count origins with flash data.
+  flash_lso_helper_ = BrowsingDataFlashLSOHelper::Create(profile_);
+  if (flash_lso_helper_) {
+    tasks_ += 1;
+    flash_lso_helper_->StartFetching(
+        base::Bind(&SiteDataCountingHelper::SitesWithFlashDataCallback,
+                   base::Unretained(this)));
+  }
+#endif
+
+  // Counting site usage data and durable permissions.
+  auto* hcsm = HostContentSettingsMapFactory::GetForProfile(profile_);
+  const ContentSettingsType content_settings[] = {
+      CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,
+      CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, CONTENT_SETTINGS_TYPE_APP_BANNER};
+  for (auto type : content_settings) {
+    tasks_ += 1;
+    GetOriginsFromHostContentSettignsMap(hcsm, type);
+  }
+  // Count origins with channel ids.
+  tasks_ += 1;
+  BrowserThread::PostTask(
+      BrowserThread::IO, FROM_HERE,
+      base::Bind(&SiteDataCountingHelper::GetChannelIDsOnIOThread,
+                 base::Unretained(this), make_scoped_refptr(rq_context)));
+}
+
+void SiteDataCountingHelper::GetOriginsFromHostContentSettignsMap(
+    HostContentSettingsMap* hcsm,
+    ContentSettingsType type) {
+  std::set<GURL> origins;
+  ContentSettingsForOneType settings;
+  hcsm->GetSettingsForOneType(type, std::string(), &settings);
+  for (const ContentSettingPatternSource& rule : settings) {
+    GURL url(rule.primary_pattern.ToString());
+    if (!url.is_empty()) {
+      origins.insert(url);
+    }
+  }
+  Done(std::vector<GURL>(origins.begin(), origins.end()));
+}
+
+void SiteDataCountingHelper::GetCookiesOnIOThread(
+    const scoped_refptr<net::URLRequestContextGetter>& rq_context) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+  net::CookieStore* cookie_store =
+      rq_context->GetURLRequestContext()->cookie_store();
+
+  if (cookie_store) {
+    cookie_store->GetAllCookiesAsync(base::Bind(
+        &SiteDataCountingHelper::GetCookiesCallback, base::Unretained(this)));
+  } else {
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
+        base::Bind(&SiteDataCountingHelper::Done, base::Unretained(this),
+                   std::vector<GURL>()));
+  }
+}
+
+void SiteDataCountingHelper::GetCookiesCallback(
+    const net::CookieList& cookies) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  std::vector<GURL> origins;
+  for (const net::CanonicalCookie& cookie : cookies) {
+    if (cookie.CreationDate() >= begin_) {
+      GURL url = net::cookie_util::CookieOriginToURL(cookie.Domain(),
+                                                     cookie.IsSecure());
+      origins.push_back(url);
+    }
+  }
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                          base::Bind(&SiteDataCountingHelper::Done,
+                                     base::Unretained(this), origins));
+}
+
+void SiteDataCountingHelper::GetQuotaOriginsCallback(
+    const std::set<GURL>& origin_set,
+    storage::StorageType type) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  std::vector<GURL> origins(origin_set.begin(), origin_set.end());
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                          base::Bind(&SiteDataCountingHelper::Done,
+                                     base::Unretained(this), origins));
+}
+
+void SiteDataCountingHelper::GetLocalStorageUsageInfoCallback(
+    const scoped_refptr<storage::SpecialStoragePolicy>& policy,
+    const std::vector<content::LocalStorageUsageInfo>& infos) {
+  std::vector<GURL> origins;
+  for (const auto& info : infos) {
+    if (info.last_modified >= begin_ &&
+        (!policy || !policy->IsStorageProtected(info.origin))) {
+      origins.push_back(info.origin);
+    }
+  }
+  Done(origins);
+}
+
+void SiteDataCountingHelper::GetSessionStorageUsageInfoCallback(
+    const scoped_refptr<storage::SpecialStoragePolicy>& policy,
+    const std::vector<content::SessionStorageUsageInfo>& infos) {
+  std::vector<GURL> origins;
+  for (const auto& info : infos) {
+    // Session storage doesn't know about creation time.
+    if (!policy || !policy->IsStorageProtected(info.origin)) {
+      origins.push_back(info.origin);
+    }
+  }
+  Done(origins);
+}
+
+void SiteDataCountingHelper::SitesWithFlashDataCallback(
+    const std::vector<std::string>& sites) {
+  std::vector<GURL> origins;
+  for (const std::string& site : sites) {
+    origins.push_back(GURL(site));
+  }
+  Done(origins);
+}
+
+void SiteDataCountingHelper::GetChannelIDsOnIOThread(
+    const scoped_refptr<net::URLRequestContextGetter>& rq_context) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  net::ChannelIDService* channel_id_service =
+      rq_context->GetURLRequestContext()->channel_id_service();
+  channel_id_service->GetChannelIDStore()->GetAllChannelIDs(base::Bind(
+      &SiteDataCountingHelper::GetChannelIDsCallback, base::Unretained(this)));
+}
+
+void SiteDataCountingHelper::GetChannelIDsCallback(
+    const net::ChannelIDStore::ChannelIDList& channel_ids) {
+  std::vector<GURL> origins;
+  for (const net::ChannelIDStore::ChannelID& channel_id : channel_ids) {
+    if (channel_id.creation_time() >= begin_) {
+      // Assume url is https://<server_identifier> on default port because
+      // channel ids don't know about their scheme or port.
+      origins.push_back(GURL("https://" + channel_id.server_identifier()));
+    }
+  }
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+                          base::Bind(&SiteDataCountingHelper::Done,
+                                     base::Unretained(this), origins));
+}
+
+void SiteDataCountingHelper::Done(const std::vector<GURL>& origins) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  DCHECK(tasks_ > 0);
+  for (const GURL& origin : origins) {
+    unique_origins_.insert(origin);
+  }
+  if (--tasks_ > 0)
+    return;
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, base::Bind(completion_callback_, unique_origins_.size()));
+  base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
+}

diff --git a/chrome/browser/browsing_data/site_data_counting_helper.h b/chrome/browser/browsing_data/site_data_counting_helper.h
new file mode 100644
index 0000000..2d83dd3
--- /dev/null
+++ b/chrome/browser/browsing_data/site_data_counting_helper.h

@@ -0,0 +1,75 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_BROWSING_DATA_SITE_DATA_COUNTING_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_SITE_DATA_COUNTING_HELPER_H_
+
+#include <set>
+#include "components/content_settings/core/common/content_settings_types.h"
+#include "net/cookies/canonical_cookie.h"
+#include "net/ssl/channel_id_store.h"
+#include "storage/common/quota/quota_types.h"
+
+class Profile;
+class BrowsingDataFlashLSOHelper;
+class HostContentSettingsMap;
+
+namespace net {
+class URLRequestContextGetter;
+}
+
+namespace content {
+struct LocalStorageUsageInfo;
+struct SessionStorageUsageInfo;
+}
+
+namespace storage {
+class SpecialStoragePolicy;
+}
+
+// Helper class that counts the number of unique origins, that are affected by
+// deleting "cookies and site data" in the CBD dialog.
+class SiteDataCountingHelper {
+ public:
+  explicit SiteDataCountingHelper(
+      Profile* profile,
+      base::Time begin,
+      base::Callback<void(int)> completion_callback);
+  ~SiteDataCountingHelper();
+
+  void CountAndDestroySelfWhenFinished();
+
+ private:
+  void GetOriginsFromHostContentSettignsMap(HostContentSettingsMap* hcsm,
+                                            ContentSettingsType type);
+  void GetCookiesOnIOThread(
+      const scoped_refptr<net::URLRequestContextGetter>& rq_context);
+  void GetCookiesCallback(const net::CookieList& cookies);
+  void GetSessionStorageUsageInfoCallback(
+      const scoped_refptr<storage::SpecialStoragePolicy>&
+          special_storage_policy,
+      const std::vector<content::SessionStorageUsageInfo>& infos);
+  void GetLocalStorageUsageInfoCallback(
+      const scoped_refptr<storage::SpecialStoragePolicy>&
+          special_storage_policy,
+      const std::vector<content::LocalStorageUsageInfo>& infos);
+  void GetQuotaOriginsCallback(const std::set<GURL>& origin_set,
+                               storage::StorageType type);
+  void SitesWithFlashDataCallback(const std::vector<std::string>& sites);
+  void GetChannelIDsOnIOThread(
+      const scoped_refptr<net::URLRequestContextGetter>& rq_context);
+  void GetChannelIDsCallback(
+      const net::ChannelIDStore::ChannelIDList& channel_ids);
+
+  void Done(const std::vector<GURL>& origins);
+
+  Profile* profile_;
+  base::Time begin_;
+  base::Callback<void(int)> completion_callback_;
+  int tasks_;
+  std::set<GURL> unique_origins_;
+  scoped_refptr<BrowsingDataFlashLSOHelper> flash_lso_helper_;
+};
+
+#endif  // CHROME_BROWSER_BROWSING_DATA_SITE_DATA_COUNTING_HELPER_H_

diff --git a/chrome/browser/browsing_data/site_data_counting_helper_unittest.cc b/chrome/browser/browsing_data/site_data_counting_helper_unittest.cc
new file mode 100644
index 0000000..b7edb053
--- /dev/null
+++ b/chrome/browser/browsing_data/site_data_counting_helper_unittest.cc

@@ -0,0 +1,212 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <algorithm>
+#include <memory>
+#include <set>
+#include <string>
+
+#include "base/files/file_path.h"
+#include "base/files/file_util.h"
+#include "base/run_loop.h"
+#include "chrome/browser/browsing_data/site_data_counting_helper.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/test/base/testing_profile.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/storage_partition.h"
+#include "content/public/test/test_browser_thread_bundle.h"
+#include "net/cookies/cookie_store.h"
+#include "net/url_request/url_request_context.h"
+#include "net/url_request/url_request_context_getter.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+using content::BrowserThread;
+
+class SiteDataCountingHelperTest : public testing::Test {
+ public:
+  const int64_t kTimeoutMs = 10;
+
+  void SetUp() override {
+    profile_.reset(new TestingProfile());
+    tasks_ = 0;
+    cookie_callback_ = base::Bind(&SiteDataCountingHelperTest::CookieCallback,
+                                  base::Unretained(this));
+  }
+
+  void TearDown() override {
+    profile_.reset();
+    base::RunLoop().RunUntilIdle();
+  }
+
+  void CookieCallback(int count) {
+    // Negative values represent an unexpected error.
+    DCHECK(count >= 0);
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
+    last_count_ = count;
+
+    if (run_loop_)
+      run_loop_->Quit();
+  }
+
+  void DoneOnIOThread(bool success) {
+    DCHECK(success);
+    if (--tasks_ > 0)
+      return;
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE,
+        base::Bind(&SiteDataCountingHelperTest::DoneCallback,
+                   base::Unretained(this)));
+  }
+
+  void DoneCallback() {
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
+    if (run_loop_)
+      run_loop_->Quit();
+  }
+
+  void WaitForTasksOnIOThread() {
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
+    run_loop_.reset(new base::RunLoop());
+    run_loop_->Run();
+  }
+
+  void CreateCookies(base::Time creation_time,
+                     const std::vector<std::string>& urls) {
+    content::StoragePartition* partition =
+        content::BrowserContext::GetDefaultStoragePartition(profile());
+    net::URLRequestContextGetter* rq_context =
+        partition->GetURLRequestContext();
+    BrowserThread::PostTask(
+        BrowserThread::IO, FROM_HERE,
+        base::Bind(&SiteDataCountingHelperTest::CreateCookiesOnIOThread,
+                   base::Unretained(this), make_scoped_refptr(rq_context),
+                   creation_time, urls));
+  }
+
+  void CreateLocalStorage(
+      base::Time creation_time,
+      const std::vector<base::FilePath::StringPieceType>& storage_origins) {
+    // Note: This test depends on details of how the dom_storage library
+    // stores data in the host file system.
+    base::FilePath storage_path =
+        profile()->GetPath().AppendASCII("Local Storage");
+    base::CreateDirectory(storage_path);
+
+    // Write some files.
+    for (const auto& origin : storage_origins) {
+      base::WriteFile(storage_path.Append(origin), NULL, 0);
+      base::TouchFile(storage_path.Append(origin), creation_time,
+                      creation_time);
+    }
+  }
+
+  void CreateCookiesOnIOThread(
+      const scoped_refptr<net::URLRequestContextGetter>& rq_context,
+      base::Time creation_time,
+      std::vector<std::string> urls) {
+    DCHECK_CURRENTLY_ON(BrowserThread::IO);
+
+    net::CookieStore* cookie_store =
+        rq_context->GetURLRequestContext()->cookie_store();
+
+    tasks_ = urls.size();
+    int i = 0;
+    for (const std::string& url_string : urls) {
+      GURL url(url_string);
+      // Cookies need a unique creation time.
+      base::Time time = creation_time + base::TimeDelta::FromMilliseconds(i++);
+      cookie_store->SetCookieWithDetailsAsync(
+          url, "name", "A=1", url.host(), url.path(), time, base::Time(), time,
+          true, false, net::CookieSameSite::DEFAULT_MODE,
+          net::COOKIE_PRIORITY_DEFAULT,
+          base::Bind(&SiteDataCountingHelperTest::DoneOnIOThread,
+                     base::Unretained(this)));
+    }
+  }
+
+  void CountEntries(base::Time begin_time) {
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
+    last_count_ = -1;
+    auto* helper =
+        new SiteDataCountingHelper(profile(), begin_time, cookie_callback_);
+    helper->CountAndDestroySelfWhenFinished();
+  }
+
+  int64_t GetResult() {
+    DCHECK_GE(last_count_, 0);
+    return last_count_;
+  }
+
+  Profile* profile() { return profile_.get(); }
+
+ private:
+  base::Callback<void(int)> cookie_callback_;
+  std::unique_ptr<base::RunLoop> run_loop_;
+  content::TestBrowserThreadBundle thread_bundle_;
+  std::unique_ptr<TestingProfile> profile_;
+
+  int tasks_;
+  int64_t last_count_;
+};
+
+TEST_F(SiteDataCountingHelperTest, CheckEmptyResult) {
+  CountEntries(base::Time());
+  WaitForTasksOnIOThread();
+
+  DCHECK_EQ(0, GetResult());
+}
+
+TEST_F(SiteDataCountingHelperTest, CountCookies) {
+  base::Time now = base::Time::Now();
+  base::Time last_hour = now - base::TimeDelta::FromHours(1);
+  base::Time yesterday = now - base::TimeDelta::FromDays(1);
+
+  CreateCookies(last_hour, {"https://example.com"});
+  WaitForTasksOnIOThread();
+
+  CreateCookies(yesterday, {"https://google.com", "https://bing.com"});
+  WaitForTasksOnIOThread();
+
+  CountEntries(base::Time());
+  WaitForTasksOnIOThread();
+  DCHECK_EQ(3, GetResult());
+
+  CountEntries(yesterday);
+  WaitForTasksOnIOThread();
+  DCHECK_EQ(3, GetResult());
+
+  CountEntries(last_hour);
+  WaitForTasksOnIOThread();
+  DCHECK_EQ(1, GetResult());
+
+  CountEntries(now);
+  WaitForTasksOnIOThread();
+  DCHECK_EQ(0, GetResult());
+}
+
+TEST_F(SiteDataCountingHelperTest, LocalStorage) {
+  base::Time now = base::Time::Now();
+  CreateLocalStorage(now,
+                     {FILE_PATH_LITERAL("https_example.com_443.localstorage"),
+                      FILE_PATH_LITERAL("https_bing.com_443.localstorage")});
+
+  CountEntries(base::Time());
+  WaitForTasksOnIOThread();
+  DCHECK_EQ(2, GetResult());
+}
+
+TEST_F(SiteDataCountingHelperTest, CookiesAndLocalStorage) {
+  base::Time now = base::Time::Now();
+  CreateCookies(now, {"https://example.com", "https://google.com"});
+  CreateLocalStorage(now,
+                     {FILE_PATH_LITERAL("https_example.com_443.localstorage"),
+                      FILE_PATH_LITERAL("https_bing.com_443.localstorage")});
+  WaitForTasksOnIOThread();
+
+  CountEntries(base::Time());
+  WaitForTasksOnIOThread();
+  DCHECK_EQ(3, GetResult());
+}

diff --git a/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc b/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc
index 48568e76..a2b593f 100644
--- a/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc
+++ b/chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.cc

@@ -47,7 +47,7 @@
 void CancelDelayedCryptohomeRemoval(const cryptohome::Identification& id) {
   PrefService* const local_state = g_browser_process->local_state();
   ListPrefUpdate list_update(local_state, kArcKioskUsersToRemove);
-  list_update->Remove(base::StringValue(id.id()), nullptr);
+  list_update->Remove(base::Value(id.id()), nullptr);
   local_state->CommitPendingWrite();
 }
 

diff --git a/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc b/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc
index b6af8900..99c50f7f 100644
--- a/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc
+++ b/chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc

@@ -256,7 +256,7 @@
         chromeos::DBusThreadManager::Get()
             ->GetShillServiceClient()
             ->GetTestInterface();
-    base::StringValue value(shill::kStateIdle);
+    base::Value value(shill::kStateIdle);
     service_test->SetServiceProperty(service_path, shill::kStateProperty,
                                      value);
     RunUntilIdle();
@@ -274,7 +274,7 @@
                              shill::kStateOnline, true /* add_to_visible */);
 
     service_test->SetServiceProperty(service_path, shill::kProfileProperty,
-                                     base::StringValue(kUserProfilePath));
+                                     base::Value(kUserProfilePath));
     RunUntilIdle();
   }
 
@@ -312,7 +312,7 @@
                              true /* add_to_visible */);
     service_test->SetServiceProperty(kDefaultServicePath,
                                      shill::kProfileProperty,
-                                     base::StringValue(kUserProfilePath));
+                                     base::Value(kUserProfilePath));
   }
 
   policy::MockConfigurationPolicyProvider provider_;
@@ -456,7 +456,7 @@
   policy.Set(
       policy::key::kProxyMode, policy::POLICY_LEVEL_MANDATORY,
       policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-      base::MakeUnique<base::StringValue>(ProxyPrefs::kAutoDetectProxyModeName),
+      base::MakeUnique<base::Value>(ProxyPrefs::kAutoDetectProxyModeName),
       nullptr);
   UpdatePolicy(policy);
 
@@ -477,7 +477,7 @@
   policy.Set(policy::key::kOpenNetworkConfiguration,
              policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
              policy::POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>(kONCPolicy), nullptr);
+             base::MakeUnique<base::Value>(kONCPolicy), nullptr);
   UpdatePolicy(policy);
 
   std::unique_ptr<base::DictionaryValue> expected_proxy_config(
@@ -496,14 +496,14 @@
 
   policy::PolicyMap policy;
   // Proxy policy.
-  policy.Set(policy::key::kProxyMode, policy::POLICY_LEVEL_MANDATORY,
-             policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>(
-                 ProxyPrefs::kFixedServersProxyModeName),
-             nullptr);
+  policy.Set(
+      policy::key::kProxyMode, policy::POLICY_LEVEL_MANDATORY,
+      policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
+      base::MakeUnique<base::Value>(ProxyPrefs::kFixedServersProxyModeName),
+      nullptr);
   policy.Set(policy::key::kProxyServer, policy::POLICY_LEVEL_MANDATORY,
              policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>("proxy:8888"), nullptr);
+             base::MakeUnique<base::Value>("proxy:8888"), nullptr);
   UpdatePolicy(policy);
 
   std::unique_ptr<base::DictionaryValue> proxy_config(
@@ -641,11 +641,11 @@
   policy.Set(policy::key::kOpenNetworkConfiguration,
              policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
              policy::POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>(kUserONCPolicy), nullptr);
+             base::MakeUnique<base::Value>(kUserONCPolicy), nullptr);
   policy.Set(policy::key::kDeviceOpenNetworkConfiguration,
              policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_MACHINE,
              policy::POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>(kDeviceONCPolicy), nullptr);
+             base::MakeUnique<base::Value>(kDeviceONCPolicy), nullptr);
   UpdatePolicy(policy);
 
   std::unique_ptr<base::DictionaryValue> expected_proxy_config(

diff --git a/chrome/browser/chromeos/arc/policy/arc_policy_bridge_unittest.cc b/chrome/browser/chromeos/arc/policy/arc_policy_bridge_unittest.cc
index b4b40f7..253a24ea 100644
--- a/chrome/browser/chromeos/arc/policy/arc_policy_bridge_unittest.cc
+++ b/chrome/browser/chromeos/arc/policy/arc_policy_bridge_unittest.cc

@@ -186,7 +186,7 @@
   policy_map().Set(
       policy::key::kArcPolicy, policy::POLICY_LEVEL_MANDATORY,
       policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-      base::MakeUnique<base::StringValue>(
+      base::MakeUnique<base::Value>(
           "{\"applications\":"
           "[{\"packageName\":\"com.google.android.apps.youtube.kids\","
           "\"installType\":\"REQUIRED\","
@@ -212,7 +212,7 @@
   policy_map().Set(
       policy::key::kHomepageLocation, policy::POLICY_LEVEL_MANDATORY,
       policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-      base::MakeUnique<base::StringValue>("http://chromium.org"), nullptr);
+      base::MakeUnique<base::Value>("http://chromium.org"), nullptr);
   policy_bridge()->GetPolicies(PolicyStringCallback("{}"));
 }
 
@@ -333,7 +333,7 @@
   policy_map().Set(policy::key::kOpenNetworkConfiguration,
                    policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
                    policy::POLICY_SOURCE_CLOUD,
-                   base::MakeUnique<base::StringValue>(kFakeONC), nullptr);
+                   base::MakeUnique<base::Value>(kFakeONC), nullptr);
   policy_bridge()->GetPolicies(PolicyStringCallback(
       "{\"caCerts\":"
       "[{\"X509\":\"TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24"
@@ -365,7 +365,7 @@
   policy_map().Set(
       policy::key::kArcPolicy, policy::POLICY_LEVEL_MANDATORY,
       policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-      base::MakeUnique<base::StringValue>(
+      base::MakeUnique<base::Value>(
           "{\"applications\":"
           "[{\"packageName\":\"com.google.android.apps.youtube.kids\","
           "\"installType\":\"REQUIRED\","
@@ -377,7 +377,7 @@
   policy_map().Set(
       policy::key::kHomepageLocation, policy::POLICY_LEVEL_MANDATORY,
       policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-      base::MakeUnique<base::StringValue>("http://chromium.org"), nullptr);
+      base::MakeUnique<base::Value>("http://chromium.org"), nullptr);
   policy_map().Set(policy::key::kVideoCaptureAllowed,
                    policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
                    policy::POLICY_SOURCE_CLOUD,

diff --git a/chrome/browser/chromeos/display/display_preferences_unittest.cc b/chrome/browser/chromeos/display/display_preferences_unittest.cc
index d9b080d..7ac6f7bc 100644
--- a/chrome/browser/chromeos/display/display_preferences_unittest.cc
+++ b/chrome/browser/chromeos/display/display_preferences_unittest.cc

@@ -1078,7 +1078,7 @@
   StoreDisplayBoolPropertyForList(list, "default_unified", true);
   StoreDisplayPropertyForList(
       list, "primary-id",
-      base::MakeUnique<base::StringValue>(base::Int64ToString(id1)));
+      base::MakeUnique<base::Value>(base::Int64ToString(id1)));
   LoadDisplayPreferences(false);
 
   // Should not restore to unified unless unified desktop is enabled.

diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
index 90111f1..b20157e 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc

@@ -941,7 +941,7 @@
 
   if (!drive_service) {
     // DriveService is not available.
-    SetResult(base::MakeUnique<base::StringValue>(std::string()));
+    SetResult(base::MakeUnique<base::Value>(std::string()));
     SendResponse(true);
     return true;
   }
@@ -961,7 +961,7 @@
 void FileManagerPrivateRequestAccessTokenFunction::OnAccessTokenFetched(
     google_apis::DriveApiErrorCode code,
     const std::string& access_token) {
-  SetResult(base::MakeUnique<base::StringValue>(access_token));
+  SetResult(base::MakeUnique<base::Value>(access_token));
   SendResponse(true);
 }
 
@@ -1000,7 +1000,7 @@
     return;
   }
 
-  SetResult(base::MakeUnique<base::StringValue>(share_url.spec()));
+  SetResult(base::MakeUnique<base::Value>(share_url.spec()));
   SendResponse(true);
 }
 
@@ -1078,7 +1078,7 @@
     // |file_system| is NULL if Drive is disabled or not mounted.
     SetError("Drive is disabled or not mounted.");
     // Intentionally returns a blank.
-    SetResult(base::MakeUnique<base::StringValue>(std::string()));
+    SetResult(base::MakeUnique<base::Value>(std::string()));
     return false;
   }
 
@@ -1087,7 +1087,7 @@
   if (!drive::util::IsUnderDriveMountPoint(path)) {
     SetError("The given file is not in Drive.");
     // Intentionally returns a blank.
-    SetResult(base::MakeUnique<base::StringValue>(std::string()));
+    SetResult(base::MakeUnique<base::Value>(std::string()));
     return false;
   }
   base::FilePath file_path = drive::util::ExtractDrivePath(path);
@@ -1108,7 +1108,7 @@
   if (error != drive::FILE_ERROR_OK) {
     SetError("Download Url for this item is not available.");
     // Intentionally returns a blank.
-    SetResult(base::MakeUnique<base::StringValue>(std::string()));
+    SetResult(base::MakeUnique<base::Value>(std::string()));
     SendResponse(false);
     return;
   }
@@ -1143,14 +1143,14 @@
   if (code != google_apis::HTTP_SUCCESS) {
     SetError("Not able to fetch the token.");
     // Intentionally returns a blank.
-    SetResult(base::MakeUnique<base::StringValue>(std::string()));
+    SetResult(base::MakeUnique<base::Value>(std::string()));
     SendResponse(false);
     return;
   }
 
   const std::string url =
       download_url_.Resolve("?alt=media&access_token=" + access_token).spec();
-  SetResult(base::MakeUnique<base::StringValue>(url));
+  SetResult(base::MakeUnique<base::Value>(url));
 
   SendResponse(true);
 }

diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
index 753857b..3e62ca44 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc

@@ -886,7 +886,7 @@
 void FileManagerPrivateInternalComputeChecksumFunction::Respond(
     const std::string& hash) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  SetResult(base::MakeUnique<base::StringValue>(hash));
+  SetResult(base::MakeUnique<base::Value>(hash));
   SendResponse(true);
 }
 

diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
index 35e2332..40b22ead 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc

@@ -365,7 +365,7 @@
     DCHECK(access_token == auth_service_->access_token());
     if (logger)
       logger->Log(logging::LOG_INFO, "CWS OAuth token fetch succeeded.");
-    SetResult(base::MakeUnique<base::StringValue>(access_token));
+    SetResult(base::MakeUnique<base::Value>(access_token));
     SendResponse(true);
   } else {
     if (logger) {
@@ -466,7 +466,7 @@
 
 void FileManagerPrivateInternalGetMimeTypeFunction::OnGetMimeType(
     const std::string& mimeType) {
-  SetResult(base::MakeUnique<base::StringValue>(mimeType));
+  SetResult(base::MakeUnique<base::Value>(mimeType));
   SendResponse(true);
 }
 

diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc
index 550715d..c165bda 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc

@@ -155,7 +155,7 @@
   }
 
   // Pass back the actual source path of the mount point.
-  SetResult(base::MakeUnique<base::StringValue>(file_path.AsUTF8Unsafe()));
+  SetResult(base::MakeUnique<base::Value>(file_path.AsUTF8Unsafe()));
   SendResponse(true);
 
   // MountPath() takes a std::string.

diff --git a/chrome/browser/chromeos/extensions/info_private_api.cc b/chrome/browser/chromeos/extensions/info_private_api.cc
index 0f32d49..66041e7b 100644
--- a/chrome/browser/chromeos/extensions/info_private_api.cc
+++ b/chrome/browser/chromeos/extensions/info_private_api.cc

@@ -225,7 +225,7 @@
     chromeos::system::StatisticsProvider* provider =
         chromeos::system::StatisticsProvider::GetInstance();
     provider->GetMachineStatistic(chromeos::system::kHardwareClassKey, &hwid);
-    return new base::StringValue(hwid);
+    return new base::Value(hwid);
   }
 
   if (property_name == kPropertyCustomizationID) {
@@ -234,7 +234,7 @@
         chromeos::system::StatisticsProvider::GetInstance();
     provider->GetMachineStatistic(chromeos::system::kCustomizationIdKey,
                                   &customization_id);
-    return new base::StringValue(customization_id);
+    return new base::Value(customization_id);
   }
 
   if (property_name == kPropertyHomeProvider) {
@@ -244,16 +244,15 @@
     std::string home_provider_id;
     if (cellular_device)
       home_provider_id = cellular_device->home_provider_id();
-    return new base::StringValue(home_provider_id);
+    return new base::Value(home_provider_id);
   }
 
   if (property_name == kPropertyInitialLocale) {
-    return new base::StringValue(
-        chromeos::StartupUtils::GetInitialLocale());
+    return new base::Value(chromeos::StartupUtils::GetInitialLocale());
   }
 
   if (property_name == kPropertyBoard) {
-    return new base::StringValue(base::SysInfo::GetLsbReleaseBoard());
+    return new base::Value(base::SysInfo::GetLsbReleaseBoard());
   }
 
   if (property_name == kPropertyOwner) {
@@ -263,31 +262,31 @@
 
   if (property_name == kPropertySessionType) {
     if (ExtensionsBrowserClient::Get()->IsRunningInForcedAppMode())
-      return new base::StringValue(kSessionTypeKiosk);
+      return new base::Value(kSessionTypeKiosk);
     if (ExtensionsBrowserClient::Get()->IsLoggedInAsPublicAccount())
-      return new base::StringValue(kSessionTypePublicSession);
-    return new base::StringValue(kSessionTypeNormal);
+      return new base::Value(kSessionTypePublicSession);
+    return new base::Value(kSessionTypeNormal);
   }
 
   if (property_name == kPropertyPlayStoreStatus) {
     if (arc::IsArcAllowedForProfile(Profile::FromBrowserContext(context_)))
-      return new base::StringValue(kPlayStoreStatusEnabled);
+      return new base::Value(kPlayStoreStatusEnabled);
     if (arc::IsArcAvailable())
-      return new base::StringValue(kPlayStoreStatusAvailable);
-    return new base::StringValue(kPlayStoreStatusNotAvailable);
+      return new base::Value(kPlayStoreStatusAvailable);
+    return new base::Value(kPlayStoreStatusNotAvailable);
   }
 
   if (property_name == kPropertyManagedDeviceStatus) {
     policy::BrowserPolicyConnectorChromeOS* connector =
         g_browser_process->platform_part()->browser_policy_connector_chromeos();
     if (connector->IsEnterpriseManaged()) {
-      return new base::StringValue(kManagedDeviceStatusManaged);
+      return new base::Value(kManagedDeviceStatusManaged);
     }
-    return new base::StringValue(kManagedDeviceStatusNotManaged);
+    return new base::Value(kManagedDeviceStatusNotManaged);
   }
 
   if (property_name == kPropertyClientId) {
-    return new base::StringValue(GetClientId());
+    return new base::Value(GetClientId());
   }
 
   if (property_name == kPropertyTimezone) {
@@ -325,7 +324,7 @@
     std::string param_value;
     EXTENSION_FUNCTION_VALIDATE(args_->GetString(1, &param_value));
     chromeos::CrosSettings::Get()->Set(chromeos::kSystemTimezone,
-                                       base::StringValue(param_value));
+                                       base::Value(param_value));
   } else {
     const char* pref_name = GetBoolPrefNameForApiProperty(param_name.c_str());
     if (pref_name) {

diff --git a/chrome/browser/chromeos/extensions/info_private_apitest.cc b/chrome/browser/chromeos/extensions/info_private_apitest.cc
index 7036c32..0296446b 100644
--- a/chrome/browser/chromeos/extensions/info_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/info_private_apitest.cc

@@ -37,7 +37,7 @@
 IN_PROC_BROWSER_TEST_F(ChromeOSInfoPrivateTest, TestGetAndSet) {
   // Set the initial timezone different from what JS function
   // timezoneSetTest() will attempt to set.
-  base::StringValue initial_timezone("America/Los_Angeles");
+  base::Value initial_timezone("America/Los_Angeles");
   chromeos::CrosSettings::Get()->Set(chromeos::kSystemTimezone,
                                      initial_timezone);
 

diff --git a/chrome/browser/chromeos/extensions/input_method_api.cc b/chrome/browser/chromeos/extensions/input_method_api.cc
index 567a2717..610a0ca713 100644
--- a/chrome/browser/chromeos/extensions/input_method_api.cc
+++ b/chrome/browser/chromeos/extensions/input_method_api.cc

@@ -98,7 +98,7 @@
 #else
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::Get();
-  return RespondNow(OneArgument(base::MakeUnique<base::StringValue>(
+  return RespondNow(OneArgument(base::MakeUnique<base::Value>(
       manager->GetActiveIMEState()->GetCurrentInputMethod().id())));
 #endif
 }

diff --git a/chrome/browser/chromeos/extensions/users_private/users_private_api.cc b/chrome/browser/chromeos/extensions/users_private/users_private_api.cc
index ca37053f..4026e98 100644
--- a/chrome/browser/chromeos/extensions/users_private/users_private_api.cc
+++ b/chrome/browser/chromeos/extensions/users_private/users_private_api.cc

@@ -85,8 +85,8 @@
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   const user_manager::UserList& users = user_manager->GetUsers();
   for (const auto* user : users) {
-    email_list->AppendIfNotPresent(base::MakeUnique<base::StringValue>(
-        user->GetAccountId().GetUserEmail()));
+    email_list->AppendIfNotPresent(
+        base::MakeUnique<base::Value>(user->GetAccountId().GetUserEmail()));
   }
 
   if (chromeos::OwnerSettingsServiceChromeOS* service =
@@ -137,7 +137,7 @@
     return RespondNow(OneArgument(base::MakeUnique<base::Value>(false)));
   }
 
-  base::StringValue username_value(username);
+  base::Value username_value(username);
 
   UsersPrivateDelegate* delegate =
       UsersPrivateDelegateFactory::GetForBrowserContext(browser_context());
@@ -171,7 +171,7 @@
     return RespondNow(OneArgument(base::MakeUnique<base::Value>(false)));
   }
 
-  base::StringValue canonical_email(gaia::CanonicalizeEmail(parameters->email));
+  base::Value canonical_email(gaia::CanonicalizeEmail(parameters->email));
 
   UsersPrivateDelegate* delegate =
       UsersPrivateDelegateFactory::GetForBrowserContext(browser_context());

diff --git a/chrome/browser/chromeos/file_manager/file_tasks.cc b/chrome/browser/chromeos/file_manager/file_tasks.cc
index fe086cd0..10ce4d3 100644
--- a/chrome/browser/chromeos/file_manager/file_tasks.cc
+++ b/chrome/browser/chromeos/file_manager/file_tasks.cc

@@ -198,7 +198,7 @@
                                         prefs::kDefaultTasksByMimeType);
     for (std::set<std::string>::const_iterator iter = mime_types.begin();
         iter != mime_types.end(); ++iter) {
-      base::StringValue* value = new base::StringValue(task_id);
+      base::Value* value = new base::Value(task_id);
       mime_type_pref->SetWithoutPathExpansion(*iter, value);
     }
   }
@@ -208,7 +208,7 @@
                                         prefs::kDefaultTasksBySuffix);
     for (std::set<std::string>::const_iterator iter = suffixes.begin();
         iter != suffixes.end(); ++iter) {
-      base::StringValue* value = new base::StringValue(task_id);
+      base::Value* value = new base::Value(task_id);
       // Suffixes are case insensitive.
       std::string lower_suffix = base::ToLowerASCII(*iter);
       mime_type_pref->SetWithoutPathExpansion(lower_suffix, value);

diff --git a/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc
index 7ef9e41..4578cc69 100644
--- a/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/operations/read_file_unittest.cc

@@ -175,7 +175,7 @@
   const int execution_time = 0;
 
   base::ListValue value_as_list;
-  value_as_list.Set(0, new base::StringValue(kFileSystemId));
+  value_as_list.Set(0, new base::Value(kFileSystemId));
   value_as_list.Set(1, new base::Value(kRequestId));
   value_as_list.Set(
       2, base::BinaryValue::CreateWithCopiedBuffer(data.c_str(), data.size()));

diff --git a/chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc b/chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc
index 5724b11..6594219 100644
--- a/chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc

@@ -84,7 +84,7 @@
 
     if (reply_result_ == base::File::FILE_OK) {
       base::ListValue value_as_list;
-      value_as_list.Set(0, new base::StringValue(kFileSystemId));
+      value_as_list.Set(0, new base::Value(kFileSystemId));
       value_as_list.Set(1, new base::Value(request_id));
       value_as_list.Set(2, new base::Value(0) /* execution_time */);
 

diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
index 1dd4d53..9566108f 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

@@ -200,8 +200,7 @@
   void RegisterUser(const std::string& user_id) {
     ListPrefUpdate users_pref(g_browser_process->local_state(),
                               "LoggedInUsers");
-    users_pref->AppendIfNotPresent(
-        base::MakeUnique<base::StringValue>(user_id));
+    users_pref->AppendIfNotPresent(base::MakeUnique<base::Value>(user_id));
   }
 
   // ExistingUserController private member accessors.

diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc
index 1b7e3a2..d8d5a60a 100644
--- a/chrome/browser/chromeos/login/helper.cc
+++ b/chrome/browser/chromeos/login/helper.cc

@@ -170,11 +170,11 @@
   std::unique_ptr<base::DictionaryValue> copied_onc(
       new base::DictionaryValue());
   copied_onc->Set(onc::toplevel_config::kType,
-                  new base::StringValue(onc::network_type::kWiFi));
+                  new base::Value(onc::network_type::kWiFi));
   copied_onc->Set(onc::network_config::WifiProperty(onc::wifi::kHexSSID),
-                  new base::StringValue(hex_ssid));
+                  new base::Value(hex_ssid));
   copied_onc->Set(onc::network_config::WifiProperty(onc::wifi::kSecurity),
-                  new base::StringValue(security));
+                  new base::Value(security));
   base::JSONWriter::Write(*copied_onc.get(), out_onc_spec);
 }
 

diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
index c340e46..6db4b38 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc

@@ -551,7 +551,7 @@
     bool new_kiosk_ui = KioskAppMenuHandler::EnableNewKioskUI();
     GetLoginUI()->CallJavascriptFunctionUnsafe(
         new_kiosk_ui ? kLaunchAppForTestNewAPI : kLaunchAppForTestOldAPI,
-        base::StringValue(app_id), base::Value(diagnostic_mode));
+        base::Value(app_id), base::Value(diagnostic_mode));
   }
 
   void ReloadKioskApps() {
@@ -954,8 +954,7 @@
   OobeScreenWaiter error_screen_waiter(OobeScreen::SCREEN_ERROR_MESSAGE);
   // Simulate Ctrl+Alt+N accelerator.
   GetLoginUI()->CallJavascriptFunctionUnsafe(
-      "cr.ui.Oobe.handleAccelerator",
-      base::StringValue("app_launch_network_config"));
+      "cr.ui.Oobe.handleAccelerator", base::Value("app_launch_network_config"));
   error_screen_waiter.Wait();
   ASSERT_TRUE(GetAppLaunchController()->showing_network_dialog());
 
@@ -1026,8 +1025,8 @@
   content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_APP_TERMINATING,
       content::NotificationService::AllSources());
-  GetLoginUI()->CallJavascriptFunctionUnsafe(
-      "cr.ui.Oobe.handleAccelerator", base::StringValue("app_launch_bailout"));
+  GetLoginUI()->CallJavascriptFunctionUnsafe("cr.ui.Oobe.handleAccelerator",
+                                             base::Value("app_launch_bailout"));
   signal.Wait();
   EXPECT_EQ(chromeos::KioskAppLaunchError::USER_CANCEL,
             chromeos::KioskAppLaunchError::Get());
@@ -1143,7 +1142,7 @@
   wizard_controller->SkipToLoginForTesting(LoginScreenContext());
   OobeScreenWaiter(OobeScreen::SCREEN_GAIA_SIGNIN).Wait();
   GetLoginUI()->CallJavascriptFunctionUnsafe("cr.ui.Oobe.handleAccelerator",
-                                             base::StringValue("kiosk_enable"));
+                                             base::Value("kiosk_enable"));
 
   // Wait for the kiosk_enable screen to show and cancel the screen.
   content::WindowedNotificationObserver(
@@ -1177,7 +1176,7 @@
   wizard_controller->SkipToLoginForTesting(LoginScreenContext());
   OobeScreenWaiter(OobeScreen::SCREEN_GAIA_SIGNIN).Wait();
   GetLoginUI()->CallJavascriptFunctionUnsafe("cr.ui.Oobe.handleAccelerator",
-                                             base::StringValue("kiosk_enable"));
+                                             base::Value("kiosk_enable"));
 
   // Wait for the kiosk_enable screen to show and cancel the screen.
   content::WindowedNotificationObserver(
@@ -1208,7 +1207,7 @@
   wizard_controller->SkipToLoginForTesting(LoginScreenContext());
   OobeScreenWaiter(OobeScreen::SCREEN_GAIA_SIGNIN).Wait();
   GetLoginUI()->CallJavascriptFunctionUnsafe("cr.ui.Oobe.handleAccelerator",
-                                             base::StringValue("kiosk_enable"));
+                                             base::Value("kiosk_enable"));
 
   // Wait for the kiosk_enable screen to show and cancel the screen.
   content::WindowedNotificationObserver(
@@ -1228,7 +1227,7 @@
 
   // Show kiosk enable screen again.
   GetLoginUI()->CallJavascriptFunctionUnsafe("cr.ui.Oobe.handleAccelerator",
-                                             base::StringValue("kiosk_enable"));
+                                             base::Value("kiosk_enable"));
 
   // And it should show up.
   content::WindowedNotificationObserver(

diff --git a/chrome/browser/chromeos/login/login_manager_test.cc b/chrome/browser/chromeos/login/login_manager_test.cc
index 354f2dc..ac0b973 100644
--- a/chrome/browser/chromeos/login/login_manager_test.cc
+++ b/chrome/browser/chromeos/login/login_manager_test.cc

@@ -156,7 +156,7 @@
 
 void LoginManagerTest::RegisterUser(const std::string& user_id) {
   ListPrefUpdate users_pref(g_browser_process->local_state(), "LoggedInUsers");
-  users_pref->AppendIfNotPresent(base::MakeUnique<base::StringValue>(user_id));
+  users_pref->AppendIfNotPresent(base::MakeUnique<base::Value>(user_id));
 }
 
 void LoginManagerTest::SetExpectedCredentials(const UserContext& user_context) {

diff --git a/chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.cc b/chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.cc
index 269bbf7..a70a11a 100644
--- a/chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.cc
+++ b/chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.cc

@@ -68,8 +68,8 @@
   // Check if policy allows PIN.
   const base::ListValue* quick_unlock_whitelist =
       pref_service->GetList(prefs::kQuickUnlockModeWhitelist);
-  base::StringValue all_value(kQuickUnlockWhitelistOptionAll);
-  base::StringValue pin_value(kQuickUnlockWhitelistOptionPin);
+  base::Value all_value(kQuickUnlockWhitelistOptionAll);
+  base::Value pin_value(kQuickUnlockWhitelistOptionPin);
   if (quick_unlock_whitelist->Find(all_value) ==
           quick_unlock_whitelist->end() &&
       quick_unlock_whitelist->Find(pin_value) ==

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc
index 6fa45d35..8a5827d 100644
--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc
+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_browsertest.cc

@@ -77,7 +77,7 @@
   void SetUpInProcessBrowserTestFixture() override {
     SupervisedUserTestBase::SetUpInProcessBrowserTestFixture();
     cros_settings_provider_.reset(new StubCrosSettingsProvider());
-    cros_settings_provider_->Set(kDeviceOwner, base::StringValue(kTestManager));
+    cros_settings_provider_->Set(kDeviceOwner, base::Value(kTestManager));
   }
 
  private:

diff --git a/chrome/browser/chromeos/login/ui/webui_login_view.cc b/chrome/browser/chromeos/login/ui/webui_login_view.cc
index 1c69151..b350699 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_view.cc

@@ -305,7 +305,7 @@
 
   content::WebUI* web_ui = GetWebUI();
   if (web_ui) {
-    base::StringValue accel_name(entry->second);
+    base::Value accel_name(entry->second);
     web_ui->CallJavascriptFunctionUnsafe("cr.ui.Oobe.handleAccelerator",
                                          accel_name);
   }

diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
index d3bd921..e5e4cd2 100644
--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc

@@ -544,10 +544,10 @@
     return;
 
   std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue);
-  entry->Set(kImagePathNodeName, new base::StringValue(image_path_.value()));
+  entry->Set(kImagePathNodeName, new base::Value(image_path_.value()));
   entry->Set(kImageIndexNodeName, new base::Value(image_index_));
   if (!image_url_.is_empty())
-    entry->Set(kImageURLNodeName, new base::StringValue(image_url_.spec()));
+    entry->Set(kImageURLNodeName, new base::Value(image_url_.spec()));
   DictionaryPrefUpdate update(g_browser_process->local_state(),
                               kUserImageProperties);
   update->SetWithoutPathExpansion(user_id(), entry.release());

diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
index 1811306..6216650 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

@@ -802,7 +802,7 @@
   // Add the user to the front of the user list.
   ListPrefUpdate prefs_users_update(GetLocalState(), kRegularUsers);
   prefs_users_update->Insert(
-      0, base::MakeUnique<base::StringValue>(account_id.GetUserEmail()));
+      0, base::MakeUnique<base::Value>(account_id.GetUserEmail()));
   users_.insert(users_.begin(), active_user_);
 
   // Now that user is in the list, save display name.
@@ -1260,20 +1260,20 @@
 bool ChromeUserManagerImpl::ShouldReportUser(const std::string& user_id) const {
   const base::ListValue& reporting_users =
       *(GetLocalState()->GetList(kReportingUsers));
-  base::StringValue user_id_value(FullyCanonicalize(user_id));
+  base::Value user_id_value(FullyCanonicalize(user_id));
   return !(reporting_users.Find(user_id_value) == reporting_users.end());
 }
 
 void ChromeUserManagerImpl::AddReportingUser(const AccountId& account_id) {
   ListPrefUpdate users_update(GetLocalState(), kReportingUsers);
   users_update->AppendIfNotPresent(
-      base::MakeUnique<base::StringValue>(account_id.GetUserEmail()));
+      base::MakeUnique<base::Value>(account_id.GetUserEmail()));
 }
 
 void ChromeUserManagerImpl::RemoveReportingUser(const AccountId& account_id) {
   ListPrefUpdate users_update(GetLocalState(), kReportingUsers);
   users_update->Remove(
-      base::StringValue(FullyCanonicalize(account_id.GetUserEmail())), NULL);
+      base::Value(FullyCanonicalize(account_id.GetUserEmail())), NULL);
 }
 
 void ChromeUserManagerImpl::UpdateLoginState(

diff --git a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc
index c8419153..90ef449 100644
--- a/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc
+++ b/chrome/browser/chromeos/login/users/supervised_user_manager_impl.cc

@@ -208,18 +208,17 @@
       local_state,
       kSupervisedUserManagerDisplayEmails);
 
-  prefs_new_users_update->Insert(
-      0, base::MakeUnique<base::StringValue>(local_user_id));
+  prefs_new_users_update->Insert(0,
+                                 base::MakeUnique<base::Value>(local_user_id));
 
   sync_id_update->SetWithoutPathExpansion(local_user_id,
-      new base::StringValue(sync_user_id));
+                                          new base::Value(sync_user_id));
   manager_update->SetWithoutPathExpansion(
-      local_user_id,
-      new base::StringValue(manager->GetAccountId().GetUserEmail()));
-  manager_name_update->SetWithoutPathExpansion(local_user_id,
-      new base::StringValue(manager->GetDisplayName()));
-  manager_email_update->SetWithoutPathExpansion(local_user_id,
-      new base::StringValue(manager->display_email()));
+      local_user_id, new base::Value(manager->GetAccountId().GetUserEmail()));
+  manager_name_update->SetWithoutPathExpansion(
+      local_user_id, new base::Value(manager->GetDisplayName()));
+  manager_email_update->SetWithoutPathExpansion(
+      local_user_id, new base::Value(manager->display_email()));
 
   owner_->SaveUserDisplayName(AccountId::FromUserEmail(local_user_id),
                               display_name);
@@ -458,7 +457,7 @@
     const std::string& user_id) {
   PrefService* prefs = g_browser_process->local_state();
   ListPrefUpdate prefs_new_users_update(prefs, kSupervisedUsersFirstRun);
-  prefs_new_users_update->Remove(base::StringValue(user_id), NULL);
+  prefs_new_users_update->Remove(base::Value(user_id), NULL);
 
   CleanPref(user_id, kSupervisedUserSyncId);
   CleanPref(user_id, kSupervisedUserManagers);
@@ -481,7 +480,7 @@
 bool SupervisedUserManagerImpl::CheckForFirstRun(const std::string& user_id) {
   ListPrefUpdate prefs_new_users_update(g_browser_process->local_state(),
                                         kSupervisedUsersFirstRun);
-  return prefs_new_users_update->Remove(base::StringValue(user_id), NULL);
+  return prefs_new_users_update->Remove(base::Value(user_id), NULL);
 }
 
 void SupervisedUserManagerImpl::UpdateManagerName(const std::string& manager_id,
@@ -500,8 +499,7 @@
     DCHECK(has_manager_id);
     if (user_id == manager_id) {
       manager_name_update->SetWithoutPathExpansion(
-          it.key(),
-          new base::StringValue(new_display_name));
+          it.key(), new base::Value(new_display_name));
     }
   }
 }

diff --git a/chrome/browser/chromeos/mobile/mobile_activator_unittest.cc b/chrome/browser/chromeos/mobile/mobile_activator_unittest.cc
index 2fda6d3..d13941f 100644
--- a/chrome/browser/chromeos/mobile/mobile_activator_unittest.cc
+++ b/chrome/browser/chromeos/mobile/mobile_activator_unittest.cc

@@ -112,7 +112,7 @@
       : cellular_network_(string(kTestServicePath)),
         mobile_activator_(&cellular_network_) {
     cellular_network_.PropertyChanged(shill::kTypeProperty,
-                                      base::StringValue(shill::kTypeCellular));
+                                      base::Value(shill::kTypeCellular));
   }
   ~MobileActivatorTest() override {}
 

diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc b/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
index 04085d5..f9948acc 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl_browsertest.cc

@@ -126,10 +126,8 @@
                              shill::kStateIdle,
                              true /* add_to_visible */);
     DBusThreadManager::Get()->GetShillServiceClient()->SetProperty(
-        dbus::ObjectPath(kWifiServicePath),
-        shill::kStateProperty,
-        base::StringValue(shill::kStatePortal),
-        base::Bind(&base::DoNothing),
+        dbus::ObjectPath(kWifiServicePath), shill::kStateProperty,
+        base::Value(shill::kStatePortal), base::Bind(&base::DoNothing),
         base::Bind(&ErrorCallbackFunction));
 
     network_portal_detector_ = new NetworkPortalDetectorImpl(

diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc b/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
index 9cc0a242..daba966 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc
+++ b/chrome/browser/chromeos/net/network_portal_detector_impl_unittest.cc

@@ -233,10 +233,8 @@
 
   void SetBehindPortal(const std::string& service_path) {
     DBusThreadManager::Get()->GetShillServiceClient()->SetProperty(
-        dbus::ObjectPath(service_path),
-        shill::kStateProperty,
-        base::StringValue(shill::kStatePortal),
-        base::Bind(&base::DoNothing),
+        dbus::ObjectPath(service_path), shill::kStateProperty,
+        base::Value(shill::kStatePortal), base::Bind(&base::DoNothing),
         base::Bind(&ErrorCallbackFunction));
     base::RunLoop().RunUntilIdle();
   }

diff --git a/chrome/browser/chromeos/net/network_state_notifier_unittest.cc b/chrome/browser/chromeos/net/network_state_notifier_unittest.cc
index e2950ced..3b9bfb38 100644
--- a/chrome/browser/chromeos/net/network_state_notifier_unittest.cc
+++ b/chrome/browser/chromeos/net/network_state_notifier_unittest.cc

@@ -103,12 +103,11 @@
                              add_to_visible);
     service_test->SetServiceProperty(kWiFi1ServicePath,
                                      shill::kSecurityClassProperty,
-                                     base::StringValue(shill::kSecurityWep));
+                                     base::Value(shill::kSecurityWep));
     service_test->SetServiceProperty(
         kWiFi1ServicePath, shill::kConnectableProperty, base::Value(true));
-    service_test->SetServiceProperty(kWiFi1ServicePath,
-                                     shill::kPassphraseProperty,
-                                     base::StringValue("failure"));
+    service_test->SetServiceProperty(
+        kWiFi1ServicePath, shill::kPassphraseProperty, base::Value("failure"));
     base::RunLoop().RunUntilIdle();
   }
 

diff --git a/chrome/browser/chromeos/net/wake_on_wifi_manager.cc b/chrome/browser/chromeos/net/wake_on_wifi_manager.cc
index b982663..f5f2945 100644
--- a/chrome/browser/chromeos/net/wake_on_wifi_manager.cc
+++ b/chrome/browser/chromeos/net/wake_on_wifi_manager.cc

@@ -180,10 +180,8 @@
   DCHECK(!feature_string.empty());
 
   NetworkHandler::Get()->network_device_handler()->SetDeviceProperty(
-      device->path(),
-      shill::kWakeOnWiFiFeaturesEnabledProperty,
-      base::StringValue(feature_string),
-      base::Bind(&base::DoNothing),
+      device->path(), shill::kWakeOnWiFiFeaturesEnabledProperty,
+      base::Value(feature_string), base::Bind(&base::DoNothing),
       network_handler::ErrorCallback());
 
   bool wake_on_packet_enabled = IsWakeOnPacketEnabled(current_feature_);

diff --git a/chrome/browser/chromeos/options/network_property_ui_data_unittest.cc b/chrome/browser/chromeos/options/network_property_ui_data_unittest.cc
index 5c6f6e56..adb18852 100644
--- a/chrome/browser/chromeos/options/network_property_ui_data_unittest.cc
+++ b/chrome/browser/chromeos/options/network_property_ui_data_unittest.cc

@@ -41,10 +41,10 @@
 TEST_F(NetworkPropertyUIDataTest, ParseOncProperty) {
   base::DictionaryValue onc;
 
-  base::StringValue val_a("a");
-  base::StringValue val_b("b");
-  base::StringValue val_a_a("a_a");
-  base::StringValue val_a_b("a_b");
+  base::Value val_a("a");
+  base::Value val_b("b");
+  base::Value val_a_a("a_a");
+  base::Value val_a_b("a_b");
 
   onc.Set("a", val_a.DeepCopy());
   onc.Set("b", val_b.DeepCopy());

diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
index 3d9977d..29b91ff 100644
--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc
+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.cc

@@ -62,7 +62,7 @@
   const base::Value* value = CrosSettings::Get()->GetPref(kDeviceOwner);
   if (!value || value->GetType() != base::Value::Type::STRING)
     return false;
-  return static_cast<const base::StringValue*>(value)->GetString() == user_id;
+  return static_cast<const base::Value*>(value)->GetString() == user_id;
 }
 
 void LoadPrivateKeyByPublicKey(

diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc
index f26bf46d..dbb622c 100644
--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos_unittest.cc

@@ -83,7 +83,7 @@
   const base::ListValue* list;
   if (!haystack->GetAsList(&list))
     return false;
-  return list->end() != list->Find(base::StringValue(needle));
+  return list->end() != list->Find(base::Value(needle));
 }
 
 }  // namespace
@@ -144,14 +144,14 @@
 };
 
 TEST_F(OwnerSettingsServiceChromeOSTest, SingleSetTest) {
-  TestSingleSet(service_, kReleaseChannel, base::StringValue("dev-channel"));
-  TestSingleSet(service_, kReleaseChannel, base::StringValue("beta-channel"));
-  TestSingleSet(service_, kReleaseChannel, base::StringValue("stable-channel"));
+  TestSingleSet(service_, kReleaseChannel, base::Value("dev-channel"));
+  TestSingleSet(service_, kReleaseChannel, base::Value("beta-channel"));
+  TestSingleSet(service_, kReleaseChannel, base::Value("stable-channel"));
 }
 
 TEST_F(OwnerSettingsServiceChromeOSTest, MultipleSetTest) {
   base::Value allow_guest(false);
-  base::StringValue release_channel("stable-channel");
+  base::Value release_channel("stable-channel");
   base::Value show_user_names(true);
 
   PrefsChecker checker(service_, provider_.get());
@@ -172,7 +172,7 @@
 
   // Check that DeviceSettingsProvider's cache is updated.
   PrefsChecker checker(service_, provider_.get());
-  checker.Set(kReleaseChannel, base::StringValue("stable-channel"));
+  checker.Set(kReleaseChannel, base::Value("stable-channel"));
   FlushDeviceSettings();
   checker.Wait();
 
@@ -186,7 +186,7 @@
   EXPECT_FALSE(FindInListValue(device_policy_.policy_data().username(),
                                provider_->Get(kAccountsPrefUsers)));
   // Force a settings write.
-  TestSingleSet(service_, kReleaseChannel, base::StringValue("dev-channel"));
+  TestSingleSet(service_, kReleaseChannel, base::Value("dev-channel"));
   EXPECT_TRUE(FindInListValue(device_policy_.policy_data().username(),
                               provider_->Get(kAccountsPrefUsers)));
 }

diff --git a/chrome/browser/chromeos/policy/affiliation_test_helper.cc b/chrome/browser/chromeos/policy/affiliation_test_helper.cc
index 13310b5..27b051a 100644
--- a/chrome/browser/chromeos/policy/affiliation_test_helper.cc
+++ b/chrome/browser/chromeos/policy/affiliation_test_helper.cc

@@ -99,7 +99,7 @@
 
 void PreLoginUser(const std::string& user_id) {
   ListPrefUpdate users_pref(g_browser_process->local_state(), "LoggedInUsers");
-  users_pref->AppendIfNotPresent(base::MakeUnique<base::StringValue>(user_id));
+  users_pref->AppendIfNotPresent(base::MakeUnique<base::Value>(user_id));
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 

diff --git a/chrome/browser/chromeos/policy/auto_enrollment_client.cc b/chrome/browser/chromeos/policy/auto_enrollment_client.cc
index 974922ae..2a54a10f 100644
--- a/chrome/browser/chromeos/policy/auto_enrollment_client.cc
+++ b/chrome/browser/chromeos/policy/auto_enrollment_client.cc

@@ -376,23 +376,18 @@
         response.device_state_retrieval_response();
     {
       DictionaryPrefUpdate dict(local_state_, prefs::kServerBackedDeviceState);
-      UpdateDict(dict.Get(),
-                 kDeviceStateManagementDomain,
+      UpdateDict(dict.Get(), kDeviceStateManagementDomain,
                  state_response.has_management_domain(),
-                 new base::StringValue(state_response.management_domain()));
+                 new base::Value(state_response.management_domain()));
 
       std::string restore_mode =
           ConvertRestoreMode(state_response.restore_mode());
-      UpdateDict(dict.Get(),
-                 kDeviceStateRestoreMode,
-                 !restore_mode.empty(),
-                 new base::StringValue(restore_mode));
+      UpdateDict(dict.Get(), kDeviceStateRestoreMode, !restore_mode.empty(),
+                 new base::Value(restore_mode));
 
-      UpdateDict(dict.Get(),
-                 kDeviceStateDisabledMessage,
+      UpdateDict(dict.Get(), kDeviceStateDisabledMessage,
                  state_response.has_disabled_state(),
-                 new base::StringValue(
-                     state_response.disabled_state().message()));
+                 new base::Value(state_response.disabled_state().message()));
 
       // Logging as "WARNING" to make sure it's preserved in the logs.
       LOG(WARNING) << "Restore mode: " << restore_mode;

diff --git a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc
index 725ffc9..6478a21 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc
+++ b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc

@@ -158,7 +158,7 @@
   // Set |kStringPolicy| to a string value.
   cloud_policy_store_.policy_map_.Set(
       kStringPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-      POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(std::string()),
+      POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(std::string()),
       nullptr);
   // Make |k10BytePolicy| reference 10 bytes of external data.
   SetExternalDataReference(

diff --git a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc
index c53a170..de3f990 100644
--- a/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc
+++ b/chrome/browser/chromeos/policy/cloud_external_data_policy_observer_unittest.cc

@@ -354,7 +354,7 @@
   if (!value.empty()) {
     policy_map.Set(key::kUserAvatarImage, POLICY_LEVEL_MANDATORY,
                    POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                   base::MakeUnique<base::StringValue>(value),
+                   base::MakeUnique<base::Value>(value),
                    external_data_manager_.CreateExternalDataFetcher(
                        key::kUserAvatarImage));
   }

diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc
index 6970f55a..ded0f9f 100644
--- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc
+++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc

@@ -303,7 +303,7 @@
 
   base::JSONWriter::WriteWithOptions(
       *toplevel_dict, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json_string);
-  return base::MakeUnique<base::StringValue>(json_string);
+  return base::MakeUnique<base::Value>(json_string);
 }
 
 PinnedLauncherAppsPolicyHandler::PinnedLauncherAppsPolicyHandler()

diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc
index 7cdf6674..3639151 100644
--- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc

@@ -237,7 +237,7 @@
   PolicyMap policy_map;
   policy_map.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>(kTestONC), nullptr);
+                 base::MakeUnique<base::Value>(kTestONC), nullptr);
   std::unique_ptr<NetworkConfigurationPolicyHandler> handler(
       NetworkConfigurationPolicyHandler::CreateForUserPolicy());
   PolicyErrorMap errors;
@@ -262,7 +262,7 @@
   PolicyMap policy_map;
   policy_map.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>(kTestONC), nullptr);
+                 base::MakeUnique<base::Value>(kTestONC), nullptr);
   std::unique_ptr<NetworkConfigurationPolicyHandler> handler(
       NetworkConfigurationPolicyHandler::CreateForUserPolicy());
   PolicyErrorMap errors;
@@ -288,7 +288,7 @@
   PolicyMap policy_map;
   policy_map.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>(kTestONC), nullptr);
+                 base::MakeUnique<base::Value>(kTestONC), nullptr);
   std::unique_ptr<NetworkConfigurationPolicyHandler> handler(
       NetworkConfigurationPolicyHandler::CreateForUserPolicy());
   PolicyErrorMap errors;
@@ -317,7 +317,7 @@
   EXPECT_TRUE(prefs.GetValue(prefs::kPolicyPinnedLauncherApps, &value));
   EXPECT_TRUE(base::Value::Equals(&expected_pinned_apps, value));
 
-  base::StringValue entry1("abcdefghijklmnopabcdefghijklmnop");
+  base::Value entry1("abcdefghijklmnopabcdefghijklmnop");
   auto entry1_dict = base::MakeUnique<base::DictionaryValue>();
   entry1_dict->Set(ash::launcher::kPinnedAppsPrefAppIDPath, entry1.DeepCopy());
   expected_pinned_apps.Append(std::move(entry1_dict));

diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
index 1d48467f..064ac83 100644
--- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc

@@ -2292,7 +2292,7 @@
   }
 
   // Verify that the app policy was set.
-  base::StringValue expected_value("policy test value one");
+  base::Value expected_value("policy test value one");
   EXPECT_TRUE(base::Value::Equals(
       &expected_value,
       policy_service->GetPolicies(ns).GetValue("string")));
@@ -2317,7 +2317,7 @@
   }
 
   // Verify that the app policy was updated.
-  base::StringValue expected_new_value("policy test value two");
+  base::Value expected_new_value("policy test value two");
   EXPECT_TRUE(base::Value::Equals(
       &expected_new_value,
       policy_service->GetPolicies(ns).GetValue("string")));

diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
index 692b1f9b..3e24c53 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc

@@ -71,7 +71,7 @@
     chrome_policy_overrides->Set(
         key::kShelfAutoHideBehavior, POLICY_LEVEL_MANDATORY,
         POLICY_SCOPE_MACHINE, POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
-        base::MakeUnique<base::StringValue>("Never"), nullptr);
+        base::MakeUnique<base::Value>("Never"), nullptr);
     // Force the |ShowLogoutButtonInTray| policy to |true|, ensuring that a big,
     // red logout button is shown in the ash system tray.
     chrome_policy_overrides->Set(key::kShowLogoutButtonInTray,

diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
index 17687133..7caf7618 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc

@@ -811,10 +811,10 @@
       base::MakeUnique<base::Value>(
           chromeos::PowerPolicyController::ACTION_STOP_SESSION),
       nullptr);
-  expected_policy_map_.Set(
-      key::kShelfAutoHideBehavior, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-      POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
-      base::MakeUnique<base::StringValue>("Never"), nullptr);
+  expected_policy_map_.Set(key::kShelfAutoHideBehavior, POLICY_LEVEL_MANDATORY,
+                           POLICY_SCOPE_MACHINE,
+                           POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
+                           base::MakeUnique<base::Value>("Never"), nullptr);
   expected_policy_map_.Set(key::kShowLogoutButtonInTray, POLICY_LEVEL_MANDATORY,
                            POLICY_SCOPE_MACHINE,
                            POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,

diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
index 05e89be2..6d92f46a 100644
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc

@@ -107,7 +107,7 @@
   if (value < 0 || value >= static_cast<int>(arraysize(kConnectionTypes)))
     return nullptr;
 
-  return base::MakeUnique<base::StringValue>(kConnectionTypes[value]);
+  return base::MakeUnique<base::Value>(kConnectionTypes[value]);
 }
 
 void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy,
@@ -238,11 +238,10 @@
                   POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
                   std::move(account_list), nullptr);
     if (container.has_auto_login_id()) {
-      policies->Set(
-          key::kDeviceLocalAccountAutoLoginId, POLICY_LEVEL_MANDATORY,
-          POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
-          base::MakeUnique<base::StringValue>(container.auto_login_id()),
-          nullptr);
+      policies->Set(key::kDeviceLocalAccountAutoLoginId, POLICY_LEVEL_MANDATORY,
+                    POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+                    base::MakeUnique<base::Value>(container.auto_login_id()),
+                    nullptr);
     }
     if (container.has_auto_login_delay()) {
       policies->Set(key::kDeviceLocalAccountAutoLoginDelay,
@@ -357,7 +356,7 @@
     policies->Set(key::kDeviceLoginScreenDomainAutoComplete,
                   POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
                   POLICY_SOURCE_CLOUD,
-                  base::MakeUnique<base::StringValue>(
+                  base::MakeUnique<base::Value>(
                       container.login_screen_domain_auto_complete()),
                   nullptr);
   }
@@ -425,7 +424,7 @@
         policy.open_network_configuration().open_network_configuration());
     policies->Set(key::kDeviceOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
                   POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
-                  base::MakeUnique<base::StringValue>(config), nullptr);
+                  base::MakeUnique<base::Value>(config), nullptr);
   }
 }
 
@@ -533,7 +532,7 @@
       std::string channel(container.release_channel());
       policies->Set(key::kChromeOsReleaseChannel, POLICY_LEVEL_MANDATORY,
                     POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
-                    base::MakeUnique<base::StringValue>(channel), nullptr);
+                    base::MakeUnique<base::Value>(channel), nullptr);
       // TODO(dubroy): Once http://crosbug.com/17015 is implemented, we won't
       // have to pass the channel in here, only ping the update engine to tell
       // it to fetch the channel from the policy.
@@ -559,11 +558,11 @@
     }
 
     if (container.has_target_version_prefix()) {
-      policies->Set(key::kDeviceTargetVersionPrefix, POLICY_LEVEL_MANDATORY,
-                    POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
-                    base::MakeUnique<base::StringValue>(
-                        container.target_version_prefix()),
-                    nullptr);
+      policies->Set(
+          key::kDeviceTargetVersionPrefix, POLICY_LEVEL_MANDATORY,
+          POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
+          base::MakeUnique<base::Value>(container.target_version_prefix()),
+          nullptr);
     }
 
     // target_version_display_name is not actually a policy, but a display
@@ -708,11 +707,11 @@
 
   if (policy.has_system_timezone()) {
     if (policy.system_timezone().has_timezone()) {
-      policies->Set(key::kSystemTimezone, POLICY_LEVEL_MANDATORY,
-                    POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD,
-                    base::MakeUnique<base::StringValue>(
-                        policy.system_timezone().timezone()),
-                    nullptr);
+      policies->Set(
+          key::kSystemTimezone, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
+          POLICY_SOURCE_CLOUD,
+          base::MakeUnique<base::Value>(policy.system_timezone().timezone()),
+          nullptr);
     }
 
     if (policy.system_timezone().has_timezone_detection_type()) {
@@ -761,7 +760,7 @@
     const em::StartUpFlagsProto& container(policy.start_up_flags());
     std::unique_ptr<base::ListValue> flags(new base::ListValue());
     for (const auto& entry : container.flags())
-      flags->Append(base::MakeUnique<base::StringValue>(entry));
+      flags->Append(base::MakeUnique<base::Value>(entry));
     policies->Set(key::kDeviceStartUpFlags, POLICY_LEVEL_MANDATORY,
                   POLICY_SCOPE_MACHINE, POLICY_SOURCE_CLOUD, std::move(flags),
                   nullptr);
@@ -772,7 +771,7 @@
       policies->Set(key::kDeviceVariationsRestrictParameter,
                     POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
                     POLICY_SOURCE_CLOUD,
-                    base::MakeUnique<base::StringValue>(
+                    base::MakeUnique<base::Value>(
                         policy.variations_parameter().parameter()),
                     nullptr);
     }

diff --git a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
index b5c33399..20278f2 100644
--- a/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc
+++ b/chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

@@ -1395,19 +1395,17 @@
       test_device_client->AddDevice(dev.device_path, dev.type,
                                     dev.object_path);
       if (*dev.mac_address) {
-        test_device_client->SetDeviceProperty(
-            dev.device_path, shill::kAddressProperty,
-            base::StringValue(dev.mac_address));
+        test_device_client->SetDeviceProperty(dev.device_path,
+                                              shill::kAddressProperty,
+                                              base::Value(dev.mac_address));
       }
       if (*dev.meid) {
         test_device_client->SetDeviceProperty(
-            dev.device_path, shill::kMeidProperty,
-            base::StringValue(dev.meid));
+            dev.device_path, shill::kMeidProperty, base::Value(dev.meid));
       }
       if (*dev.imei) {
         test_device_client->SetDeviceProperty(
-            dev.device_path, shill::kImeiProperty,
-            base::StringValue(dev.imei));
+            dev.device_path, shill::kImeiProperty, base::Value(dev.imei));
       }
     }
 
@@ -1431,13 +1429,13 @@
       service_client->SetServiceProperty(
           fake_network.name, shill::kSignalStrengthProperty,
           base::Value(fake_network.signal_strength));
-      service_client->SetServiceProperty(
-          fake_network.name, shill::kDeviceProperty,
-          base::StringValue(fake_network.device_path));
+      service_client->SetServiceProperty(fake_network.name,
+                                         shill::kDeviceProperty,
+                                         base::Value(fake_network.device_path));
       // Set the profile so this shows up as a configured network.
-      service_client->SetServiceProperty(
-          fake_network.name, shill::kProfileProperty,
-          base::StringValue(fake_network.name));
+      service_client->SetServiceProperty(fake_network.name,
+                                         shill::kProfileProperty,
+                                         base::Value(fake_network.name));
       if (strlen(fake_network.address) > 0) {
         // Set the IP config.
         base::DictionaryValue ip_config_properties;
@@ -1450,9 +1448,9 @@
             GetTestInterface();
         const std::string kIPConfigPath = "test_ip_config";
         ip_config_test->AddIPConfig(kIPConfigPath, ip_config_properties);
-        service_client->SetServiceProperty(
-            fake_network.name, shill::kIPConfigProperty,
-            base::StringValue(kIPConfigPath));
+        service_client->SetServiceProperty(fake_network.name,
+                                           shill::kIPConfigProperty,
+                                           base::Value(kIPConfigPath));
       }
     }
 
@@ -1470,7 +1468,7 @@
         base::Value(kUnconfiguredNetwork.signal_strength));
     service_client->SetServiceProperty(
         kUnconfiguredNetwork.name, shill::kDeviceProperty,
-        base::StringValue(kUnconfiguredNetwork.device_path));
+        base::Value(kUnconfiguredNetwork.device_path));
 
     // Flush out pending state updates.
     base::RunLoop().RunUntilIdle();

diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc
index a1bde68..e6123b8 100644
--- a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc
+++ b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc

@@ -358,7 +358,7 @@
   PolicyMap policy;
   policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>(onc_policy), nullptr);
+             base::MakeUnique<base::Value>(onc_policy), nullptr);
   UpdateProviderPolicy(policy);
 
   EXPECT_CALL(network_config_handler_,
@@ -479,7 +479,7 @@
   PolicyMap policy;
   policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>(kFakeONC), nullptr);
+             base::MakeUnique<base::Value>(kFakeONC), nullptr);
   UpdateProviderPolicy(policy);
   base::RunLoop().RunUntilIdle();
 
@@ -500,7 +500,7 @@
   PolicyMap policy;
   policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>(kFakeONC), nullptr);
+             base::MakeUnique<base::Value>(kFakeONC), nullptr);
   UpdateProviderPolicy(policy);
 
   EXPECT_CALL(network_config_handler_,
@@ -567,7 +567,7 @@
 TEST_P(NetworkConfigurationUpdaterTestWithParam, InitialUpdates) {
   PolicyMap policy;
   policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(kFakeONC),
+             POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(kFakeONC),
              nullptr);
   UpdateProviderPolicy(policy);
 
@@ -589,7 +589,7 @@
        PolicyNotSetBeforePolicyProviderInitialized) {
   PolicyMap policy;
   policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(kFakeONC),
+             POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(kFakeONC),
              nullptr);
   UpdateProviderPolicy(policy);
 
@@ -617,7 +617,7 @@
 
   PolicyMap policy;
   policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(kFakeONC),
+             POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(kFakeONC),
              nullptr);
   UpdateProviderPolicy(policy);
 
@@ -657,7 +657,7 @@
 
   PolicyMap policy;
   policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(kFakeONC),
+             POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(kFakeONC),
              nullptr);
   UpdateProviderPolicy(policy);
   Mock::VerifyAndClearExpectations(&network_config_handler_);

diff --git a/chrome/browser/chromeos/policy/policy_cert_service_factory.cc b/chrome/browser/chromeos/policy/policy_cert_service_factory.cc
index 3d8aeb82..246c8ea 100644
--- a/chrome/browser/chromeos/policy/policy_cert_service_factory.cc
+++ b/chrome/browser/chromeos/policy/policy_cert_service_factory.cc

@@ -60,13 +60,13 @@
     const std::string& user_id) {
   ListPrefUpdate update(g_browser_process->local_state(),
                         prefs::kUsedPolicyCertificates);
-  update->Remove(base::StringValue(user_id), NULL);
+  update->Remove(base::Value(user_id), NULL);
 }
 
 // static
 bool PolicyCertServiceFactory::UsedPolicyCertificates(
     const std::string& user_id) {
-  base::StringValue value(user_id);
+  base::Value value(user_id);
   const base::ListValue* list =
       g_browser_process->local_state()->GetList(prefs::kUsedPolicyCertificates);
   if (!list) {

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc
index 1850222..d8f7558 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc

@@ -140,7 +140,7 @@
     GetExpectedDefaultPolicy(&policy_map_);
     policy_map_.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY,
                     POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                    base::MakeUnique<base::StringValue>("http://chromium.org"),
+                    base::MakeUnique<base::Value>("http://chromium.org"),
                     nullptr);
     expected_bundle_.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
         .CopyFrom(policy_map_);

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc
index 637bc2b..e031a8d 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc

@@ -122,7 +122,7 @@
     const PolicyMap::Entry* entry =
         store_->policy_map().Get(key::kHomepageLocation);
     ASSERT_TRUE(entry);
-    EXPECT_TRUE(base::StringValue(expected_value).Equals(entry->value.get()));
+    EXPECT_TRUE(base::Value(expected_value).Equals(entry->value.get()));
   }
 
   void StoreUserPolicyKey(const std::string& public_key) {
@@ -158,7 +158,7 @@
     if (previous_value) {
       previous_policy.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY,
                           POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                          base::MakeUnique<base::StringValue>(previous_value),
+                          base::MakeUnique<base::Value>(previous_value),
                           nullptr);
     }
     EXPECT_TRUE(previous_policy.Equals(store_->policy_map()));

diff --git a/chrome/browser/chromeos/preferences_unittest.cc b/chrome/browser/chromeos/preferences_unittest.cc
index 5ab6440..03168441 100644
--- a/chrome/browser/chromeos/preferences_unittest.cc
+++ b/chrome/browser/chromeos/preferences_unittest.cc

@@ -372,13 +372,12 @@
   // Create some values to come from the server.
   syncer::SyncDataList sync_data_list;
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreferredLanguagesSyncable, base::StringValue("ru,fi")));
+      prefs::kLanguagePreferredLanguagesSyncable, base::Value("ru,fi")));
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreloadEnginesSyncable,
-      base::StringValue("xkb:se::swe")));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguageEnabledExtensionImesSyncable,
-      base::StringValue(kIdentityIMEID)));
+      prefs::kLanguagePreloadEnginesSyncable, base::Value("xkb:se::swe")));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguageEnabledExtensionImesSyncable,
+                         base::Value(kIdentityIMEID)));
 
   // Sync for the first time.
   syncer::SyncableService* sync =
@@ -413,23 +412,17 @@
   // Update the global values from the server again.
   syncer::SyncChangeList change_list;
   change_list.push_back(syncer::SyncChange(
-      FROM_HERE,
-      syncer::SyncChange::ACTION_UPDATE,
-      CreatePrefSyncData(
-          prefs::kLanguagePreferredLanguagesSyncable,
-          base::StringValue("de"))));
+      FROM_HERE, syncer::SyncChange::ACTION_UPDATE,
+      CreatePrefSyncData(prefs::kLanguagePreferredLanguagesSyncable,
+                         base::Value("de"))));
   change_list.push_back(syncer::SyncChange(
-      FROM_HERE,
-      syncer::SyncChange::ACTION_UPDATE,
-      CreatePrefSyncData(
-          prefs::kLanguagePreloadEnginesSyncable,
-          base::StringValue(ToInputMethodIds("xkb:de::ger")))));
+      FROM_HERE, syncer::SyncChange::ACTION_UPDATE,
+      CreatePrefSyncData(prefs::kLanguagePreloadEnginesSyncable,
+                         base::Value(ToInputMethodIds("xkb:de::ger")))));
   change_list.push_back(syncer::SyncChange(
-      FROM_HERE,
-      syncer::SyncChange::ACTION_UPDATE,
-      CreatePrefSyncData(
-          prefs::kLanguageEnabledExtensionImesSyncable,
-          base::StringValue(kToUpperIMEID))));
+      FROM_HERE, syncer::SyncChange::ACTION_UPDATE,
+      CreatePrefSyncData(prefs::kLanguageEnabledExtensionImesSyncable,
+                         base::Value(kToUpperIMEID))));
   sync->ProcessSyncChanges(FROM_HERE, change_list);
   content::RunAllBlockingPoolTasksUntilIdle();
 
@@ -465,12 +458,12 @@
   // Create some values to come from the server.
   syncer::SyncDataList sync_data_list;
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreferredLanguages, base::StringValue("ru,fi")));
+      prefs::kLanguagePreferredLanguages, base::Value("ru,fi")));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguagePreloadEngines,
+                         base::Value(ToInputMethodIds("xkb:ru::rus"))));
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreloadEngines,
-      base::StringValue(ToInputMethodIds("xkb:ru::rus"))));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguageEnabledExtensionImes, base::StringValue(kIdentityIMEID)));
+      prefs::kLanguageEnabledExtensionImes, base::Value(kIdentityIMEID)));
 
   // Sync.
   syncer::SyncableService* sync =
@@ -505,13 +498,13 @@
   // Sync. Since this is an existing profile, the local values shouldn't change.
   syncer::SyncDataList sync_data_list;
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreferredLanguagesSyncable, base::StringValue("ru,fi")));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreloadEnginesSyncable,
-      base::StringValue(ToInputMethodIds("xkb:ru::rus"))));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguageEnabledExtensionImesSyncable,
-      base::StringValue(kToUpperIMEID)));
+      prefs::kLanguagePreferredLanguagesSyncable, base::Value("ru,fi")));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguagePreloadEnginesSyncable,
+                         base::Value(ToInputMethodIds("xkb:ru::rus"))));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguageEnabledExtensionImesSyncable,
+                         base::Value(kToUpperIMEID)));
 
   syncer::SyncableService* sync =
       pref_service_->GetSyncableService(
@@ -559,16 +552,16 @@
 
   // Create some tricky values to come from the server.
   syncer::SyncDataList sync_data_list;
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreferredLanguagesSyncable,
-      base::StringValue("ar,fi,es,de,ar")));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguagePreferredLanguagesSyncable,
+                         base::Value("ar,fi,es,de,ar")));
   sync_data_list.push_back(CreatePrefSyncData(
       prefs::kLanguagePreloadEnginesSyncable,
-      base::StringValue(
+      base::Value(
           "nacl_mozc_us,xkb:ru::rus,xkb:ru::rus,xkb:es::spa,xkb:es::spa")));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguageEnabledExtensionImesSyncable,
-      base::StringValue(std::string())));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguageEnabledExtensionImesSyncable,
+                         base::Value(std::string())));
 
   // Sync for the first time.
   syncer::SyncableService* sync =
@@ -612,15 +605,14 @@
       "_comp_ime_nothisisnotactuallyanextensionidxkb:es::spa," +
       ToInputMethodIds("xkb:jp::jpn"));
   syncer::SyncDataList sync_data_list;
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguagePreferredLanguagesSyncable,
+                         base::Value("klingon,en-US")));
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreferredLanguagesSyncable,
-      base::StringValue("klingon,en-US")));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreloadEnginesSyncable,
-      base::StringValue(preload_engines)));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguageEnabledExtensionImesSyncable,
-      base::StringValue(kUnknownIMEID)));
+      prefs::kLanguagePreloadEnginesSyncable, base::Value(preload_engines)));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguageEnabledExtensionImesSyncable,
+                         base::Value(kUnknownIMEID)));
 
   // Sync for the first time.
   syncer::SyncableService* sync =
@@ -655,14 +647,12 @@
       "xkb:ru::rus,xkb:xy::xyz," + ToInputMethodIds("xkb:jp::jpn"));
   syncer::SyncDataList sync_data_list;
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreferredLanguagesSyncable,
-      base::StringValue("en-US")));
+      prefs::kLanguagePreferredLanguagesSyncable, base::Value("en-US")));
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreloadEnginesSyncable,
-      base::StringValue(preload_engines)));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguageEnabledExtensionImesSyncable,
-      base::StringValue(kUnknownIMEID)));
+      prefs::kLanguagePreloadEnginesSyncable, base::Value(preload_engines)));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguageEnabledExtensionImesSyncable,
+                         base::Value(kUnknownIMEID)));
 
   // Sync for the first time.
   syncer::SyncableService* sync =

diff --git a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
index 84e0632..71530e9 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc

@@ -350,10 +350,11 @@
         NetworkHandler::Get()->network_state_handler();
     const NetworkState* network = network_state_handler->DefaultNetwork();
     ASSERT_TRUE(network);
-    DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface()->
-        SetServiceProperty(network->path(),
-                           shill::kProxyConfigProperty,
-                           base::StringValue(proxy_config));
+    DBusThreadManager::Get()
+        ->GetShillServiceClient()
+        ->GetTestInterface()
+        ->SetServiceProperty(network->path(), shill::kProxyConfigProperty,
+                             base::Value(proxy_config));
   }
 
   // Synchronously gets the latest proxy config.

diff --git a/chrome/browser/chromeos/proxy_cros_settings_parser.cc b/chrome/browser/chromeos/proxy_cros_settings_parser.cc
index b5bd565..72dd496 100644
--- a/chrome/browser/chromeos/proxy_cros_settings_parser.cc
+++ b/chrome/browser/chromeos/proxy_cros_settings_parser.cc

@@ -17,9 +17,9 @@
 namespace {
 
 base::Value* CreateServerHostValue(const UIProxyConfig::ManualProxy& proxy) {
-  return proxy.server.is_valid() ?
-         new base::StringValue(proxy.server.host_port_pair().host()) :
-         NULL;
+  return proxy.server.is_valid()
+             ? new base::Value(proxy.server.host_port_pair().host())
+             : NULL;
 }
 
 base::Value* CreateServerPortValue(const UIProxyConfig::ManualProxy& proxy) {
@@ -292,7 +292,7 @@
     // Only show pacurl for pac-script mode.
     if (config.mode == UIProxyConfig::MODE_PAC_SCRIPT &&
         config.automatic_proxy.pac_url.is_valid()) {
-      data = new base::StringValue(config.automatic_proxy.pac_url.spec());
+      data = new base::Value(config.automatic_proxy.pac_url.spec());
     }
   } else if (path == kProxySingleHttp) {
     data = CreateServerHostValue(config.single_proxy);
@@ -357,7 +357,7 @@
   // Decorate pref value as CoreOptionsHandler::CreateValueForPref() does.
   base::DictionaryValue* dict = new base::DictionaryValue;
   if (!data)
-    data = new base::StringValue("");
+    data = new base::Value("");
   dict->Set("value", data);
   if (path == kProxyType) {
     if (!controlled_by.empty())

diff --git a/chrome/browser/chromeos/session_length_limiter_unittest.cc b/chrome/browser/chromeos/session_length_limiter_unittest.cc
index 25f17d1..43a7640 100644
--- a/chrome/browser/chromeos/session_length_limiter_unittest.cc
+++ b/chrome/browser/chromeos/session_length_limiter_unittest.cc

@@ -121,10 +121,9 @@
 
 void SessionLengthLimiterTest::SetSessionStartTimePref(
     const base::TimeTicks& session_start_time) {
-  local_state_.SetUserPref(
-      prefs::kSessionStartTime,
-      new base::StringValue(
-          base::Int64ToString(session_start_time.ToInternalValue())));
+  local_state_.SetUserPref(prefs::kSessionStartTime,
+                           new base::Value(base::Int64ToString(
+                               session_start_time.ToInternalValue())));
 }
 
 void SessionLengthLimiterTest::ClearSessionStartTimePref() {

diff --git a/chrome/browser/chromeos/settings/cros_settings.cc b/chrome/browser/chromeos/settings/cros_settings.cc
index a5df79c..91042aac4 100644
--- a/chrome/browser/chromeos/settings/cros_settings.cc
+++ b/chrome/browser/chromeos/settings/cros_settings.cc

@@ -140,7 +140,7 @@
 void CrosSettings::SetString(const std::string& path,
                              const std::string& in_value) {
   DCHECK(CalledOnValidThread());
-  base::StringValue value(in_value);
+  base::Value value(in_value);
   Set(path, value);
 }
 

diff --git a/chrome/browser/chromeos/settings/cros_settings_unittest.cc b/chrome/browser/chromeos/settings/cros_settings_unittest.cc
index 5281063..da1dc1d 100644
--- a/chrome/browser/chromeos/settings/cros_settings_unittest.cc
+++ b/chrome/browser/chromeos/settings/cros_settings_unittest.cc

@@ -133,7 +133,7 @@
 TEST_F(CrosSettingsTest, SetWhitelistWithListOps) {
   std::unique_ptr<base::ListValue> whitelist =
       base::MakeUnique<base::ListValue>();
-  base::StringValue hacky_user("h@xxor");
+  base::Value hacky_user("h@xxor");
   whitelist->Append(hacky_user.CreateDeepCopy());
   AddExpectation(kAccountsPrefAllowNewUser,
                  base::MakeUnique<base::Value>(false));
@@ -146,8 +146,8 @@
 
 TEST_F(CrosSettingsTest, SetWhitelistWithListOps2) {
   base::ListValue whitelist;
-  base::StringValue hacky_user("h@xxor");
-  base::StringValue lamy_user("l@mer");
+  base::Value hacky_user("h@xxor");
+  base::Value lamy_user("l@mer");
   whitelist.Append(hacky_user.CreateDeepCopy());
   std::unique_ptr<base::ListValue> expected_list = whitelist.CreateDeepCopy();
   whitelist.Append(lamy_user.CreateDeepCopy());

diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc b/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc
index e2a6a7f..b1fc1c19 100644
--- a/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_oauth2_token_service_unittest.cc

@@ -142,8 +142,7 @@
   // (it must have a non-empty value or it won't be used).
   void SetDeviceRefreshTokenInLocalState(const std::string& refresh_token) {
     scoped_testing_local_state_.Get()->SetUserPref(
-        prefs::kDeviceRobotAnyApiRefreshToken,
-        new base::StringValue(refresh_token));
+        prefs::kDeviceRobotAnyApiRefreshToken, new base::Value(refresh_token));
   }
 
   std::string GetValidTokenInfoResponse(const std::string& email) {

diff --git a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
index 7f28e95e..cf507846 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc

@@ -191,7 +191,7 @@
 
   // Helper routine to check value of the LoginScreenDomainAutoComplete policy.
   void VerifyDomainAutoComplete(
-      const base::StringValue* const ptr_to_expected_value) {
+      const base::Value* const ptr_to_expected_value) {
     EXPECT_TRUE(base::Value::Equals(
         provider_->Get(kAccountsPrefLoginScreenDomainAutoComplete),
         ptr_to_expected_value));
@@ -241,7 +241,7 @@
   // Sets should succeed though and be readable from the cache.
   EXPECT_CALL(*this, SettingChanged(_)).Times(AnyNumber());
   EXPECT_CALL(*this, SettingChanged(kReleaseChannel)).Times(1);
-  base::StringValue new_value("stable-channel");
+  base::Value new_value("stable-channel");
   provider_->Set(kReleaseChannel, new_value);
   Mock::VerifyAndClearExpectations(this);
 
@@ -316,9 +316,9 @@
 
   EXPECT_CALL(*this, SettingChanged(_)).Times(AnyNumber());
 
-  base::StringValue value1("beta");
+  base::Value value1("beta");
   provider_->Set(kReleaseChannel, value1);
-  base::StringValue value2("dev");
+  base::Value value2("dev");
   provider_->Set(kReleaseChannel, value2);
 
   // Let the changes propagate through the system.
@@ -425,7 +425,7 @@
   const base::Value expected_disabled_value(true);
   EXPECT_TRUE(base::Value::Equals(provider_->Get(kDeviceDisabled),
                                   &expected_disabled_value));
-  const base::StringValue expected_disabled_message_value(kDisabledMessage);
+  const base::Value expected_disabled_message_value(kDisabledMessage);
   EXPECT_TRUE(base::Value::Equals(provider_->Get(kDeviceDisabledMessage),
                                   &expected_disabled_message_value));
 
@@ -477,7 +477,7 @@
 
   // Check some meaningful value. Policy should be set.
   const std::string domain = "domain.test";
-  const base::StringValue domain_value(domain);
+  const base::Value domain_value(domain);
   SetDomainAutoComplete(domain);
   VerifyDomainAutoComplete(&domain_value);
 }

diff --git a/chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.cc b/chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.cc
index e66d198..ccc9206 100644
--- a/chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.cc
+++ b/chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.cc

@@ -95,7 +95,7 @@
 
 void ScopedCrosSettingsTestHelper::SetString(const std::string& path,
                                              const std::string& in_value) {
-  Set(path, base::StringValue(in_value));
+  Set(path, base::Value(in_value));
 }
 
 void ScopedCrosSettingsTestHelper::StoreCachedDeviceSetting(

diff --git a/chrome/browser/chromeos/settings/stub_cros_settings_provider_unittest.cc b/chrome/browser/chromeos/settings/stub_cros_settings_provider_unittest.cc
index 1a6b4a6..829dbe9 100644
--- a/chrome/browser/chromeos/settings/stub_cros_settings_provider_unittest.cc
+++ b/chrome/browser/chromeos/settings/stub_cros_settings_provider_unittest.cc

@@ -73,7 +73,7 @@
 
 TEST_F(StubCrosSettingsProviderTest, Set) {
   // Setting value and reading it afterwards returns the same value.
-  base::StringValue owner_value("me@owner");
+  base::Value owner_value("me@owner");
   provider_->Set(kDeviceOwner, owner_value);
   AssertPref(kDeviceOwner, &owner_value);
   ExpectObservers(kDeviceOwner, 1);
@@ -81,7 +81,7 @@
 
 TEST_F(StubCrosSettingsProviderTest, SetMissing) {
   // Setting is missing initially but is added by |Set|.
-  base::StringValue pref_value("testing");
+  base::Value pref_value("testing");
   ASSERT_FALSE(provider_->Get(kReleaseChannel));
   provider_->Set(kReleaseChannel, pref_value);
   AssertPref(kReleaseChannel, &pref_value);

diff --git a/chrome/browser/chromeos/settings/system_settings_provider.cc b/chrome/browser/chromeos/settings/system_settings_provider.cc
index 3a0668f..e636b91 100644
--- a/chrome/browser/chromeos/settings/system_settings_provider.cc
+++ b/chrome/browser/chromeos/settings/system_settings_provider.cc

@@ -18,8 +18,8 @@
   system::TimezoneSettings *timezone_settings =
       system::TimezoneSettings::GetInstance();
   timezone_settings->AddObserver(this);
-  timezone_value_.reset(new base::StringValue(
-      timezone_settings->GetCurrentTimezoneID()));
+  timezone_value_.reset(
+      new base::Value(timezone_settings->GetCurrentTimezoneID()));
 }
 
 SystemSettingsProvider::~SystemSettingsProvider() {
@@ -61,8 +61,8 @@
 
 void SystemSettingsProvider::TimezoneChanged(const icu::TimeZone& timezone) {
   // Fires system setting change notification.
-  timezone_value_.reset(new base::StringValue(
-      system::TimezoneSettings::GetTimezoneID(timezone)));
+  timezone_value_.reset(
+      new base::Value(system::TimezoneSettings::GetTimezoneID(timezone)));
   NotifyObservers(kSystemTimezone);
 }
 

diff --git a/chrome/browser/chromeos/settings/system_settings_provider.h b/chrome/browser/chromeos/settings/system_settings_provider.h
index 0a59bc5..e61761f 100644
--- a/chrome/browser/chromeos/settings/system_settings_provider.h
+++ b/chrome/browser/chromeos/settings/system_settings_provider.h

@@ -16,7 +16,6 @@
 
 namespace base {
 class Value;
-using StringValue = Value;
 }
 
 namespace chromeos {
@@ -39,7 +38,7 @@
   // CrosSettingsProvider implementation.
   void DoSet(const std::string& path, const base::Value& in_value) override;
 
-  std::unique_ptr<base::StringValue> timezone_value_;
+  std::unique_ptr<base::Value> timezone_value_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemSettingsProvider);
 };

diff --git a/chrome/browser/chromeos/status/data_promo_notification_unittest.cc b/chrome/browser/chromeos/status/data_promo_notification_unittest.cc
index 901f660..6922e28 100644
--- a/chrome/browser/chromeos/status/data_promo_notification_unittest.cc
+++ b/chrome/browser/chromeos/status/data_promo_notification_unittest.cc

@@ -134,7 +134,7 @@
                              "activated", true /* visible */);
     service_test->SetServiceProperty(
         kCellularServicePath, shill::kActivationStateProperty,
-        base::StringValue(shill::kActivationStateActivated));
+        base::Value(shill::kActivationStateActivated));
     service_test->SetServiceProperty(
         kCellularServicePath, shill::kConnectableProperty, base::Value(true));
   }

diff --git a/chrome/browser/component_updater/origin_trials_component_installer.cc b/chrome/browser/component_updater/origin_trials_component_installer.cc
index 9378dcf..455403d0 100644
--- a/chrome/browser/component_updater/origin_trials_component_installer.cc
+++ b/chrome/browser/component_updater/origin_trials_component_installer.cc

@@ -87,7 +87,7 @@
   std::string override_public_key;
   if (manifest->GetString(kManifestPublicKeyPath, &override_public_key)) {
     local_state->Set(prefs::kOriginTrialPublicKey,
-                     base::StringValue(override_public_key));
+                     base::Value(override_public_key));
   } else {
     local_state->ClearPref(prefs::kOriginTrialPublicKey);
   }

diff --git a/chrome/browser/component_updater/origin_trials_component_installer_unittest.cc b/chrome/browser/component_updater/origin_trials_component_installer_unittest.cc
index 34cbbf0..6fe5938 100644
--- a/chrome/browser/component_updater/origin_trials_component_installer_unittest.cc
+++ b/chrome/browser/component_updater/origin_trials_component_installer_unittest.cc

@@ -115,7 +115,7 @@
 TEST_F(OriginTrialsComponentInstallerTest,
        PublicKeyResetToDefaultWhenOverrideMissing) {
   local_state()->Set(prefs::kOriginTrialPublicKey,
-                     base::StringValue(kExistingPublicKey));
+                     base::Value(kExistingPublicKey));
   ASSERT_EQ(kExistingPublicKey,
             local_state()->GetString(prefs::kOriginTrialPublicKey));
 

diff --git a/chrome/browser/component_updater/supervised_user_whitelist_installer.cc b/chrome/browser/component_updater/supervised_user_whitelist_installer.cc
index d0e79cc..73e0a94 100644
--- a/chrome/browser/component_updater/supervised_user_whitelist_installer.cc
+++ b/chrome/browser/component_updater/supervised_user_whitelist_installer.cc

@@ -439,7 +439,7 @@
   base::ListValue* clients = nullptr;
   success = whitelist_dict->GetList(kClients, &clients);
 
-  const bool removed = clients->Remove(base::StringValue(client_id), nullptr);
+  const bool removed = clients->Remove(base::Value(client_id), nullptr);
 
   if (!clients->empty())
     return removed;
@@ -549,8 +549,8 @@
       clients = new base::ListValue;
       whitelist_dict->Set(kClients, clients);
     }
-    bool success = clients->AppendIfNotPresent(
-        base::MakeUnique<base::StringValue>(client_id));
+    bool success =
+        clients->AppendIfNotPresent(base::MakeUnique<base::Value>(client_id));
     DCHECK(success);
   }
 

diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc
index 91bb6ee7e..a5ef5f6f 100644
--- a/chrome/browser/devtools/devtools_ui_bindings.cc
+++ b/chrome/browser/devtools/devtools_ui_bindings.cc

@@ -290,7 +290,7 @@
   }
 
   base::Value* id = new base::Value(stream_id_);
-  base::StringValue* chunkValue = new base::StringValue(chunk);
+  base::Value* chunkValue = new base::Value(chunk);
   base::Value* encodedValue = new base::Value(encoded);
 
   content::BrowserThread::PostTask(
@@ -633,7 +633,7 @@
 
   base::Value total_size(static_cast<int>(message.length()));
   for (size_t pos = 0; pos < message.length(); pos += kMaxMessageChunkSize) {
-    base::StringValue message_value(message.substr(pos, kMaxMessageChunkSize));
+    base::Value message_value(message.substr(pos, kMaxMessageChunkSize));
     CallClientFunction("DevToolsAPI.dispatchMessageChunk",
                        &message_value, pos ? NULL : &total_size, NULL);
   }
@@ -1090,7 +1090,7 @@
     callback.Run(nullptr);
     return;
   }
-  base::StringValue message_value(message);
+  base::Value message_value(message);
   callback.Run(&message_value);
 }
 
@@ -1130,18 +1130,18 @@
 }
 
 void DevToolsUIBindings::FileSavedAs(const std::string& url) {
-  base::StringValue url_value(url);
+  base::Value url_value(url);
   CallClientFunction("DevToolsAPI.savedURL", &url_value, NULL, NULL);
 }
 
 void DevToolsUIBindings::CanceledFileSaveAs(const std::string& url) {
-  base::StringValue url_value(url);
+  base::Value url_value(url);
   CallClientFunction("DevToolsAPI.canceledSaveURL",
                      &url_value, NULL, NULL);
 }
 
 void DevToolsUIBindings::AppendedTo(const std::string& url) {
-  base::StringValue url_value(url);
+  base::Value url_value(url);
   CallClientFunction("DevToolsAPI.appendedToURL", &url_value, NULL,
                      NULL);
 }
@@ -1156,7 +1156,7 @@
 
 void DevToolsUIBindings::FileSystemRemoved(
     const std::string& file_system_path) {
-  base::StringValue file_system_path_value(file_system_path);
+  base::Value file_system_path_value(file_system_path);
   CallClientFunction("DevToolsAPI.fileSystemRemoved",
                      &file_system_path_value, NULL, NULL);
 }
@@ -1180,7 +1180,7 @@
     int total_work) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   base::Value request_id_value(request_id);
-  base::StringValue file_system_path_value(file_system_path);
+  base::Value file_system_path_value(file_system_path);
   base::Value total_work_value(total_work);
   CallClientFunction("DevToolsAPI.indexingTotalWorkCalculated",
                      &request_id_value, &file_system_path_value,
@@ -1192,7 +1192,7 @@
                                         int worked) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   base::Value request_id_value(request_id);
-  base::StringValue file_system_path_value(file_system_path);
+  base::Value file_system_path_value(file_system_path);
   base::Value worked_value(worked);
   CallClientFunction("DevToolsAPI.indexingWorked", &request_id_value,
                      &file_system_path_value, &worked_value);
@@ -1203,7 +1203,7 @@
   indexing_jobs_.erase(request_id);
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   base::Value request_id_value(request_id);
-  base::StringValue file_system_path_value(file_system_path);
+  base::Value file_system_path_value(file_system_path);
   CallClientFunction("DevToolsAPI.indexingDone", &request_id_value,
                      &file_system_path_value, NULL);
 }
@@ -1219,7 +1219,7 @@
     file_paths_value.AppendString(*it);
   }
   base::Value request_id_value(request_id);
-  base::StringValue file_system_path_value(file_system_path);
+  base::Value file_system_path_value(file_system_path);
   CallClientFunction("DevToolsAPI.searchCompleted", &request_id_value,
                      &file_system_path_value, &file_paths_value);
 }
@@ -1274,9 +1274,10 @@
         new base::DictionaryValue());
     extension_info->Set(
         "startPage",
-        new base::StringValue(extensions::chrome_manifest_urls::GetDevToolsPage(
-                                  extension.get()).spec()));
-    extension_info->Set("name", new base::StringValue(extension->name()));
+        new base::Value(
+            extensions::chrome_manifest_urls::GetDevToolsPage(extension.get())
+                .spec()));
+    extension_info->Set("name", new base::Value(extension->name()));
     extension_info->Set(
         "exposeExperimentalAPIs",
         new base::Value(extension->permissions_data()->HasAPIPermission(

diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 1fe19787..e27d75b 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc

@@ -1352,7 +1352,7 @@
       const DevToolsToggleAction::RevealParams* params =
           action.params();
       CHECK(params);
-      base::StringValue url_value(params->url);
+      base::Value url_value(params->url);
       base::Value line_value(static_cast<int>(params->line_number));
       base::Value column_value(static_cast<int>(params->column_number));
       bindings_->CallClientFunction("DevToolsAPI.revealSourceLine",

diff --git a/chrome/browser/download/download_dir_policy_handler.cc b/chrome/browser/download/download_dir_policy_handler.cc
index b64c616f7..cf48ade 100644
--- a/chrome/browser/download/download_dir_policy_handler.cc
+++ b/chrome/browser/download/download_dir_policy_handler.cc

@@ -105,7 +105,7 @@
   if (expanded_value.empty())
     expanded_value = DownloadPrefs::GetDefaultDownloadDirectory().value();
   prefs->SetValue(prefs::kDownloadDefaultDirectory,
-                  base::MakeUnique<base::StringValue>(expanded_value));
+                  base::MakeUnique<base::Value>(expanded_value));
 
   // If the policy is mandatory, prompt for download should be disabled.
   // Otherwise, it would enable a user to bypass the mandatory policy.

diff --git a/chrome/browser/download/download_dir_policy_handler_unittest.cc b/chrome/browser/download/download_dir_policy_handler_unittest.cc
index f7e8acf1..194957cb 100644
--- a/chrome/browser/download/download_dir_policy_handler_unittest.cc
+++ b/chrome/browser/download/download_dir_policy_handler_unittest.cc

@@ -74,7 +74,7 @@
   EXPECT_FALSE(store_->GetValue(prefs::kPromptForDownload, NULL));
   policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
              policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>(std::string()), nullptr);
+             base::MakeUnique<base::Value>(std::string()), nullptr);
   UpdateProviderPolicy(policy);
 
   // Setting a DownloadDirectory should disable the PromptForDownload pref.
@@ -95,7 +95,7 @@
   policy::PolicyMap policy;
   policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
              policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>(kDriveNamePolicyVariableName),
+             base::MakeUnique<base::Value>(kDriveNamePolicyVariableName),
              nullptr);
   UpdateProviderPolicy(policy);
 
@@ -120,15 +120,15 @@
 
   policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_MANDATORY,
              policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>(kUserIDHash), nullptr);
+             base::MakeUnique<base::Value>(kUserIDHash), nullptr);
   UpdateProviderPolicy(policy);
   EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL));
 
   policy.Set(
       policy::key::kDownloadDirectory, policy::POLICY_LEVEL_RECOMMENDED,
       policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-      base::MakeUnique<base::StringValue>(
-          std::string(kDriveNamePolicyVariableName) + kRelativeToDriveRoot),
+      base::MakeUnique<base::Value>(std::string(kDriveNamePolicyVariableName) +
+                                    kRelativeToDriveRoot),
       nullptr);
   UpdateProviderPolicy(policy);
 
@@ -144,7 +144,7 @@
 
   policy.Set(policy::key::kDownloadDirectory, policy::POLICY_LEVEL_RECOMMENDED,
              policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>(kUserIDHash), nullptr);
+             base::MakeUnique<base::Value>(kUserIDHash), nullptr);
   UpdateProviderPolicy(policy);
 
   EXPECT_FALSE(recommended_store_->GetValue(prefs::kPromptForDownload, NULL));

diff --git a/chrome/browser/download/download_query_unittest.cc b/chrome/browser/download/download_query_unittest.cc
index 84995e1..9c0a1821 100644
--- a/chrome/browser/download/download_query_unittest.cc
+++ b/chrome/browser/download/download_query_unittest.cc

@@ -128,17 +128,17 @@
 
 template<> void DownloadQueryTest::AddFilter(
     DownloadQuery::FilterType name, const char* cpp_value) {
-  CHECK(query_.AddFilter(name, base::StringValue(cpp_value)));
+  CHECK(query_.AddFilter(name, base::Value(cpp_value)));
 }
 
 template<> void DownloadQueryTest::AddFilter(
     DownloadQuery::FilterType name, std::string cpp_value) {
-  CHECK(query_.AddFilter(name, base::StringValue(cpp_value)));
+  CHECK(query_.AddFilter(name, base::Value(cpp_value)));
 }
 
 template<> void DownloadQueryTest::AddFilter(
     DownloadQuery::FilterType name, const base::char16* cpp_value) {
-  CHECK(query_.AddFilter(name, base::StringValue(cpp_value)));
+  CHECK(query_.AddFilter(name, base::Value(cpp_value)));
 }
 
 template<> void DownloadQueryTest::AddFilter(
@@ -164,7 +164,7 @@
 #if defined(OS_WIN)
 template<> void DownloadQueryTest::AddFilter(
     DownloadQuery::FilterType name, std::wstring cpp_value) {
-  CHECK(query_.AddFilter(name, base::StringValue(cpp_value)));
+  CHECK(query_.AddFilter(name, base::Value(cpp_value)));
 }
 #endif
 

diff --git a/chrome/browser/extensions/activity_log/activity_actions.cc b/chrome/browser/extensions/activity_log/activity_actions.cc
index adc78e0..ec44aec 100644
--- a/chrome/browser/extensions/activity_log/activity_actions.cc
+++ b/chrome/browser/extensions/activity_log/activity_actions.cc

@@ -287,7 +287,7 @@
       result += " PAGE_URL=" + page_url_.spec();
   }
   if (!page_title_.empty()) {
-    base::StringValue title(page_title_);
+    base::Value title(page_title_);
     result += " PAGE_TITLE=" + Serialize(&title);
   }
   if (arg_url_.is_valid()) {

diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc
index f45237d..74cfad3 100644
--- a/chrome/browser/extensions/activity_log/activity_log.cc
+++ b/chrome/browser/extensions/activity_log/activity_log.cc

@@ -278,7 +278,7 @@
       if (action->args()->GetString(url_index, &url_string) &&
           ResolveUrl(action->page_url(), url_string, &arg_url)) {
         action->mutable_args()->Set(url_index,
-                                    new base::StringValue(kArgUrlPlaceholder));
+                                    new base::Value(kArgUrlPlaceholder));
       }
       break;
     }
@@ -309,8 +309,8 @@
         // Single tab ID to translate.
         GetUrlForTabId(tab_id, profile, &arg_url, &arg_incognito);
         if (arg_url.is_valid()) {
-          action->mutable_args()->Set(
-              url_index, new base::StringValue(kArgUrlPlaceholder));
+          action->mutable_args()->Set(url_index,
+                                      new base::Value(kArgUrlPlaceholder));
         }
       } else if (action->mutable_args()->GetList(url_index, &tab_list)) {
         // A list of possible IDs to translate.  Work through in reverse order
@@ -320,13 +320,12 @@
           if (tab_list->GetInteger(i, &tab_id) &&
               GetUrlForTabId(tab_id, profile, &arg_url, &arg_incognito)) {
             if (!arg_incognito)
-              tab_list->Set(i, new base::StringValue(arg_url.spec()));
+              tab_list->Set(i, new base::Value(arg_url.spec()));
             extracted_index = i;
           }
         }
         if (extracted_index >= 0) {
-          tab_list->Set(
-              extracted_index, new base::StringValue(kArgUrlPlaceholder));
+          tab_list->Set(extracted_index, new base::Value(kArgUrlPlaceholder));
         }
       }
       break;

diff --git a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
index 0df22a3..cad7e143 100644
--- a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc

@@ -433,8 +433,8 @@
   extension_service_->AddExtension(extension.get());
 
   std::unique_ptr<base::ListValue> args(new base::ListValue());
-  args->Set(0, new base::StringValue("hello"));
-  args->Set(1, new base::StringValue("world"));
+  args->Set(0, new base::Value("hello"));
+  args->Set(1, new base::Value("world"));
   scoped_refptr<Action> action = new Action(extension->id(),
                                             base::Time::Now(),
                                             Action::ACTION_API_CALL,

diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
index 236d43ef..1e0dd11 100644
--- a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc

@@ -511,8 +511,8 @@
   extension_service_->AddExtension(extension.get());
 
   std::unique_ptr<base::ListValue> args(new base::ListValue());
-  args->Set(0, new base::StringValue("hello"));
-  args->Set(1, new base::StringValue("world"));
+  args->Set(0, new base::Value("hello"));
+  args->Set(1, new base::Value("world"));
   scoped_refptr<Action> action = new Action(extension->id(),
                                             base::Time::Now(),
                                             Action::ACTION_API_CALL,

diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc
index d813ad5e..ef3ad10 100644
--- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc
+++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc

@@ -28,8 +28,8 @@
 
 TEST_F(ActivityLogApiUnitTest, ConvertChromeApiAction) {
   std::unique_ptr<base::ListValue> args(new base::ListValue());
-  args->Set(0, new base::StringValue("hello"));
-  args->Set(1, new base::StringValue("world"));
+  args->Set(0, new base::Value("hello"));
+  args->Set(1, new base::Value("world"));
   scoped_refptr<Action> action(new Action(kExtensionId,
                                           base::Time::Now(),
                                           Action::ACTION_API_CALL,
@@ -46,8 +46,8 @@
 
 TEST_F(ActivityLogApiUnitTest, ConvertDomAction) {
   std::unique_ptr<base::ListValue> args(new base::ListValue());
-  args->Set(0, new base::StringValue("hello"));
-  args->Set(1, new base::StringValue("world"));
+  args->Set(0, new base::Value("hello"));
+  args->Set(1, new base::Value("world"));
   scoped_refptr<Action> action(new Action(kExtensionId,
                                base::Time::Now(),
                                Action::ACTION_DOM_ACCESS,

diff --git a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc
index a3b40642..71649982 100644
--- a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc
+++ b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc

@@ -81,7 +81,7 @@
 }
 
 bool CloudPrintPrivateGetHostNameFunction::RunAsync() {
-  SetResult(base::MakeUnique<base::StringValue>(
+  SetResult(base::MakeUnique<base::Value>(
       CloudPrintTestsDelegate::Get()
           ? CloudPrintTestsDelegate::Get()->GetHostName()
           : net::GetHostName()));
@@ -129,7 +129,7 @@
 }
 
 bool CloudPrintPrivateGetClientIdFunction::RunAsync() {
-  SetResult(base::MakeUnique<base::StringValue>(
+  SetResult(base::MakeUnique<base::Value>(
       CloudPrintTestsDelegate::Get()
           ? CloudPrintTestsDelegate::Get()->GetClientId()
           : google_apis::GetOAuth2ClientID(google_apis::CLIENT_CLOUD_PRINT)));

diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
index a92d060..4b87365 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc

@@ -67,7 +67,7 @@
   scoped_refptr<DesktopCaptureChooseDesktopMediaFunctionBase> self(this);
   if (picker_) {
     picker_.reset();
-    SetResult(base::MakeUnique<base::StringValue>(std::string()));
+    SetResult(base::MakeUnique<base::Value>(std::string()));
     SendResponse(true);
   }
 }

diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
index ccd13f8a..242f8eeb 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc

@@ -979,7 +979,7 @@
 
   // TODO(grv) : The unpacked installer should fire an event when complete
   // and return the extension_id.
-  SetResult(base::MakeUnique<base::StringValue>("-1"));
+  SetResult(base::MakeUnique<base::Value>("-1"));
   SendResponse(true);
 }
 
@@ -1153,8 +1153,7 @@
 
 void DeveloperPrivateChoosePathFunction::FileSelected(
     const base::FilePath& path) {
-  Respond(OneArgument(
-      base::MakeUnique<base::StringValue>(path.LossyDisplayName())));
+  Respond(OneArgument(base::MakeUnique<base::Value>(path.LossyDisplayName())));
   Release();
 }
 

diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc
index c50afbbc..8561193 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc

@@ -1524,7 +1524,7 @@
     return;
   }
   RecordApiFunctions(DOWNLOADS_FUNCTION_GET_FILE_ICON);
-  SetResult(base::MakeUnique<base::StringValue>(url));
+  SetResult(base::MakeUnique<base::Value>(url));
   SendResponse(true);
 }
 

diff --git a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc
index 38ddb5c..972e8ff 100644
--- a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc
+++ b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc

@@ -142,7 +142,7 @@
 bool EPKPChallengeKeyBase::IsExtensionWhitelisted() const {
   const base::ListValue* list =
       profile_->GetPrefs()->GetList(prefs::kAttestationExtensionWhitelist);
-  base::StringValue value(extension_id_);
+  base::Value value(extension_id_);
   return list->Find(value) != list->end();
 }
 

diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc
index 5dc36ad..38cf69ee 100644
--- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc

@@ -527,20 +527,20 @@
 
 ExtensionFunction::ResponseAction
 ExtensionActionGetTitleFunction::RunExtensionAction() {
-  return RespondNow(OneArgument(base::MakeUnique<base::StringValue>(
-      extension_action_->GetTitle(tab_id_))));
+  return RespondNow(OneArgument(
+      base::MakeUnique<base::Value>(extension_action_->GetTitle(tab_id_))));
 }
 
 ExtensionFunction::ResponseAction
 ExtensionActionGetPopupFunction::RunExtensionAction() {
-  return RespondNow(OneArgument(base::MakeUnique<base::StringValue>(
+  return RespondNow(OneArgument(base::MakeUnique<base::Value>(
       extension_action_->GetPopupUrl(tab_id_).spec())));
 }
 
 ExtensionFunction::ResponseAction
 ExtensionActionGetBadgeTextFunction::RunExtensionAction() {
-  return RespondNow(OneArgument(base::MakeUnique<base::StringValue>(
-      extension_action_->GetBadgeText(tab_id_))));
+  return RespondNow(OneArgument(
+      base::MakeUnique<base::Value>(extension_action_->GetBadgeText(tab_id_))));
 }
 
 ExtensionFunction::ResponseAction

diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
index bf702751..e94081c 100644
--- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc
+++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc

@@ -223,7 +223,7 @@
 ExtensionFunction::ResponseAction FeedbackPrivateGetUserEmailFunction::Run() {
   SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfile(
       Profile::FromBrowserContext(browser_context()));
-  return RespondNow(OneArgument(base::MakeUnique<base::StringValue>(
+  return RespondNow(OneArgument(base::MakeUnique<base::Value>(
       signin_manager ? signin_manager->GetAuthenticatedAccountInfo().email
                      : std::string())));
 }

diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc
index 07de8dd..0563e0f 100644
--- a/chrome/browser/extensions/api/file_system/file_system_api.cc
+++ b/chrome/browser/extensions/api/file_system/file_system_api.cc

@@ -490,7 +490,7 @@
 
   file_path = path_util::PrettifyPath(file_path);
   return RespondNow(
-      OneArgument(base::MakeUnique<base::StringValue>(file_path.value())));
+      OneArgument(base::MakeUnique<base::Value>(file_path.value())));
 }
 
 FileSystemEntryFunction::FileSystemEntryFunction()

diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.cc b/chrome/browser/extensions/api/font_settings/font_settings_api.cc
index 1d3420a8..0348527 100644
--- a/chrome/browser/extensions/api/font_settings/font_settings_api.cc
+++ b/chrome/browser/extensions/api/font_settings/font_settings_api.cc

@@ -278,7 +278,7 @@
 
   PreferenceAPI::Get(profile)->SetExtensionControlledPref(
       extension_id(), pref_path, kExtensionPrefsScopeRegular,
-      new base::StringValue(params->details.font_id));
+      new base::Value(params->details.font_id));
   return RespondNow(NoArguments());
 }
 
@@ -319,8 +319,8 @@
 
     std::unique_ptr<base::DictionaryValue> font_name(
         new base::DictionaryValue());
-    font_name->Set(kFontIdKey, new base::StringValue(name));
-    font_name->Set(kDisplayNameKey, new base::StringValue(localized_name));
+    font_name->Set(kFontIdKey, new base::Value(name));
+    font_name->Set(kDisplayNameKey, new base::Value(localized_name));
     result->Append(std::move(font_name));
   }
 

diff --git a/chrome/browser/extensions/api/gcm/gcm_api.cc b/chrome/browser/extensions/api/gcm/gcm_api.cc
index dab66217..7f878c3 100644
--- a/chrome/browser/extensions/api/gcm/gcm_api.cc
+++ b/chrome/browser/extensions/api/gcm/gcm_api.cc

@@ -128,7 +128,7 @@
 void GcmRegisterFunction::CompleteFunctionWithResult(
     const std::string& registration_id,
     gcm::GCMClient::Result result) {
-  SetResult(base::MakeUnique<base::StringValue>(registration_id));
+  SetResult(base::MakeUnique<base::Value>(registration_id));
   SetError(GcmResultToError(result));
   SendResponse(gcm::GCMClient::SUCCESS == result);
 }
@@ -182,7 +182,7 @@
 void GcmSendFunction::CompleteFunctionWithResult(
     const std::string& message_id,
     gcm::GCMClient::Result result) {
-  SetResult(base::MakeUnique<base::StringValue>(message_id));
+  SetResult(base::MakeUnique<base::Value>(message_id));
   SetError(GcmResultToError(result));
   SendResponse(gcm::GCMClient::SUCCESS == result);
 }

diff --git a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
index 6f52b003..3ebce8a 100644
--- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
+++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc

@@ -186,7 +186,7 @@
 
 void IdentityGetAuthTokenFunction::CompleteFunctionWithResult(
     const std::string& access_token) {
-  SetResult(base::MakeUnique<base::StringValue>(access_token));
+  SetResult(base::MakeUnique<base::Value>(access_token));
   CompleteAsyncRun(true);
 }
 

diff --git a/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc b/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc
index 2f00068..882c858b 100644
--- a/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc
+++ b/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc

@@ -91,7 +91,7 @@
 void IdentityLaunchWebAuthFlowFunction::OnAuthFlowURLChange(
     const GURL& redirect_url) {
   if (redirect_url.GetWithEmptyPath() == final_url_prefix_) {
-    SetResult(base::MakeUnique<base::StringValue>(redirect_url.spec()));
+    SetResult(base::MakeUnique<base::Value>(redirect_url.spec()));
     SendResponse(true);
     if (auth_flow_)
       auth_flow_.release()->DetachDelegateAndDelete();

diff --git a/chrome/browser/extensions/api/instance_id/instance_id_api.cc b/chrome/browser/extensions/api/instance_id/instance_id_api.cc
index afa6daf..0a897d4 100644
--- a/chrome/browser/extensions/api/instance_id/instance_id_api.cc
+++ b/chrome/browser/extensions/api/instance_id/instance_id_api.cc

@@ -95,7 +95,7 @@
 }
 
 void InstanceIDGetIDFunction::GetIDCompleted(const std::string& id) {
-  Respond(OneArgument(base::MakeUnique<base::StringValue>(id)));
+  Respond(OneArgument(base::MakeUnique<base::Value>(id)));
 }
 
 InstanceIDGetCreationTimeFunction::InstanceIDGetCreationTimeFunction() {}
@@ -141,7 +141,7 @@
     const std::string& token,
     instance_id::InstanceID::Result result) {
   if (result == instance_id::InstanceID::SUCCESS)
-    Respond(OneArgument(base::MakeUnique<base::StringValue>(token)));
+    Respond(OneArgument(base::MakeUnique<base::Value>(token)));
   else
     Respond(Error(InstanceIDResultToError(result)));
 }

diff --git a/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc b/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc
index 514a1be..b2c3ae92 100644
--- a/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc
+++ b/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc

@@ -440,7 +440,7 @@
 ExtensionFunction::ResponseAction
 LanguageSettingsPrivateGetTranslateTargetLanguageFunction::Run() {
   return RespondNow(OneArgument(
-      base::MakeUnique<base::StringValue>(TranslateService::GetTargetLanguage(
+      base::MakeUnique<base::Value>(TranslateService::GetTargetLanguage(
           chrome_details_.GetProfile()->GetPrefs()))));
 }
 

diff --git a/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc b/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc
index 1158bb2..d103044 100644
--- a/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc
+++ b/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc

@@ -245,7 +245,7 @@
       // Setting app.background.page = "background.html" is sufficient to make
       // the extension type TYPE_PLATFORM_APP.
       manifest.Set(extensions::manifest_keys::kPlatformAppBackgroundPage,
-                   new base::StringValue("background.html"));
+                   new base::Value("background.html"));
     }
 
     std::string error;

diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
index 57abe0f8..1b9765f2 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc

@@ -743,10 +743,8 @@
       &(*attached_images)[blob_uuids->size()];
   std::unique_ptr<base::DictionaryValue> attached_image(
       new base::DictionaryValue);
-  attached_image->Set(kBlobUUIDKey, new base::StringValue(
-      current_blob->GetUUID()));
-  attached_image->Set(kTypeKey, new base::StringValue(
-      current_image->type));
+  attached_image->Set(kBlobUUIDKey, new base::Value(current_blob->GetUUID()));
+  attached_image->Set(kTypeKey, new base::Value(current_image->type));
   attached_image->Set(
       kSizeKey,
       new base::Value(base::checked_cast<int>(current_image->data.size())));

diff --git a/chrome/browser/extensions/api/messaging/message_service.cc b/chrome/browser/extensions/api/messaging/message_service.cc
index 56d2f39a..154fb99 100644
--- a/chrome/browser/extensions/api/messaging/message_service.cc
+++ b/chrome/browser/extensions/api/messaging/message_service.cc

@@ -85,8 +85,8 @@
     return allow_result;
 
   // Check if the name or the wildcard is in the blacklist.
-  base::StringValue name_value(native_host_name);
-  base::StringValue wildcard_value("*");
+  base::Value name_value(native_host_name);
+  base::Value wildcard_value("*");
   if (blacklist->Find(name_value) == blacklist->end() &&
       blacklist->Find(wildcard_value) == blacklist->end()) {
     return allow_result;

diff --git a/chrome/browser/extensions/api/module/module.cc b/chrome/browser/extensions/api/module/module.cc
index 8c575be..2cec950 100644
--- a/chrome/browser/extensions/api/module/module.cc
+++ b/chrome/browser/extensions/api/module/module.cc

@@ -47,7 +47,7 @@
 
   ExtensionPrefs::Get(browser_context())
       ->UpdateExtensionPref(extension_id(), extension::kUpdateURLData,
-                            new base::StringValue(data));
+                            new base::Value(data));
   return RespondNow(NoArguments());
 }
 

diff --git a/chrome/browser/extensions/api/music_manager_private/music_manager_private_api.cc b/chrome/browser/extensions/api/music_manager_private/music_manager_private_api.cc
index cb0f24b5..341e4cb 100644
--- a/chrome/browser/extensions/api/music_manager_private/music_manager_private_api.cc
+++ b/chrome/browser/extensions/api/music_manager_private/music_manager_private_api.cc

@@ -45,7 +45,7 @@
     SetError(kDeviceIdNotSupported);
     response = false;
   } else {
-    SetResult(base::MakeUnique<base::StringValue>(device_id));
+    SetResult(base::MakeUnique<base::Value>(device_id));
     response = true;
   }
 

diff --git a/chrome/browser/extensions/api/networking_config_chromeos_apitest_chromeos.cc b/chrome/browser/extensions/api/networking_config_chromeos_apitest_chromeos.cc
index 7c3bcfdb..7c967538 100644
--- a/chrome/browser/extensions/api/networking_config_chromeos_apitest_chromeos.cc
+++ b/chrome/browser/extensions/api/networking_config_chromeos_apitest_chromeos.cc

@@ -99,7 +99,7 @@
                              shill::kTypeWifi, shill::kStateOnline,
                              true /* add_to_visible */);
     service_test->SetServiceProperty(kWifi1ServicePath, shill::kWifiBSsid,
-                                     base::StringValue("01:02:ab:7f:90:00"));
+                                     base::Value("01:02:ab:7f:90:00"));
     service_test->SetServiceProperty(
         kWifi1ServicePath, shill::kSignalStrengthProperty, base::Value(40));
     profile_test->AddService(ShillProfileClient::GetSharedProfilePath(),

diff --git a/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc
index ba49075..ae542c1 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc

@@ -231,16 +231,16 @@
                             "stub_cellular_device1");
     device_test_->SetDeviceProperty(kCellularDevicePath,
                                     shill::kCarrierProperty,
-                                    base::StringValue("Cellular1_Carrier"));
+                                    base::Value("Cellular1_Carrier"));
     base::DictionaryValue home_provider;
     home_provider.SetString("name", "Cellular1_Provider");
     home_provider.SetString("code", "000000");
     home_provider.SetString("country", "us");
     device_test_->SetDeviceProperty(
         kCellularDevicePath, shill::kHomeProviderProperty, home_provider);
-    device_test_->SetDeviceProperty(
-        kCellularDevicePath, shill::kTechnologyFamilyProperty,
-        base::StringValue(shill::kNetworkTechnologyGsm));
+    device_test_->SetDeviceProperty(kCellularDevicePath,
+                                    shill::kTechnologyFamilyProperty,
+                                    base::Value(shill::kNetworkTechnologyGsm));
     device_test_->SetSimLocked(kCellularDevicePath, false);
 
     // Add the Cellular Service.
@@ -250,13 +250,13 @@
         kCellular1ServicePath, shill::kAutoConnectProperty, base::Value(true));
     service_test_->SetServiceProperty(
         kCellular1ServicePath, shill::kNetworkTechnologyProperty,
-        base::StringValue(shill::kNetworkTechnologyGsm));
+        base::Value(shill::kNetworkTechnologyGsm));
     service_test_->SetServiceProperty(
         kCellular1ServicePath, shill::kActivationStateProperty,
-        base::StringValue(shill::kActivationStateNotActivated));
-    service_test_->SetServiceProperty(
-        kCellular1ServicePath, shill::kRoamingStateProperty,
-        base::StringValue(shill::kRoamingStateHome));
+        base::Value(shill::kActivationStateNotActivated));
+    service_test_->SetServiceProperty(kCellular1ServicePath,
+                                      shill::kRoamingStateProperty,
+                                      base::Value(shill::kRoamingStateHome));
 
     profile_test_->AddService(kUser1ProfilePath, kCellular1ServicePath);
     content::RunAllPendingInMessageLoop();
@@ -331,14 +331,14 @@
     device_test_->SetDeviceProperty(kWifiDevicePath, shill::kIPConfigsProperty,
                                     wifi_ip_configs);
     device_test_->SetDeviceProperty(kWifiDevicePath, shill::kAddressProperty,
-                                    base::StringValue("001122aabbcc"));
+                                    base::Value("001122aabbcc"));
 
     // Add Services
     AddService("stub_ethernet", "eth0", shill::kTypeEthernet,
                shill::kStateOnline);
     service_test_->SetServiceProperty(
         "stub_ethernet", shill::kProfileProperty,
-        base::StringValue(ShillProfileClient::GetSharedProfilePath()));
+        base::Value(ShillProfileClient::GetSharedProfilePath()));
     profile_test_->AddService(ShillProfileClient::GetSharedProfilePath(),
                               "stub_ethernet");
 
@@ -346,19 +346,18 @@
                shill::kStateOnline);
     service_test_->SetServiceProperty(kWifi1ServicePath,
                                       shill::kSecurityClassProperty,
-                                      base::StringValue(shill::kSecurityWep));
-    service_test_->SetServiceProperty(kWifi1ServicePath,
-                                      shill::kWifiBSsid,
-                                      base::StringValue("00:01:02:03:04:05"));
+                                      base::Value(shill::kSecurityWep));
+    service_test_->SetServiceProperty(kWifi1ServicePath, shill::kWifiBSsid,
+                                      base::Value("00:01:02:03:04:05"));
     service_test_->SetServiceProperty(
         kWifi1ServicePath, shill::kSignalStrengthProperty, base::Value(40));
     service_test_->SetServiceProperty(kWifi1ServicePath,
                                       shill::kProfileProperty,
-                                      base::StringValue(kUser1ProfilePath));
+                                      base::Value(kUser1ProfilePath));
     service_test_->SetServiceProperty(
         kWifi1ServicePath, shill::kConnectableProperty, base::Value(true));
     service_test_->SetServiceProperty(kWifi1ServicePath, shill::kDeviceProperty,
-                                      base::StringValue(kWifiDevicePath));
+                                      base::Value(kWifiDevicePath));
     base::DictionaryValue static_ipconfig;
     static_ipconfig.SetStringWithoutPathExpansion(shill::kAddressProperty,
                                                   "1.2.3.4");
@@ -376,7 +375,7 @@
                shill::kStateIdle);
     service_test_->SetServiceProperty(kWifi2ServicePath,
                                       shill::kSecurityClassProperty,
-                                      base::StringValue(shill::kSecurityPsk));
+                                      base::Value(shill::kSecurityPsk));
     service_test_->SetServiceProperty(
         kWifi2ServicePath, shill::kSignalStrengthProperty, base::Value(80));
     service_test_->SetServiceProperty(
@@ -386,7 +385,7 @@
     service_test_->SetServiceProperty(
         "stub_wimax", shill::kSignalStrengthProperty, base::Value(40));
     service_test_->SetServiceProperty("stub_wimax", shill::kProfileProperty,
-                                      base::StringValue(kUser1ProfilePath));
+                                      base::Value(kUser1ProfilePath));
     service_test_->SetServiceProperty("stub_wimax", shill::kConnectableProperty,
                                       base::Value(true));
     profile_test_->AddService(kUser1ProfilePath, "stub_wimax");
@@ -400,22 +399,21 @@
                                       base::Value(5000));
     service_test_->SetServiceProperty(kWifi2ServicePath,
                                       shill::kProfileProperty,
-                                      base::StringValue(kUser1ProfilePath));
+                                      base::Value(kUser1ProfilePath));
     profile_test_->AddService(kUser1ProfilePath, kWifi2ServicePath);
 
     AddService("stub_vpn1", "vpn1", shill::kTypeVPN, shill::kStateOnline);
-    service_test_->SetServiceProperty(
-        "stub_vpn1", shill::kProviderTypeProperty,
-        base::StringValue(shill::kProviderOpenVpn));
+    service_test_->SetServiceProperty("stub_vpn1", shill::kProviderTypeProperty,
+                                      base::Value(shill::kProviderOpenVpn));
     profile_test_->AddService(kUser1ProfilePath, "stub_vpn1");
 
     AddService("stub_vpn2", "vpn2", shill::kTypeVPN, shill::kStateOffline);
     service_test_->SetServiceProperty(
         "stub_vpn2", shill::kProviderTypeProperty,
-        base::StringValue(shill::kProviderThirdPartyVpn));
+        base::Value(shill::kProviderThirdPartyVpn));
     service_test_->SetServiceProperty(
         "stub_vpn2", shill::kProviderHostProperty,
-        base::StringValue("third_party_provider_extension_id"));
+        base::Value("third_party_provider_extension_id"));
     profile_test_->AddService(kUser1ProfilePath, "stub_vpn2");
 
     content::RunAllPendingInMessageLoop();
@@ -454,9 +452,8 @@
 IN_PROC_BROWSER_TEST_F(NetworkingPrivateChromeOSApiTest, StartActivateSprint) {
   SetupCellular();
   // Set the carrier to Sprint.
-  device_test_->SetDeviceProperty(kCellularDevicePath,
-                                  shill::kCarrierProperty,
-                                  base::StringValue(shill::kCarrierSprint));
+  device_test_->SetDeviceProperty(kCellularDevicePath, shill::kCarrierProperty,
+                                  base::Value(shill::kCarrierSprint));
   EXPECT_TRUE(RunNetworkingSubtest("startActivateSprint")) << message_;
   EXPECT_EQ(0, UIDelegateStub::s_show_account_details_called_);
 }
@@ -566,7 +563,7 @@
       "    }"
       "}";
   service_test_->SetServiceProperty(kWifi2ServicePath, shill::kUIDataProperty,
-                                    base::StringValue(uidata_blob));
+                                    base::Value(uidata_blob));
   service_test_->SetServiceProperty(
       kWifi2ServicePath, shill::kAutoConnectProperty, base::Value(false));
 
@@ -592,10 +589,10 @@
       "}";
 
   policy::PolicyMap policy;
-  policy.Set(
-      policy::key::kOpenNetworkConfiguration, policy::POLICY_LEVEL_MANDATORY,
-      policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
-      base::WrapUnique(new base::StringValue(user_policy_blob)), nullptr);
+  policy.Set(policy::key::kOpenNetworkConfiguration,
+             policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
+             policy::POLICY_SOURCE_CLOUD,
+             base::WrapUnique(new base::Value(user_policy_blob)), nullptr);
   provider_.UpdateChromePolicy(policy);
 
   content::RunAllPendingInMessageLoop();

diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc
index cd435f5..eac302ae 100644
--- a/chrome/browser/extensions/api/notifications/notifications_api.cc
+++ b/chrome/browser/extensions/api/notifications/notifications_api.cc

@@ -704,7 +704,7 @@
       notification_id = base::RandBytesAsString(16);
   }
 
-  SetResult(base::MakeUnique<base::StringValue>(notification_id));
+  SetResult(base::MakeUnique<base::Value>(notification_id));
 
   // TODO(dewittj): Add more human-readable error strings if this fails.
   if (!CreateNotification(notification_id, &params_->options))
@@ -817,8 +817,8 @@
           ? api::notifications::PERMISSION_LEVEL_GRANTED
           : api::notifications::PERMISSION_LEVEL_DENIED;
 
-  SetResult(base::MakeUnique<base::StringValue>(
-      api::notifications::ToString(result)));
+  SetResult(
+      base::MakeUnique<base::Value>(api::notifications::ToString(result)));
   SendResponse(true);
 
   return true;

diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
index b984950..69c9e10 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc

@@ -74,7 +74,7 @@
   std::unique_ptr<base::DictionaryValue> dict = suggestion.ToValue();
   // Add the content field so that the dictionary can be used to populate an
   // omnibox::SuggestResult.
-  dict->SetWithoutPathExpansion(kSuggestionContent, new base::StringValue(""));
+  dict->SetWithoutPathExpansion(kSuggestionContent, new base::Value(""));
   prefs->UpdateExtensionPref(extension_id,
                              kOmniboxDefaultSuggestion,
                              dict.release());
@@ -112,7 +112,7 @@
     return false;
 
   std::unique_ptr<base::ListValue> args(new base::ListValue());
-  args->Set(0, new base::StringValue(input));
+  args->Set(0, new base::Value(input));
   args->Set(1, new base::Value(suggest_id));
 
   std::unique_ptr<Event> event = base::MakeUnique<Event>(
@@ -140,13 +140,13 @@
       active_tab_permission_granter()->GrantIfRequested(extension);
 
   std::unique_ptr<base::ListValue> args(new base::ListValue());
-  args->Set(0, new base::StringValue(input));
+  args->Set(0, new base::Value(input));
   if (disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB)
-    args->Set(1, new base::StringValue(kForegroundTabDisposition));
+    args->Set(1, new base::Value(kForegroundTabDisposition));
   else if (disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB)
-    args->Set(1, new base::StringValue(kBackgroundTabDisposition));
+    args->Set(1, new base::Value(kBackgroundTabDisposition));
   else
-    args->Set(1, new base::StringValue(kCurrentTabDisposition));
+    args->Set(1, new base::Value(kCurrentTabDisposition));
 
   std::unique_ptr<Event> event = base::MakeUnique<Event>(
       events::OMNIBOX_ON_INPUT_ENTERED, omnibox::OnInputEntered::kEventName,

diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
index 170a37fa..cdaa34d 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc

@@ -58,14 +58,13 @@
   std::string expected_apis[] = {"tabs", "fileBrowserHandler",
                                  "fileBrowserHandlerInternal"};
   for (size_t i = 0; i < arraysize(expected_apis); ++i) {
-    std::unique_ptr<base::Value> value(new base::StringValue(expected_apis[i]));
+    std::unique_ptr<base::Value> value(new base::Value(expected_apis[i]));
     EXPECT_NE(api_list->end(), api_list->Find(*value));
   }
 
   std::string expected_origins[] = { "http://a.com/*", "http://b.com/*" };
   for (size_t i = 0; i < arraysize(expected_origins); ++i) {
-    std::unique_ptr<base::Value> value(
-        new base::StringValue(expected_origins[i]));
+    std::unique_ptr<base::Value> value(new base::Value(expected_origins[i]));
     EXPECT_NE(origin_list->end(), origin_list->Find(*value));
   }
 

diff --git a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc
index a4a8933..2c5209a 100644
--- a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc
+++ b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc

@@ -192,9 +192,8 @@
 class ControlledPrefsInstallOneExtension
     : public ExtensionControlledPrefsTest {
   void Initialize() override {
-    InstallExtensionControlledPref(extension1(),
-                                   kPref1,
-                                   new base::StringValue("val1"));
+    InstallExtensionControlledPref(extension1(), kPref1,
+                                   new base::Value("val1"));
   }
   void Verify() override {
     std::string actual = prefs()->pref_service()->GetString(kPref1);
@@ -209,10 +208,10 @@
     : public ExtensionControlledPrefsTest {
  public:
   void Initialize() override {
-    InstallExtensionControlledPref(
-        extension1(), kPref1, new base::StringValue("val1"));
-    InstallExtensionControlledPrefIncognito(
-        extension1(), kPref1, new base::StringValue("val2"));
+    InstallExtensionControlledPref(extension1(), kPref1,
+                                   new base::Value("val1"));
+    InstallExtensionControlledPrefIncognito(extension1(), kPref1,
+                                            new base::Value("val2"));
     std::unique_ptr<PrefService> incog_prefs(
         prefs_.CreateIncognitoPrefService());
     std::string actual = incog_prefs->GetString(kPref1);
@@ -240,10 +239,10 @@
   ControlledPrefsInstallIncognitoSessionOnly() : iteration_(0) {}
 
   void Initialize() override {
-    InstallExtensionControlledPref(
-        extension1(), kPref1, new base::StringValue("val1"));
-    InstallExtensionControlledPrefIncognitoSessionOnly(
-        extension1(), kPref1, new base::StringValue("val2"));
+    InstallExtensionControlledPref(extension1(), kPref1,
+                                   new base::Value("val1"));
+    InstallExtensionControlledPrefIncognitoSessionOnly(extension1(), kPref1,
+                                                       new base::Value("val2"));
     std::unique_ptr<PrefService> incog_prefs(
         prefs_.CreateIncognitoPrefService());
     std::string actual = incog_prefs->GetString(kPref1);
@@ -273,10 +272,10 @@
 
 class ControlledPrefsUninstallExtension : public ExtensionControlledPrefsTest {
   void Initialize() override {
-    InstallExtensionControlledPref(
-        extension1(), kPref1, new base::StringValue("val1"));
-    InstallExtensionControlledPref(
-        extension1(), kPref2, new base::StringValue("val2"));
+    InstallExtensionControlledPref(extension1(), kPref1,
+                                   new base::Value("val1"));
+    InstallExtensionControlledPref(extension1(), kPref2,
+                                   new base::Value("val2"));
     scoped_refptr<ContentSettingsStore> store = content_settings_store();
     ContentSettingsPattern pattern =
         ContentSettingsPattern::FromString("http://[*.]example.com");
@@ -325,7 +324,7 @@
     EXPECT_CALL(observer, OnPreferenceChanged(_));
     EXPECT_CALL(incognito_observer, OnPreferenceChanged(_));
     InstallExtensionControlledPref(extension1(), kPref1,
-        new base::StringValue("https://www.chromium.org"));
+                                   new base::Value("https://www.chromium.org"));
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
 
@@ -333,7 +332,7 @@
     EXPECT_CALL(observer, OnPreferenceChanged(_)).Times(0);
     EXPECT_CALL(incognito_observer, OnPreferenceChanged(_)).Times(0);
     InstallExtensionControlledPref(extension1(), kPref1,
-        new base::StringValue("https://www.chromium.org"));
+                                   new base::Value("https://www.chromium.org"));
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
 
@@ -341,22 +340,22 @@
     EXPECT_CALL(observer, OnPreferenceChanged(_));
     EXPECT_CALL(incognito_observer, OnPreferenceChanged(_));
     InstallExtensionControlledPref(extension1(), kPref1,
-        new base::StringValue("chrome://newtab"));
+                                   new base::Value("chrome://newtab"));
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
     // Change only incognito persistent value.
     EXPECT_CALL(observer, OnPreferenceChanged(_)).Times(0);
     EXPECT_CALL(incognito_observer, OnPreferenceChanged(_));
-    InstallExtensionControlledPrefIncognito(extension1(), kPref1,
-        new base::StringValue("chrome://newtab2"));
+    InstallExtensionControlledPrefIncognito(
+        extension1(), kPref1, new base::Value("chrome://newtab2"));
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
 
     // Change only incognito session-only value.
     EXPECT_CALL(observer, OnPreferenceChanged(_)).Times(0);
     EXPECT_CALL(incognito_observer, OnPreferenceChanged(_));
-    InstallExtensionControlledPrefIncognito(extension1(), kPref1,
-        new base::StringValue("chrome://newtab3"));
+    InstallExtensionControlledPrefIncognito(
+        extension1(), kPref1, new base::Value("chrome://newtab3"));
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
 
@@ -381,8 +380,8 @@
 // Tests disabling an extension.
 class ControlledPrefsDisableExtension : public ExtensionControlledPrefsTest {
   void Initialize() override {
-    InstallExtensionControlledPref(
-        extension1(), kPref1, new base::StringValue("val1"));
+    InstallExtensionControlledPref(extension1(), kPref1,
+                                   new base::Value("val1"));
     std::string actual = prefs()->pref_service()->GetString(kPref1);
     EXPECT_EQ("val1", actual);
     prefs()->SetExtensionDisabled(extension1()->id(),
@@ -398,8 +397,8 @@
 // Tests disabling and reenabling an extension.
 class ControlledPrefsReenableExtension : public ExtensionControlledPrefsTest {
   void Initialize() override {
-    InstallExtensionControlledPref(
-        extension1(), kPref1, new base::StringValue("val1"));
+    InstallExtensionControlledPref(extension1(), kPref1,
+                                   new base::Value("val1"));
     prefs()->SetExtensionDisabled(extension1()->id(),
                                   Extension::DISABLE_USER_ACTION);
     prefs()->SetExtensionEnabled(extension1()->id());
@@ -415,10 +414,10 @@
     : public ExtensionControlledPrefsTest {
  public:
   void Initialize() override {
-    base::StringValue* v1 = new base::StringValue("https://www.chromium.org");
-    base::StringValue* v2 = new base::StringValue("https://www.chromium.org");
-    base::StringValue* v1i = new base::StringValue("https://www.chromium.org");
-    base::StringValue* v2i = new base::StringValue("https://www.chromium.org");
+    base::Value* v1 = new base::Value("https://www.chromium.org");
+    base::Value* v2 = new base::Value("https://www.chromium.org");
+    base::Value* v1i = new base::Value("https://www.chromium.org");
+    base::Value* v2i = new base::Value("https://www.chromium.org");
     // Ownership is taken, value shall not be deleted.
     InstallExtensionControlledPref(extension1(), kPref1, v1);
     InstallExtensionControlledPrefIncognito(extension1(), kPref1, v1i);
@@ -441,8 +440,8 @@
       : iteration_(0) {}
   ~ControlledPrefsDisableExtensions() override {}
   void Initialize() override {
-    InstallExtensionControlledPref(
-        extension1(), kPref1, new base::StringValue("val1"));
+    InstallExtensionControlledPref(extension1(), kPref1,
+                                   new base::Value("val1"));
     // This becomes only active in the second verification phase.
     prefs_.set_extensions_disabled(true);
   }

diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
index 2717383..609163e 100644
--- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
+++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc

@@ -159,7 +159,7 @@
         ExtensionPrefs::Get(profile_)->GetInstallParam(extension->id());
     if (settings->homepage) {
       SetPref(extension->id(), prefs::kHomePage,
-              base::MakeUnique<base::StringValue>(SubstituteInstallParam(
+              base::MakeUnique<base::Value>(SubstituteInstallParam(
                   settings->homepage->spec(), install_parameter)));
       SetPref(extension->id(), prefs::kHomePageIsNewTabPage,
               base::MakeUnique<base::Value>(false));

diff --git a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
index ae8fbef..1bd814d 100644
--- a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
+++ b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc

@@ -143,7 +143,7 @@
 TEST_F(PolicyValueStoreTest, ReadOnly) {
   ValueStore::WriteOptions options = ValueStore::DEFAULTS;
 
-  base::StringValue string_value("value");
+  base::Value string_value("value");
   EXPECT_FALSE(store_->Set(options, "key", string_value)->status().ok());
 
   base::DictionaryValue dict;
@@ -159,7 +159,7 @@
 
 TEST_F(PolicyValueStoreTest, NotifyOnChanges) {
   // Notify when setting the initial policy.
-  const base::StringValue value("111");
+  const base::Value value("111");
   {
     ValueStoreChangeList changes;
     changes.push_back(ValueStoreChange("aaa", nullptr, value.CreateDeepCopy()));
@@ -193,7 +193,7 @@
   Mock::VerifyAndClearExpectations(&observer_);
 
   // Notify when policies change.
-  const base::StringValue new_value("222");
+  const base::Value new_value("222");
   {
     ValueStoreChangeList changes;
     changes.push_back(ValueStoreChange("bbb", value.CreateDeepCopy(),

diff --git a/chrome/browser/extensions/api/storage/settings_apitest.cc b/chrome/browser/extensions/api/storage/settings_apitest.cc
index ac1d74b7..e0c56008a 100644
--- a/chrome/browser/extensions/api/storage/settings_apitest.cc
+++ b/chrome/browser/extensions/api/storage/settings_apitest.cc

@@ -329,7 +329,7 @@
 
   // Set "foo" to "bar" via sync.
   syncer::SyncChangeList sync_changes;
-  base::StringValue bar("bar");
+  base::Value bar("bar");
   sync_changes.push_back(settings_sync_util::CreateAdd(
       extension_id, "foo", bar, kModelType));
   SendChanges(sync_changes);
@@ -374,7 +374,7 @@
 
   // Set "foo" to "bar" via sync.
   syncer::SyncChangeList sync_changes;
-  base::StringValue bar("bar");
+  base::Value bar("bar");
   sync_changes.push_back(settings_sync_util::CreateAdd(
       extension_id, "foo", bar, kModelType));
   SendChanges(sync_changes);

diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
index 1f68049..7ac4ca5 100644
--- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
+++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc

@@ -300,7 +300,7 @@
   syncer::ModelType model_type = syncer::APP_SETTINGS;
   Manifest::Type type = Manifest::TYPE_LEGACY_PACKAGED_APP;
 
-  base::StringValue value1("fooValue");
+  base::Value value1("fooValue");
   base::ListValue value2;
   value2.AppendString("barValue");
 
@@ -349,7 +349,7 @@
   syncer::ModelType model_type = syncer::EXTENSION_SETTINGS;
   Manifest::Type type = Manifest::TYPE_EXTENSION;
 
-  base::StringValue value1("fooValue");
+  base::Value value1("fooValue");
   base::ListValue value2;
   value2.AppendString("barValue");
 
@@ -381,7 +381,7 @@
   syncer::ModelType model_type = syncer::APP_SETTINGS;
   Manifest::Type type = Manifest::TYPE_LEGACY_PACKAGED_APP;
 
-  base::StringValue value1("fooValue");
+  base::Value value1("fooValue");
   base::ListValue value2;
   value2.AppendString("barValue");
 
@@ -421,7 +421,7 @@
   syncer::ModelType model_type = syncer::EXTENSION_SETTINGS;
   Manifest::Type type = Manifest::TYPE_EXTENSION;
 
-  base::StringValue value1("fooValue");
+  base::Value value1("fooValue");
   base::ListValue value2;
   value2.AppendString("barValue");
 
@@ -494,7 +494,7 @@
   syncer::ModelType model_type = syncer::APP_SETTINGS;
   Manifest::Type type = Manifest::TYPE_LEGACY_PACKAGED_APP;
 
-  base::StringValue value1("fooValue");
+  base::Value value1("fooValue");
   base::ListValue value2;
   value2.AppendString("barValue");
 
@@ -621,7 +621,7 @@
 }
 
 TEST_F(ExtensionSettingsSyncTest, ExtensionAndAppSettingsSyncSeparately) {
-  base::StringValue value1("fooValue");
+  base::Value value1("fooValue");
   base::ListValue value2;
   value2.AppendString("barValue");
 
@@ -680,8 +680,8 @@
   syncer::ModelType model_type = syncer::EXTENSION_SETTINGS;
   Manifest::Type type = Manifest::TYPE_EXTENSION;
 
-  base::StringValue fooValue("fooValue");
-  base::StringValue barValue("barValue");
+  base::Value fooValue("fooValue");
+  base::Value barValue("barValue");
 
   // There is a bit of a convoluted method to get storage areas that can fail;
   // hand out TestingValueStore object then toggle them failing/succeeding
@@ -869,8 +869,8 @@
   syncer::ModelType model_type = syncer::APP_SETTINGS;
   Manifest::Type type = Manifest::TYPE_LEGACY_PACKAGED_APP;
 
-  base::StringValue fooValue("fooValue");
-  base::StringValue barValue("barValue");
+  base::Value fooValue("fooValue");
+  base::Value barValue("barValue");
 
   ValueStore* good = AddExtensionAndGetStorage("good", type);
   ValueStore* bad = AddExtensionAndGetStorage("bad", type);
@@ -961,8 +961,8 @@
   syncer::ModelType model_type = syncer::EXTENSION_SETTINGS;
   Manifest::Type type = Manifest::TYPE_EXTENSION;
 
-  base::StringValue fooValue("fooValue");
-  base::StringValue barValue("barValue");
+  base::Value fooValue("fooValue");
+  base::Value barValue("barValue");
 
   ValueStore* good = AddExtensionAndGetStorage("good", type);
   ValueStore* bad = AddExtensionAndGetStorage("bad", type);
@@ -1009,8 +1009,8 @@
   syncer::ModelType model_type = syncer::APP_SETTINGS;
   Manifest::Type type = Manifest::TYPE_LEGACY_PACKAGED_APP;
 
-  base::StringValue fooValue("fooValue");
-  base::StringValue barValue("barValue");
+  base::Value fooValue("fooValue");
+  base::Value barValue("barValue");
 
   ValueStore* good = AddExtensionAndGetStorage("good", type);
   ValueStore* bad = AddExtensionAndGetStorage("bad", type);
@@ -1102,8 +1102,8 @@
   syncer::ModelType model_type = syncer::EXTENSION_SETTINGS;
   Manifest::Type type = Manifest::TYPE_EXTENSION;
 
-  base::StringValue fooValue("fooValue");
-  base::StringValue barValue("barValue");
+  base::Value fooValue("fooValue");
+  base::Value barValue("barValue");
 
   ValueStore* good = AddExtensionAndGetStorage("good", type);
   ValueStore* bad = AddExtensionAndGetStorage("bad", type);
@@ -1184,8 +1184,8 @@
   syncer::ModelType model_type = syncer::EXTENSION_SETTINGS;
   Manifest::Type type = Manifest::TYPE_EXTENSION;
 
-  base::StringValue fooValue("fooValue");
-  base::StringValue barValue("barValue");
+  base::Value fooValue("fooValue");
+  base::Value barValue("barValue");
 
   ValueStore* good = AddExtensionAndGetStorage("good", type);
   ValueStore* bad = AddExtensionAndGetStorage("bad", type);
@@ -1277,7 +1277,7 @@
   for (size_t i = 0; i < 10000; ++i) {
     string_10k.append("a");
   }
-  base::StringValue large_value(string_10k);
+  base::Value large_value(string_10k);
 
   GetSyncableService(model_type)
       ->MergeDataAndStartSyncing(
@@ -1319,7 +1319,7 @@
 
   {
     syncer::SyncDataList sync_data_list;
-    std::unique_ptr<base::Value> string_value(new base::StringValue("value"));
+    std::unique_ptr<base::Value> string_value(new base::Value("value"));
     sync_data_list.push_back(settings_sync_util::CreateData(
         "ext", "key.with.dot", *string_value, model_type));
 
@@ -1335,15 +1335,14 @@
     ASSERT_TRUE(data->status().ok());
 
     base::DictionaryValue expected_data;
-    expected_data.SetWithoutPathExpansion(
-        "key.with.dot",
-        new base::StringValue("value"));
+    expected_data.SetWithoutPathExpansion("key.with.dot",
+                                          new base::Value("value"));
     EXPECT_TRUE(base::Value::Equals(&expected_data, &data->settings()));
   }
 
   // Test dots in keys going to sync.
   {
-    std::unique_ptr<base::Value> string_value(new base::StringValue("spot"));
+    std::unique_ptr<base::Value> string_value(new base::Value("spot"));
     storage->Set(DEFAULTS, "key.with.spot", *string_value);
 
     ASSERT_EQ(1u, sync_processor_->changes().size());

diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
index a7fdbf9e..a8f276050 100644
--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc

@@ -371,8 +371,8 @@
 
 ExtensionFunction::ResponseAction
 SyncFileSystemGetConflictResolutionPolicyFunction::Run() {
-  return RespondNow(OneArgument(
-      base::MakeUnique<base::StringValue>(api::sync_file_system::ToString(
+  return RespondNow(
+      OneArgument(base::MakeUnique<base::Value>(api::sync_file_system::ToString(
           api::sync_file_system::CONFLICT_RESOLUTION_POLICY_LAST_WRITE_WIN))));
 }
 

diff --git a/chrome/browser/extensions/api/system_private/system_private_api.cc b/chrome/browser/extensions/api/system_private/system_private_api.cc
index d128aa2..997e83e 100644
--- a/chrome/browser/extensions/api/system_private/system_private_api.cc
+++ b/chrome/browser/extensions/api/system_private/system_private_api.cc

@@ -79,8 +79,8 @@
   EXTENSION_FUNCTION_VALIDATE(
       value >= 0 &&
       value < static_cast<int>(arraysize(kIncognitoModeAvailabilityStrings)));
-  return RespondNow(OneArgument(base::MakeUnique<base::StringValue>(
-      kIncognitoModeAvailabilityStrings[value])));
+  return RespondNow(OneArgument(
+      base::MakeUnique<base::Value>(kIncognitoModeAvailabilityStrings[value])));
 }
 
 ExtensionFunction::ResponseAction SystemPrivateGetUpdateStatusFunction::Run() {
@@ -145,8 +145,8 @@
 }
 
 ExtensionFunction::ResponseAction SystemPrivateGetApiKeyFunction::Run() {
-  return RespondNow(OneArgument(
-      base::MakeUnique<base::StringValue>(google_apis::GetAPIKey())));
+  return RespondNow(
+      OneArgument(base::MakeUnique<base::Value>(google_apis::GetAPIKey())));
 }
 
 void DispatchVolumeChangedEvent(double volume, bool is_volume_muted) {

diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index 9fb95b9c..e39eee5 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc

@@ -1674,7 +1674,7 @@
     return;
   }
 
-  SetResult(base::MakeUnique<base::StringValue>(base64_result));
+  SetResult(base::MakeUnique<base::Value>(base64_result));
   SendResponse(true);
 }
 
@@ -1784,7 +1784,7 @@
 }
 
 void TabsDetectLanguageFunction::GotLanguage(const std::string& language) {
-  SetResult(base::MakeUnique<base::StringValue>(language.c_str()));
+  SetResult(base::MakeUnique<base::Value>(language.c_str()));
   SendResponse(true);
 
   Release();  // Balanced in Run()

diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
index c74a5711..044a7e5f 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

@@ -68,7 +68,6 @@
 using base::BinaryValue;
 using base::DictionaryValue;
 using base::ListValue;
-using base::StringValue;
 using base::Time;
 using base::TimeDelta;
 using base::Value;
@@ -609,7 +608,7 @@
       &raw);
   extensions::subtle::AppendKeyValuePair(
       keys::kRequestBodyRawFileKey,
-      base::MakeUnique<base::StringValue>(std::string()), &raw);
+      base::MakeUnique<base::Value>(std::string()), &raw);
   extensions::subtle::AppendKeyValuePair(
       keys::kRequestBodyRawBytesKey,
       BinaryValue::CreateWithCopiedBuffer(kPlainBlock2, kPlainBlock2Length),

diff --git a/chrome/browser/extensions/chrome_app_sorting.cc b/chrome/browser/extensions/chrome_app_sorting.cc
index 81f9ef5..c924513 100644
--- a/chrome/browser/extensions/chrome_app_sorting.cc
+++ b/chrome/browser/extensions/chrome_app_sorting.cc

@@ -321,9 +321,10 @@
       extension_id, page_ordinal, GetAppLaunchOrdinal(extension_id));
   AddOrdinalMapping(extension_id, page_ordinal, new_app_launch_ordinal);
 
-  base::Value* new_value = new_app_launch_ordinal.IsValid() ?
-      new base::StringValue(new_app_launch_ordinal.ToInternalValue()) :
-      NULL;
+  base::Value* new_value =
+      new_app_launch_ordinal.IsValid()
+          ? new base::Value(new_app_launch_ordinal.ToInternalValue())
+          : NULL;
 
   ExtensionPrefs::Get(browser_context_)->UpdateExtensionPref(
       extension_id,
@@ -400,9 +401,10 @@
       extension_id, GetPageOrdinal(extension_id), app_launch_ordinal);
   AddOrdinalMapping(extension_id, new_page_ordinal, app_launch_ordinal);
 
-  base::Value* new_value = new_page_ordinal.IsValid() ?
-      new base::StringValue(new_page_ordinal.ToInternalValue()) :
-      NULL;
+  base::Value* new_value =
+      new_page_ordinal.IsValid()
+          ? new base::Value(new_page_ordinal.ToInternalValue())
+          : NULL;
 
   ExtensionPrefs::Get(browser_context_)->UpdateExtensionPref(
       extension_id,

diff --git a/chrome/browser/extensions/extension_assets_manager_chromeos.cc b/chrome/browser/extensions/extension_assets_manager_chromeos.cc
index 50bec5a..c6213bc 100644
--- a/chrome/browser/extensions/extension_assets_manager_chromeos.cc
+++ b/chrome/browser/extensions/extension_assets_manager_chromeos.cc

@@ -454,7 +454,7 @@
     versions.push_back(it.key());
   }
 
-  base::StringValue user_name(profile->GetProfileUserName());
+  base::Value user_name(profile->GetProfileUserName());
   for (std::vector<std::string>::const_iterator it = versions.begin();
        it != versions.end(); it++) {
     base::DictionaryValue* version_info = NULL;

diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
index 1e8904b..f169ae0 100644
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc

@@ -273,7 +273,7 @@
   default_settings_.reset(new internal::IndividualSettings());
 
   // Parse default settings.
-  const base::StringValue wildcard("*");
+  const base::Value wildcard("*");
   if (denied_list_pref &&
       denied_list_pref->Find(wildcard) != denied_list_pref->end()) {
     default_settings_->installation_mode = INSTALLATION_BLOCKED;

diff --git a/chrome/browser/extensions/extension_management_test_util.cc b/chrome/browser/extensions/extension_management_test_util.cc
index 85b19468..ec6313c 100644
--- a/chrome/browser/extensions/extension_management_test_util.cc
+++ b/chrome/browser/extensions/extension_management_test_util.cc

@@ -233,8 +233,7 @@
     list_value = new base::ListValue();
     pref_->Set(path, list_value);
   }
-  CHECK(
-      list_value->AppendIfNotPresent(base::MakeUnique<base::StringValue>(str)));
+  CHECK(list_value->AppendIfNotPresent(base::MakeUnique<base::Value>(str)));
 }
 
 void ExtensionManagementPrefUpdaterBase::RemoveStringFromList(
@@ -242,7 +241,7 @@
     const std::string& str) {
   base::ListValue* list_value = nullptr;
   if (pref_->GetList(path, &list_value))
-    CHECK(list_value->Remove(base::StringValue(str), nullptr));
+    CHECK(list_value->Remove(base::Value(str), nullptr));
 }
 
 // ExtensionManagementPolicyUpdater --------------------------------------------

diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
index c599ff74..232e913 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc

@@ -304,7 +304,7 @@
         false);  // is_incognito_enabled.
     extension_prefs_value_map->SetExtensionPref(id, proxy_config::prefs::kProxy,
                                                 kExtensionPrefsScopeRegular,
-                                                new base::StringValue(id));
+                                                new base::Value(id));
 
     if (ExtensionRegistry::Get(profile())->enabled_extensions().GetByID(id))
       return testing::AssertionSuccess();
@@ -915,9 +915,8 @@
                     const base::Time& time,
                     ExtensionPrefs* prefs) {
   std::string time_str = base::Int64ToString(time.ToInternalValue());
-  prefs->UpdateExtensionPref(extension_id,
-                             "install_time",
-                             new base::StringValue(time_str));
+  prefs->UpdateExtensionPref(extension_id, "install_time",
+                             new base::Value(time_str));
 }
 
 // The feature this is meant to test is only implemented on Windows and Mac.

diff --git a/chrome/browser/extensions/extension_service_sync_unittest.cc b/chrome/browser/extensions/extension_service_sync_unittest.cc
index b19b087..5ff7700a 100644
--- a/chrome/browser/extensions/extension_service_sync_unittest.cc
+++ b/chrome/browser/extensions/extension_service_sync_unittest.cc

@@ -1692,7 +1692,7 @@
         supervised_users::kApprovedExtensions, extension_id);
     syncer::SyncData sync_data =
         SupervisedUserSettingsService::CreateSyncDataForSetting(
-            key, base::StringValue(version));
+            key, base::Value(version));
 
     SyncChangeList list(1, SyncChange(FROM_HERE, type, sync_data));
 

diff --git a/chrome/browser/extensions/extension_storage_monitor.cc b/chrome/browser/extensions/extension_storage_monitor.cc
index 238ed9c..6c88c23 100644
--- a/chrome/browser/extensions/extension_storage_monitor.cc
+++ b/chrome/browser/extensions/extension_storage_monitor.cc

@@ -607,11 +607,9 @@
     const std::string& extension_id,
     int64_t next_threshold) {
   extension_prefs_->UpdateExtensionPref(
-      extension_id,
-      kPrefNextStorageThreshold,
-      next_threshold > 0
-          ? new base::StringValue(base::Int64ToString(next_threshold))
-          : NULL);
+      extension_id, kPrefNextStorageThreshold,
+      next_threshold > 0 ? new base::Value(base::Int64ToString(next_threshold))
+                         : NULL);
 }
 
 int64_t ExtensionStorageMonitor::GetNextStorageThresholdFromPrefs(

diff --git a/chrome/browser/geolocation/chrome_access_token_store.cc b/chrome/browser/geolocation/chrome_access_token_store.cc
index 41b3bac9..0aaa8301 100644
--- a/chrome/browser/geolocation/chrome_access_token_store.cc
+++ b/chrome/browser/geolocation/chrome_access_token_store.cc

@@ -118,8 +118,8 @@
   DictionaryPrefUpdate update(g_browser_process->local_state(),
                               prefs::kGeolocationAccessToken);
   base::DictionaryValue* access_token_dictionary = update.Get();
-  access_token_dictionary->SetWithoutPathExpansion(
-      server_url.spec(), new base::StringValue(token));
+  access_token_dictionary->SetWithoutPathExpansion(server_url.spec(),
+                                                   new base::Value(token));
 }
 
 void ChromeAccessTokenStore::SaveAccessToken(

diff --git a/chrome/browser/media/router/presentation_service_delegate_impl.cc b/chrome/browser/media/router/presentation_service_delegate_impl.cc
index 2cd8f50..0bf2874 100644
--- a/chrome/browser/media/router/presentation_service_delegate_impl.cc
+++ b/chrome/browser/media/router/presentation_service_delegate_impl.cc

@@ -1056,7 +1056,7 @@
           ->GetPrefs()
           ->GetList(prefs::kMediaRouterTabMirroringSources);
   return origins &&
-         origins->Find(base::StringValue(origin.Serialize())) != origins->end();
+         origins->Find(base::Value(origin.Serialize())) != origins->end();
 }
 #endif  // !defined(OS_ANDROID)
 

diff --git a/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc b/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc
index eb1632f..e410d16 100644
--- a/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc
+++ b/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc

@@ -547,7 +547,7 @@
   {
     ListPrefUpdate update(profile()->GetPrefs(),
                           prefs::kMediaRouterTabMirroringSources);
-    update->AppendIfNotPresent(base::MakeUnique<base::StringValue>(origin));
+    update->AppendIfNotPresent(base::MakeUnique<base::Value>(origin));
   }
 
   // Auto-join requests should be rejected.
@@ -567,7 +567,7 @@
   {
     ListPrefUpdate update(profile()->GetPrefs(),
                           prefs::kMediaRouterTabMirroringSources);
-    update->Remove(base::StringValue(origin), nullptr);
+    update->Remove(base::Value(origin), nullptr);
   }
 
   // Auto-join requests should now go through.
@@ -597,14 +597,14 @@
   {
     ListPrefUpdate update(profile()->GetOffTheRecordProfile()->GetPrefs(),
                           prefs::kMediaRouterTabMirroringSources);
-    update->AppendIfNotPresent(base::MakeUnique<base::StringValue>(origin));
+    update->AppendIfNotPresent(base::MakeUnique<base::Value>(origin));
   }
 
   // Setting the pref in incognito shouldn't set it for the non-incognito
   // profile.
   const base::ListValue* non_incognito_origins =
       profile()->GetPrefs()->GetList(prefs::kMediaRouterTabMirroringSources);
-  EXPECT_EQ(non_incognito_origins->Find(base::StringValue(origin)),
+  EXPECT_EQ(non_incognito_origins->Find(base::Value(origin)),
             non_incognito_origins->end());
 
   // Auto-join requests should be rejected.
@@ -624,7 +624,7 @@
   {
     ListPrefUpdate update(profile()->GetOffTheRecordProfile()->GetPrefs(),
                           prefs::kMediaRouterTabMirroringSources);
-    update->Remove(base::StringValue(origin), nullptr);
+    update->Remove(base::Value(origin), nullptr);
   }
 
   // Auto-join requests should now go through.

diff --git a/chrome/browser/net/disk_cache_dir_policy_handler.cc b/chrome/browser/net/disk_cache_dir_policy_handler.cc
index ec3402f12..150ebadb 100644
--- a/chrome/browser/net/disk_cache_dir_policy_handler.cc
+++ b/chrome/browser/net/disk_cache_dir_policy_handler.cc

@@ -29,7 +29,7 @@
     base::FilePath::StringType expanded_value =
         policy::path_parser::ExpandPathVariables(string_value);
     prefs->SetValue(prefs::kDiskCacheDir,
-                    base::MakeUnique<base::StringValue>(expanded_value));
+                    base::MakeUnique<base::Value>(expanded_value));
   }
 }
 

diff --git a/chrome/browser/net/disk_cache_dir_policy_handler_unittest.cc b/chrome/browser/net/disk_cache_dir_policy_handler_unittest.cc
index c5611bc5..59a3027 100644
--- a/chrome/browser/net/disk_cache_dir_policy_handler_unittest.cc
+++ b/chrome/browser/net/disk_cache_dir_policy_handler_unittest.cc

@@ -41,8 +41,7 @@
   // Use a variable in the value. It should be expanded by the handler.
   const std::string in = "${user_name}/foo";
   policy_.Set(key::kDiskCacheDir, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-              POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(in),
-              nullptr);
+              POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(in), nullptr);
   handler_.ApplyPolicySettings(policy_, &prefs_);
 
   const base::Value* value;

diff --git a/chrome/browser/notifications/notifier_state_tracker.cc b/chrome/browser/notifications/notifier_state_tracker.cc
index 6f094080..a7d2a92 100644
--- a/chrome/browser/notifications/notifier_state_tracker.cc
+++ b/chrome/browser/notifications/notifier_state_tracker.cc

@@ -123,12 +123,12 @@
 
   bool add_new_item = false;
   const char* pref_name = NULL;
-  std::unique_ptr<base::StringValue> id;
+  std::unique_ptr<base::Value> id;
   switch (notifier_id.type) {
     case NotifierId::APPLICATION:
       pref_name = prefs::kMessageCenterDisabledExtensionIds;
       add_new_item = !enabled;
-      id.reset(new base::StringValue(notifier_id.id));
+      id.reset(new base::Value(notifier_id.id));
 #if BUILDFLAG(ENABLE_EXTENSIONS)
       FirePermissionLevelChangedEvent(notifier_id, enabled);
 #endif
@@ -137,7 +137,7 @@
 #if defined(OS_CHROMEOS)
       pref_name = prefs::kMessageCenterDisabledSystemComponentIds;
       add_new_item = !enabled;
-      id.reset(new base::StringValue(notifier_id.id));
+      id.reset(new base::Value(notifier_id.id));
 #else
       return;
 #endif

diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
index edc27531..04705a3 100644
--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc

@@ -169,7 +169,7 @@
                 base::MakeUnique<base::Value>(1000), nullptr);
   expected->Set(key::kHomepageLocation, POLICY_LEVEL_RECOMMENDED,
                 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                base::MakeUnique<base::StringValue>(homepage), nullptr);
+                base::MakeUnique<base::Value>(homepage), nullptr);
 }
 
 }  // namespace

diff --git a/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc b/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc
index bba50c8..8e4a2fc 100644
--- a/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc
+++ b/chrome/browser/policy/managed_bookmarks_policy_handler_unittest.cc

@@ -181,15 +181,15 @@
 TEST_F(ManagedBookmarksPolicyHandlerTest, WrongPolicyType) {
   PolicyMap policy;
   // The expected type is base::ListValue, but this policy sets it as an
-  // unparsed base::StringValue. Any type other than ListValue should fail.
+  // unparsed base::Value. Any type other than ListValue should fail.
   policy.Set(key::kManagedBookmarks, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>("["
-                                                 "  {"
-                                                 "    \"name\": \"Google\","
-                                                 "    \"url\": \"google.com\""
-                                                 "  },"
-                                                 "]"),
+             base::MakeUnique<base::Value>("["
+                                           "  {"
+                                           "    \"name\": \"Google\","
+                                           "    \"url\": \"google.com\""
+                                           "  },"
+                                           "]"),
              nullptr);
   UpdateProviderPolicy(policy);
   EXPECT_FALSE(store_->GetValue(bookmarks::prefs::kManagedBookmarks, NULL));

diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index cf6f84c3..d61a51d 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc

@@ -856,7 +856,7 @@
     PolicyMap policies;
     policies.Set(key::kApplicationLocaleValue, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>("fr"), nullptr);
+                 base::MakeUnique<base::Value>("fr"), nullptr);
     provider_.UpdateChromePolicy(policies);
     // The "en-US" ResourceBundle is always loaded before this step for tests,
     // but in this test we want the browser to load the bundle as it
@@ -995,13 +995,13 @@
                base::MakeUnique<base::Value>(true), nullptr);
   policies.Set(key::kDefaultSearchProviderKeyword, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-               base::MakeUnique<base::StringValue>(kKeyword), nullptr);
+               base::MakeUnique<base::Value>(kKeyword), nullptr);
   policies.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-               base::MakeUnique<base::StringValue>(kSearchURL), nullptr);
+               base::MakeUnique<base::Value>(kSearchURL), nullptr);
   policies.Set(key::kDefaultSearchProviderInstantURL, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-               base::MakeUnique<base::StringValue>(kInstantURL), nullptr);
+               base::MakeUnique<base::Value>(kInstantURL), nullptr);
   std::unique_ptr<base::ListValue> alternate_urls(new base::ListValue);
   alternate_urls->AppendString(kAlternateURL0);
   alternate_urls->AppendString(kAlternateURL1);
@@ -1010,18 +1010,17 @@
                std::move(alternate_urls), nullptr);
   policies.Set(key::kDefaultSearchProviderSearchTermsReplacementKey,
                POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-               base::MakeUnique<base::StringValue>(kSearchTermsReplacementKey),
+               base::MakeUnique<base::Value>(kSearchTermsReplacementKey),
                nullptr);
   policies.Set(key::kDefaultSearchProviderImageURL, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-               base::MakeUnique<base::StringValue>(kImageURL), nullptr);
+               base::MakeUnique<base::Value>(kImageURL), nullptr);
   policies.Set(key::kDefaultSearchProviderImageURLPostParams,
                POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-               base::MakeUnique<base::StringValue>(kImageURLPostParams),
-               nullptr);
+               base::MakeUnique<base::Value>(kImageURLPostParams), nullptr);
   policies.Set(key::kDefaultSearchProviderNewTabURL, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-               base::MakeUnique<base::StringValue>(kNewTabURL), nullptr);
+               base::MakeUnique<base::Value>(kNewTabURL), nullptr);
   UpdateProviderPolicy(policies);
   default_search = service->GetDefaultSearchProvider();
   ASSERT_TRUE(default_search);
@@ -1452,11 +1451,10 @@
   base::ScopedTempDir forced_dir;
   ASSERT_TRUE(forced_dir.CreateUniqueTempDir());
   PolicyMap policies;
-  policies.Set(
-      key::kDownloadDirectory, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-      POLICY_SOURCE_CLOUD,
-      base::MakeUnique<base::StringValue>(forced_dir.GetPath().value()),
-      nullptr);
+  policies.Set(key::kDownloadDirectory, POLICY_LEVEL_MANDATORY,
+               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+               base::MakeUnique<base::Value>(forced_dir.GetPath().value()),
+               nullptr);
   UpdateProviderPolicy(policies);
   DownloadAndVerifyFile(browser(), forced_dir.GetPath(), file);
   // Verify that the first download location wasn't affected.
@@ -2077,7 +2075,7 @@
   PolicyMap policies;
   policies.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-               base::MakeUnique<base::StringValue>(chrome::kChromeUICreditsURL),
+               base::MakeUnique<base::Value>(chrome::kChromeUICreditsURL),
                nullptr);
   UpdateProviderPolicy(policies);
   EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_HOME));
@@ -2469,7 +2467,7 @@
   CheckURLIsBlocked(browser(), file_path2.c_str());
 
   // Replace the URLblacklist with disabling the file scheme.
-  blacklist.Remove(base::StringValue("file://*"), NULL);
+  blacklist.Remove(base::Value("file://*"), NULL);
   policies.Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                POLICY_SOURCE_CLOUD, blacklist.CreateDeepCopy(), nullptr);
   UpdateProviderPolicy(policies);
@@ -2477,8 +2475,7 @@
 
   PrefService* prefs = browser()->profile()->GetPrefs();
   const base::ListValue* list_url = prefs->GetList(policy_prefs::kUrlBlacklist);
-  EXPECT_EQ(list_url->Find(base::StringValue("file://*")),
-            list_url->end());
+  EXPECT_EQ(list_url->Find(base::Value("file://*")), list_url->end());
 
   base::ListValue disabledscheme;
   disabledscheme.AppendString("file");
@@ -2488,8 +2485,7 @@
   FlushBlacklistPolicy();
 
   list_url = prefs->GetList(policy_prefs::kUrlBlacklist);
-  EXPECT_NE(list_url->Find(base::StringValue("file://*")),
-            list_url->end());
+  EXPECT_NE(list_url->Find(base::Value("file://*")), list_url->end());
 
   // Whitelist one folder and blacklist an another just inside.
   base::ListValue whitelist;
@@ -3079,8 +3075,7 @@
                  base::MakeUnique<base::Value>(false), nullptr);
     policies.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>("http://chromium.org"),
-                 nullptr);
+                 base::MakeUnique<base::Value>("http://chromium.org"), nullptr);
     provider_.UpdateChromePolicy(policies);
   }
 };
@@ -3691,7 +3686,7 @@
     if (enable) {
       policies.Set(key::kWebRtcUdpPortRange, POLICY_LEVEL_MANDATORY,
                    POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                   base::MakeUnique<base::StringValue>(kTestWebRtcUdpPortRange),
+                   base::MakeUnique<base::Value>(kTestWebRtcUdpPortRange),
                    nullptr);
     }
     provider_.UpdateChromePolicy(policies);
@@ -4013,7 +4008,7 @@
     PolicyMap policies;
     policies.Set(key::kVariationsRestrictParameter, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>("restricted"), nullptr);
+                 base::MakeUnique<base::Value>("restricted"), nullptr);
     provider_.UpdateChromePolicy(policies);
   }
 };

diff --git a/chrome/browser/prefs/chrome_pref_service_unittest.cc b/chrome/browser/prefs/chrome_pref_service_unittest.cc
index da2f3e4..1a181f4 100644
--- a/chrome/browser/prefs/chrome_pref_service_unittest.cc
+++ b/chrome/browser/prefs/chrome_pref_service_unittest.cc

@@ -59,14 +59,12 @@
     // Set some (WebKit) user preferences.
     sync_preferences::TestingPrefServiceSyncable* pref_services =
         profile()->GetTestingPrefService();
-    pref_services->SetUserPref(prefs::kDefaultCharset,
-                               new base::StringValue("utf8"));
+    pref_services->SetUserPref(prefs::kDefaultCharset, new base::Value("utf8"));
     pref_services->SetUserPref(prefs::kWebKitDefaultFontSize,
                                new base::Value(20));
     pref_services->SetUserPref(prefs::kWebKitTextAreasAreResizable,
                                new base::Value(false));
-    pref_services->SetUserPref("webkit.webprefs.foo",
-                               new base::StringValue("bar"));
+    pref_services->SetUserPref("webkit.webprefs.foo", new base::Value("bar"));
   }
 };
 

diff --git a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc
index 49d3884..701c8fe8 100644
--- a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc
+++ b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc

@@ -198,14 +198,13 @@
     pref_store->AddObserver(&registry_verifier_);
     PersistentPrefStore::PrefReadError error = pref_store->ReadPrefs();
     EXPECT_EQ(PersistentPrefStore::PREF_READ_ERROR_NO_FILE, error);
-    pref_store->SetValue(kTrackedAtomic,
-                         base::MakeUnique<base::StringValue>(kFoobar),
+    pref_store->SetValue(kTrackedAtomic, base::MakeUnique<base::Value>(kFoobar),
                          WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
     pref_store->SetValue(kProtectedAtomic,
-                         base::MakeUnique<base::StringValue>(kHelloWorld),
+                         base::MakeUnique<base::Value>(kHelloWorld),
                          WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
     pref_store->SetValue(kUnprotectedPref,
-                         base::MakeUnique<base::StringValue>(kFoobar),
+                         base::MakeUnique<base::Value>(kFoobar),
                          WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
     pref_store->RemoveObserver(&registry_verifier_);
     pref_store->CommitPendingWrite();
@@ -321,8 +320,8 @@
 
 TEST_F(ProfilePrefStoreManagerTest, InitializePrefsFromMasterPrefs) {
   auto master_prefs = base::MakeUnique<base::DictionaryValue>();
-  master_prefs->Set(kTrackedAtomic, new base::StringValue(kFoobar));
-  master_prefs->Set(kProtectedAtomic, new base::StringValue(kHelloWorld));
+  master_prefs->Set(kTrackedAtomic, new base::Value(kFoobar));
+  master_prefs->Set(kProtectedAtomic, new base::Value(kHelloWorld));
   EXPECT_TRUE(
       manager_->InitializePrefsFromMasterPrefs(std::move(master_prefs)));
 
@@ -483,7 +482,7 @@
   // Trigger the logic that migrates it back to the unprotected preferences
   // file.
   pref_store_->SetValue(kProtectedAtomic,
-                        base::WrapUnique(new base::StringValue(kGoodbyeWorld)),
+                        base::WrapUnique(new base::Value(kGoodbyeWorld)),
                         WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   LoadExistingPrefs();
   ExpectStringValueEquals(kProtectedAtomic, kGoodbyeWorld);

diff --git a/chrome/browser/prefs/proxy_policy_unittest.cc b/chrome/browser/prefs/proxy_policy_unittest.cc
index aadac72..8fdcaab 100644
--- a/chrome/browser/prefs/proxy_policy_unittest.cc
+++ b/chrome/browser/prefs/proxy_policy_unittest.cc

@@ -129,15 +129,15 @@
   command_line_.AppendSwitchASCII(switches::kProxyBypassList, "123");
   command_line_.AppendSwitchASCII(switches::kProxyServer, "789");
   std::unique_ptr<base::Value> mode_name(
-      new base::StringValue(ProxyPrefs::kFixedServersProxyModeName));
+      new base::Value(ProxyPrefs::kFixedServersProxyModeName));
   PolicyMap policy;
   policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD, std::move(mode_name), nullptr);
   policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("abc"),
+             POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("abc"),
              nullptr);
   policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("ghi"),
+             POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("ghi"),
              nullptr);
   provider_.UpdateChromePolicy(policy);
 
@@ -166,7 +166,7 @@
   command_line_.AppendSwitchASCII(switches::kProxyBypassList, "123");
   command_line_.AppendSwitchASCII(switches::kProxyServer, "789");
   std::unique_ptr<base::Value> mode_name(
-      new base::StringValue(ProxyPrefs::kAutoDetectProxyModeName));
+      new base::Value(ProxyPrefs::kAutoDetectProxyModeName));
   PolicyMap policy;
   policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD, std::move(mode_name), nullptr);
@@ -194,7 +194,7 @@
 TEST_F(ProxyPolicyTest, OverridesCommandLineNoProxy) {
   command_line_.AppendSwitch(switches::kNoProxyServer);
   std::unique_ptr<base::Value> mode_name(
-      new base::StringValue(ProxyPrefs::kAutoDetectProxyModeName));
+      new base::Value(ProxyPrefs::kAutoDetectProxyModeName));
   PolicyMap policy;
   policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD, std::move(mode_name), nullptr);
@@ -218,7 +218,7 @@
 TEST_F(ProxyPolicyTest, OverridesCommandLineAutoDetect) {
   command_line_.AppendSwitch(switches::kProxyAutoDetect);
   std::unique_ptr<base::Value> mode_name(
-      new base::StringValue(ProxyPrefs::kDirectProxyModeName));
+      new base::Value(ProxyPrefs::kDirectProxyModeName));
   PolicyMap policy;
   policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD, std::move(mode_name), nullptr);

diff --git a/chrome/browser/prefs/session_startup_pref.cc b/chrome/browser/prefs/session_startup_pref.cc
index 7bcf8d03..b7dd90f 100644
--- a/chrome/browser/prefs/session_startup_pref.cc
+++ b/chrome/browser/prefs/session_startup_pref.cc

@@ -90,7 +90,7 @@
     url_pref_list->Clear();
     for (size_t i = 0; i < pref.urls.size(); ++i) {
       url_pref_list->Set(static_cast<int>(i),
-                         new base::StringValue(pref.urls[i].spec()));
+                         new base::Value(pref.urls[i].spec()));
     }
   }
 }

diff --git a/chrome/browser/prefs/session_startup_pref_unittest.cc b/chrome/browser/prefs/session_startup_pref_unittest.cc
index 0f0470a7..ebe69c2b 100644
--- a/chrome/browser/prefs/session_startup_pref_unittest.cc
+++ b/chrome/browser/prefs/session_startup_pref_unittest.cc

@@ -27,8 +27,8 @@
 
 TEST_F(SessionStartupPrefTest, URLListIsFixedUp) {
   base::ListValue* url_pref_list = new base::ListValue;
-  url_pref_list->Set(0, new base::StringValue("google.com"));
-  url_pref_list->Set(1, new base::StringValue("chromium.org"));
+  url_pref_list->Set(0, new base::Value("google.com"));
+  url_pref_list->Set(1, new base::Value("chromium.org"));
   pref_service_->SetUserPref(prefs::kURLsToRestoreOnStartup, url_pref_list);
 
   SessionStartupPref result =
@@ -40,13 +40,13 @@
 
 TEST_F(SessionStartupPrefTest, URLListManagedOverridesUser) {
   base::ListValue* url_pref_list1 = new base::ListValue;
-  url_pref_list1->Set(0, new base::StringValue("chromium.org"));
+  url_pref_list1->Set(0, new base::Value("chromium.org"));
   pref_service_->SetUserPref(prefs::kURLsToRestoreOnStartup, url_pref_list1);
 
   base::ListValue* url_pref_list2 = new base::ListValue;
-  url_pref_list2->Set(0, new base::StringValue("chromium.org"));
-  url_pref_list2->Set(1, new base::StringValue("chromium.org"));
-  url_pref_list2->Set(2, new base::StringValue("chromium.org"));
+  url_pref_list2->Set(0, new base::Value("chromium.org"));
+  url_pref_list2->Set(1, new base::Value("chromium.org"));
+  url_pref_list2->Set(2, new base::Value("chromium.org"));
   pref_service_->SetManagedPref(prefs::kURLsToRestoreOnStartup,
                                 url_pref_list2);
 

diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
index a7f92ac..8636b75 100644
--- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc
+++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc

@@ -246,7 +246,7 @@
       profile_.GetTestingPrefService();
   prefs->SetUserPref(
       prefs::kCloudPrintEmail,
-      new base::StringValue(MockServiceProcessControl::EnabledUserId()));
+      new base::Value(MockServiceProcessControl::EnabledUserId()));
 
   service.Initialize();
 
@@ -261,8 +261,7 @@
 
   sync_preferences::TestingPrefServiceSyncable* prefs =
       profile_.GetTestingPrefService();
-  prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     new base::StringValue(std::string()));
+  prefs->SetUserPref(prefs::kCloudPrintEmail, new base::Value(std::string()));
 
   service.Initialize();
   service.RefreshStatusFromService();
@@ -279,8 +278,7 @@
 
   sync_preferences::TestingPrefServiceSyncable* prefs =
       profile_.GetTestingPrefService();
-  prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     new base::StringValue(std::string()));
+  prefs->SetUserPref(prefs::kCloudPrintEmail, new base::Value(std::string()));
   prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled, new base::Value(false));
 
   service.Initialize();
@@ -297,8 +295,7 @@
 
   sync_preferences::TestingPrefServiceSyncable* prefs =
       profile_.GetTestingPrefService();
-  prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     new base::StringValue(std::string()));
+  prefs->SetUserPref(prefs::kCloudPrintEmail, new base::Value(std::string()));
   prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled, new base::Value(false));
 
   service.Initialize();
@@ -316,7 +313,7 @@
       profile_.GetTestingPrefService();
   prefs->SetUserPref(
       prefs::kCloudPrintEmail,
-      new base::StringValue(MockServiceProcessControl::EnabledUserId()));
+      new base::Value(MockServiceProcessControl::EnabledUserId()));
 
   service.Initialize();
 
@@ -335,8 +332,7 @@
 
   sync_preferences::TestingPrefServiceSyncable* prefs =
       profile_.GetTestingPrefService();
-  prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     new base::StringValue(std::string()));
+  prefs->SetUserPref(prefs::kCloudPrintEmail, new base::Value(std::string()));
 
   service.Initialize();
   service.RefreshStatusFromService();
@@ -359,8 +355,7 @@
 
   sync_preferences::TestingPrefServiceSyncable* prefs =
       profile_.GetTestingPrefService();
-  prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     new base::StringValue(std::string()));
+  prefs->SetUserPref(prefs::kCloudPrintEmail, new base::Value(std::string()));
   prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled, new base::Value(false));
 
   service.Initialize();
@@ -380,8 +375,7 @@
 
   sync_preferences::TestingPrefServiceSyncable* prefs =
       profile_.GetTestingPrefService();
-  prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     new base::StringValue(std::string()));
+  prefs->SetUserPref(prefs::kCloudPrintEmail, new base::Value(std::string()));
   prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled, new base::Value(false));
 
   service.Initialize();
@@ -401,7 +395,7 @@
       profile_.GetTestingPrefService();
   prefs->SetUserPref(
       prefs::kCloudPrintEmail,
-      new base::StringValue(MockServiceProcessControl::EnabledUserId()));
+      new base::Value(MockServiceProcessControl::EnabledUserId()));
 
   service.Initialize();
   EXPECT_EQ(std::string(), prefs->GetString(prefs::kCloudPrintEmail));
@@ -423,8 +417,7 @@
 
   sync_preferences::TestingPrefServiceSyncable* prefs =
       profile_.GetTestingPrefService();
-  prefs->SetUserPref(prefs::kCloudPrintEmail,
-                     new base::StringValue(std::string()));
+  prefs->SetUserPref(prefs::kCloudPrintEmail, new base::Value(std::string()));
   prefs->SetManagedPref(prefs::kCloudPrintProxyEnabled, new base::Value(false));
 
   service.Initialize();

diff --git a/chrome/browser/profiles/profile_window_browsertest.cc b/chrome/browser/profiles/profile_window_browsertest.cc
index d1233ae5..012fb67 100644
--- a/chrome/browser/profiles/profile_window_browsertest.cc
+++ b/chrome/browser/profiles/profile_window_browsertest.cc

@@ -289,8 +289,8 @@
   run_loop.Run();
 
   ui_test_utils::NavigateToURL(browser(), GURL(url_to_test));
-  EXPECT_TRUE(RunJavascriptTest(
-      "testPodFocused", new base::StringValue(expected_path.AsUTF8Unsafe())));
+  EXPECT_TRUE(RunJavascriptTest("testPodFocused",
+                                new base::Value(expected_path.AsUTF8Unsafe())));
 }
 
 #endif  // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)

diff --git a/chrome/browser/push_messaging/push_messaging_app_identifier.cc b/chrome/browser/push_messaging/push_messaging_app_identifier.cc
index fc2f52a..61f8c78 100644
--- a/chrome/browser/push_messaging/push_messaging_app_identifier.cc
+++ b/chrome/browser/push_messaging/push_messaging_app_identifier.cc

@@ -131,8 +131,8 @@
     Profile* profile,
     const GURL& origin,
     int64_t service_worker_registration_id) {
-  const base::StringValue pref_value =
-      base::StringValue(MakePrefValue(origin, service_worker_registration_id));
+  const base::Value pref_value =
+      base::Value(MakePrefValue(origin, service_worker_registration_id));
 
   const base::DictionaryValue* map =
       profile->GetPrefs()->GetDictionary(prefs::kPushMessagingAppIdentifierMap);

diff --git a/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc
index c78892b..c5141eb 100644
--- a/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/extension_data_collection_unittest.cc

@@ -99,8 +99,8 @@
   extension_service_->AddExtension(extension.get());
 
   extension_prefs_->UpdateExtensionPref(
-      extension_id, "install_time", new base::StringValue(base::Int64ToString(
-                                        install_time.ToInternalValue())));
+      extension_id, "install_time",
+      new base::Value(base::Int64ToString(install_time.ToInternalValue())));
   extension_prefs_->UpdateExtensionPref(extension_id, "state",
                                         new base::Value(state_value));
 }

diff --git a/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc
index ec2c18f..7eb3d96 100644
--- a/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc

@@ -139,7 +139,7 @@
       case Value::Type::DOUBLE:
         return std::unique_ptr<Value>(new base::Value(0.47));
       case Value::Type::STRING:
-        return std::unique_ptr<Value>(new base::StringValue("i have a spleen"));
+        return std::unique_ptr<Value>(new base::Value("i have a spleen"));
       case Value::Type::DICTIONARY: {
         std::unique_ptr<base::DictionaryValue> value(
             new base::DictionaryValue());

diff --git a/chrome/browser/ssl/chrome_expect_ct_reporter.cc b/chrome/browser/ssl/chrome_expect_ct_reporter.cc
index d10a652..6cfaf54f 100644
--- a/chrome/browser/ssl/chrome_expect_ct_reporter.cc
+++ b/chrome/browser/ssl/chrome_expect_ct_reporter.cc

@@ -39,7 +39,7 @@
   std::vector<std::string> pem_encoded_chain;
   cert_chain->GetPEMEncodedChain(&pem_encoded_chain);
   for (const std::string& cert : pem_encoded_chain)
-    result->Append(base::MakeUnique<base::StringValue>(cert));
+    result->Append(base::MakeUnique<base::Value>(cert));
 
   return result;
 }

diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
index cfed6f0..2c6b4b1a 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_service_unittest.cc

@@ -22,7 +22,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::DictionaryValue;
-using base::StringValue;
 using base::Value;
 using sync_pb::ManagedUserSharedSettingSpecifics;
 using syncer::SUPERVISED_USER_SHARED_SETTINGS;
@@ -160,9 +159,9 @@
   const char kIdB[] = "bbbbbb";
   const char kIdC[] = "cccccc";
 
-  StringValue name("Jack");
+  Value name("Jack");
   Value age(8);
-  StringValue bar("bar");
+  Value bar("bar");
   settings_service_.SetValue(kIdA, "name", name);
   ASSERT_EQ(1u, sync_processor_->changes().size());
   VerifySyncChangesAndClear();
@@ -202,15 +201,15 @@
   const char kIdC[] = "cccccc";
 
   Value age(8);
-  StringValue bar("bar");
-  settings_service_.SetValue(kIdA, "name", StringValue("Jack"));
+  Value bar("bar");
+  settings_service_.SetValue(kIdA, "name", Value("Jack"));
   settings_service_.SetValue(kIdA, "age", age);
   settings_service_.SetValue(kIdB, "foo", bar);
 
   settings_service_.StopSyncing(SUPERVISED_USER_SHARED_SETTINGS);
 
-  StringValue name("Jill");
-  StringValue blurp("blurp");
+  Value name("Jill");
+  Value blurp("blurp");
   SyncDataList sync_data;
   sync_data.push_back(
       SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
@@ -252,13 +251,13 @@
   const char kIdC[] = "cccccc";
 
   Value age(8);
-  StringValue bar("bar");
-  settings_service_.SetValue(kIdA, "name", StringValue("Jack"));
+  Value bar("bar");
+  settings_service_.SetValue(kIdA, "name", Value("Jack"));
   settings_service_.SetValue(kIdA, "age", age);
   settings_service_.SetValue(kIdB, "foo", bar);
 
-  StringValue name("Jill");
-  StringValue blurp("blurp");
+  Value name("Jill");
+  Value blurp("blurp");
   SyncChangeList changes;
   changes.push_back(
       SyncChange(FROM_HERE,

diff --git a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc
index 83173f6..f8045716 100644
--- a/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc
+++ b/chrome/browser/supervised_user/legacy/supervised_user_shared_settings_update_unittest.cc

@@ -32,15 +32,14 @@
 TEST_F(SupervisedUserSharedSettingsUpdateTest, Success) {
   SupervisedUserSharedSettingsUpdate update(
       &service_, "abcdef", "name",
-      std::unique_ptr<base::Value>(new base::StringValue("Hans Moleman")),
+      std::unique_ptr<base::Value>(new base::Value("Hans Moleman")),
       base::Bind(&SupervisedUserSharedSettingsUpdateTest::OnSettingUpdated,
                  base::Unretained(this)));
   syncer::SyncChangeList changes;
   changes.push_back(syncer::SyncChange(
-      FROM_HERE,
-      syncer::SyncChange::ACTION_UPDATE,
+      FROM_HERE, syncer::SyncChange::ACTION_UPDATE,
       SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
-          "abcdef", "name", base::StringValue("Hans Moleman"), true)));
+          "abcdef", "name", base::Value("Hans Moleman"), true)));
   syncer::SyncError error = service_.ProcessSyncChanges(FROM_HERE, changes);
   EXPECT_FALSE(error.IsSet()) << error.ToString();
   ASSERT_TRUE(result_);
@@ -50,20 +49,16 @@
 TEST_F(SupervisedUserSharedSettingsUpdateTest, Failure) {
   SupervisedUserSharedSettingsUpdate update(
       &service_, "abcdef", "name",
-      std::unique_ptr<base::Value>(new base::StringValue("Hans Moleman")),
+      std::unique_ptr<base::Value>(new base::Value("Hans Moleman")),
       base::Bind(&SupervisedUserSharedSettingsUpdateTest::OnSettingUpdated,
                  base::Unretained(this)));
 
   // Syncing down a different change will cause the update to fail.
   syncer::SyncChangeList changes;
   changes.push_back(syncer::SyncChange(
-      FROM_HERE,
-      syncer::SyncChange::ACTION_UPDATE,
+      FROM_HERE, syncer::SyncChange::ACTION_UPDATE,
       SupervisedUserSharedSettingsService::CreateSyncDataForSetting(
-          "abcdef",
-          "name",
-          base::StringValue("Barney Gumble"),
-          true)));
+          "abcdef", "name", base::Value("Barney Gumble"), true)));
   syncer::SyncError error = service_.ProcessSyncChanges(FROM_HERE, changes);
   EXPECT_FALSE(error.IsSet()) << error.ToString();
   ASSERT_TRUE(result_);
@@ -74,7 +69,7 @@
   {
     SupervisedUserSharedSettingsUpdate update(
         &service_, "abcdef", "name",
-        std::unique_ptr<base::Value>(new base::StringValue("Hans Moleman")),
+        std::unique_ptr<base::Value>(new base::Value("Hans Moleman")),
         base::Bind(&SupervisedUserSharedSettingsUpdateTest::OnSettingUpdated,
                    base::Unretained(this)));
     ASSERT_FALSE(result_);

diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc
index 2f7f904..0f67367 100644
--- a/chrome/browser/supervised_user/supervised_user_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_service.cc

@@ -1180,7 +1180,7 @@
     std::string key = SupervisedUserSettingsService::MakeSplitSettingKey(
         supervised_users::kApprovedExtensions, id);
     std::unique_ptr<base::Value> version_value(
-        new base::StringValue(version.GetString()));
+        new base::Value(version.GetString()));
     GetSettingsService()->UpdateSetting(key, std::move(version_value));
   }
   // Upon extension update, the approved version may (or may not) match the

diff --git a/chrome/browser/supervised_user/supervised_user_service_browsertest.cc b/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
index a1b4e31..1b7ac01 100644
--- a/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
+++ b/chrome/browser/supervised_user/supervised_user_service_browsertest.cc

@@ -131,7 +131,7 @@
   std::string name = "Supervised User Test Name";
   settings->SetLocalSetting(
       supervised_users::kUserName,
-      std::unique_ptr<base::Value>(new base::StringValue(name)));
+      std::unique_ptr<base::Value>(new base::Value(name)));
   EXPECT_FALSE(prefs->IsUserModifiablePreference(prefs::kProfileName));
   EXPECT_EQ(name, prefs->GetString(prefs::kProfileName));
 
@@ -145,7 +145,7 @@
   std::string new_name = "New Supervised User Test Name";
   settings->SetLocalSetting(
       supervised_users::kUserName,
-      std::unique_ptr<base::Value>(new base::StringValue(new_name)));
+      std::unique_ptr<base::Value>(new base::Value(new_name)));
   EXPECT_EQ(new_name, prefs->GetString(prefs::kProfileName));
   EXPECT_EQ(new_name, base::UTF16ToUTF8(entry->GetName()));
 

diff --git a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
index dc790a7f3..483e1a61 100644
--- a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc

@@ -85,14 +85,13 @@
     split_items_.SetStringWithoutPathExpansion(key, value);
     settings_service_.UploadItem(
         SupervisedUserSettingsService::MakeSplitSettingKey(kSplitItemName, key),
-        std::unique_ptr<base::Value>(new base::StringValue(value)));
+        std::unique_ptr<base::Value>(new base::Value(value)));
   }
 
   void UploadAtomicItem(const std::string& value) {
-    atomic_setting_value_.reset(new base::StringValue(value));
+    atomic_setting_value_.reset(new base::Value(value));
     settings_service_.UploadItem(
-        kAtomicItemName,
-        std::unique_ptr<base::Value>(new base::StringValue(value)));
+        kAtomicItemName, std::unique_ptr<base::Value>(new base::Value(value)));
   }
 
   void VerifySyncDataItem(syncer::SyncData sync_data) {
@@ -158,7 +157,7 @@
   settings_.reset();
   syncer::SyncData data =
       SupervisedUserSettingsService::CreateSyncDataForSetting(
-          kSettingsName, base::StringValue(kSettingsValue));
+          kSettingsName, base::Value(kSettingsValue));
   syncer::SyncChangeList change_list;
   change_list.push_back(
       syncer::SyncChange(FROM_HERE, syncer::SyncChange::ACTION_ADD, data));
@@ -222,7 +221,7 @@
     syncer::SyncDataList sync_data;
     // Adding 1 Atomic entry.
     sync_data.push_back(SupervisedUserSettingsService::CreateSyncDataForSetting(
-        kSettingsName, base::StringValue(kSettingsValue)));
+        kSettingsName, base::Value(kSettingsValue)));
     // Adding 2 SplitSettings from dictionary.
     base::DictionaryValue dict;
     dict.SetString("foo", "bar");
@@ -281,7 +280,7 @@
   settings_.reset();
   settings_service_.SetLocalSetting(
       kSettingsName,
-      std::unique_ptr<base::Value>(new base::StringValue(kSettingsValue)));
+      std::unique_ptr<base::Value>(new base::Value(kSettingsValue)));
   ASSERT_TRUE(settings_);
   ASSERT_TRUE(settings_->GetWithoutPathExpansion(kSettingsName, &value));
   std::string string_value;

diff --git a/chrome/browser/task_profiler/task_profiler_data_serializer.cc b/chrome/browser/task_profiler/task_profiler_data_serializer.cc
index 6f4b52e..ffc07fc 100644
--- a/chrome/browser/task_profiler/task_profiler_data_serializer.cc
+++ b/chrome/browser/task_profiler/task_profiler_data_serializer.cc

@@ -52,7 +52,7 @@
   dictionary->Set(prefix + "_location", location_value.release());
 
   dictionary->Set(prefix + "_thread",
-                  new base::StringValue(birth.sanitized_thread_name));
+                  new base::Value(birth.sanitized_thread_name));
 }
 
 // Re-serializes the |death_data| into |dictionary|.

diff --git a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
index d21cfebd5..968f669 100644
--- a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
+++ b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc

@@ -271,10 +271,8 @@
   // Creates a corrupted ordinal case.
   extensions::ExtensionScopedPrefs* scoped_prefs =
       extensions::ExtensionPrefs::Get(profile_.get());
-  scoped_prefs->UpdateExtensionPref(
-      kHostedAppId,
-      "page_ordinal",
-      new base::StringValue("a corrupted ordinal"));
+  scoped_prefs->UpdateExtensionPref(kHostedAppId, "page_ordinal",
+                                    new base::Value("a corrupted ordinal"));
 
   // This should not assert or crash.
   CreateBuilder();

diff --git a/chrome/browser/ui/app_list/start_page_service.cc b/chrome/browser/ui/app_list/start_page_service.cc
index f75493a..db48a06 100644
--- a/chrome/browser/ui/app_list/start_page_service.cc
+++ b/chrome/browser/ui/app_list/start_page_service.cc

@@ -676,8 +676,7 @@
     if (contents_ && contents_->GetWebUI()) {
       contents_->GetWebUI()->CallJavascriptFunctionUnsafe(
           "appList.startPage.onAppListDoodleUpdated", *doodle_json,
-          base::StringValue(
-              UIThreadSearchTermsData(profile_).GoogleBaseURLValue()));
+          base::Value(UIThreadSearchTermsData(profile_).GoogleBaseURLValue()));
     }
   }
 

diff --git a/chrome/browser/ui/webui/app_launcher_login_handler.cc b/chrome/browser/ui/webui/app_launcher_login_handler.cc
index 25ea3be0..ee7a3f2 100644
--- a/chrome/browser/ui/webui/app_launcher_login_handler.cc
+++ b/chrome/browser/ui/webui/app_launcher_login_handler.cc

@@ -220,9 +220,9 @@
 #endif
   }
 
-  base::StringValue header_value(header);
-  base::StringValue sub_header_value(sub_header);
-  base::StringValue icon_url_value(icon_url);
+  base::Value header_value(header);
+  base::Value sub_header_value(sub_header);
+  base::Value icon_url_value(icon_url);
   base::Value is_user_signed_in(!username.empty());
   web_ui()->CallJavascriptFunctionUnsafe("ntp.updateLogin", header_value,
                                          sub_header_value, icon_url_value,

diff --git a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
index b4d9e47..3617800 100644
--- a/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc
+++ b/chrome/browser/ui/webui/bidi_checker_web_ui_test.cc

@@ -103,8 +103,7 @@
 void WebUIBidiCheckerBrowserTest::RunBidiCheckerOnPage(
     const std::string& page_url, bool is_rtl) {
   ui_test_utils::NavigateToURL(browser(), GURL(page_url));
-  ASSERT_TRUE(RunJavascriptTest("runBidiChecker",
-                                new base::StringValue(page_url),
+  ASSERT_TRUE(RunJavascriptTest("runBidiChecker", new base::Value(page_url),
                                 new base::Value(is_rtl)));
 }
 

diff --git a/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc b/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc
index 87027399..0a7d931 100644
--- a/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc

@@ -76,7 +76,7 @@
 void CryptohomeWebUIHandler::SetCryptohomeProperty(
     const std::string& destination_id,
     const base::Value& value) {
-  base::StringValue destination_id_value(destination_id);
+  base::Value destination_id_value(destination_id);
   web_ui()->CallJavascriptFunctionUnsafe("SetCryptohomeProperty",
                                          destination_id_value, value);
 }

diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
index 6c2ee6e5..37156b8 100644
--- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc

@@ -811,7 +811,7 @@
 
   if (error == drive::FILE_ERROR_OK) {
     DCHECK(entry.get());
-    const base::StringValue value(FormatEntry(path, *entry) + "\n");
+    const base::Value value(FormatEntry(path, *entry) + "\n");
     web_ui()->CallJavascriptFunctionUnsafe("updateFileSystemContents", value);
   }
 }
@@ -846,7 +846,7 @@
     // There may be pending ReadDirectoryByPath() calls, but we can update
     // the page with what we have now. This results in progressive
     // updates, which is good for a large file system.
-    const base::StringValue value(file_system_as_text);
+    const base::Value value(file_system_as_text);
     web_ui()->CallJavascriptFunctionUnsafe("updateFileSystemContents", value);
   }
 }

diff --git a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc
index b356b01c..2b9c755f 100644
--- a/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/emulator/device_emulator_message_handler.cc

@@ -123,8 +123,7 @@
   const std::string& property_name) {
   if (property_name == kPairedPropertyName) {
     owner_->web_ui()->CallJavascriptFunctionUnsafe(
-        kDevicePairedFromTrayJSCallback,
-        base::StringValue(object_path.value()));
+        kDevicePairedFromTrayJSCallback, base::Value(object_path.value()));
   }
 }
 
@@ -132,7 +131,7 @@
     const dbus::ObjectPath& object_path) {
   owner_->web_ui()->CallJavascriptFunctionUnsafe(
       kDeviceRemovedFromMainAdapterJSCallback,
-      base::StringValue(object_path.value()));
+      base::Value(object_path.value()));
 }
 
 class DeviceEmulatorMessageHandler::CrasAudioObserver
@@ -292,7 +291,7 @@
       props->address.value());
   if (!props->paired.value()) {
     web_ui()->CallJavascriptFunctionUnsafe(kPairFailedJSCallback,
-                                           base::StringValue(path));
+                                           base::Value(path));
   }
 }
 

diff --git a/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.cc b/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.cc
index 282c552f..fc01881 100644
--- a/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.cc

@@ -43,7 +43,7 @@
 void FirstRunHandler::ShowStepPositioned(const std::string& name,
                                          const StepPosition& position) {
   web_ui()->CallJavascriptFunctionUnsafe(
-      "cr.FirstRun.showStep", base::StringValue(name), *position.AsValue());
+      "cr.FirstRun.showStep", base::Value(name), *position.AsValue());
 }
 
 void FirstRunHandler::ShowStepPointingTo(const std::string& name,
@@ -55,9 +55,8 @@
   point_with_offset.AppendInteger(x);
   point_with_offset.AppendInteger(y);
   point_with_offset.AppendInteger(offset);
-  web_ui()->CallJavascriptFunctionUnsafe("cr.FirstRun.showStep",
-                                         base::StringValue(name), *null,
-                                         point_with_offset);
+  web_ui()->CallJavascriptFunctionUnsafe(
+      "cr.FirstRun.showStep", base::Value(name), *null, point_with_offset);
 }
 
 void FirstRunHandler::HideCurrentStep() {

diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
index 26c0a3f..d47d282 100644
--- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc

@@ -380,7 +380,7 @@
       chromeos::input_method::InputMethodManager::Get();
   const chromeos::input_method::InputMethodDescriptor& descriptor =
       manager->GetActiveIMEState()->GetCurrentInputMethod();
-  base::StringValue param(descriptor.id());
+  base::Value param(descriptor.id());
   web_ui()->CallJavascriptFunctionUnsafe("initKeyboardOverlayId", param);
 }
 

diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
index 4e74d7f3..480c624 100644
--- a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc

@@ -180,7 +180,7 @@
   bool new_kiosk_ui = EnableNewKioskUI();
   web_ui()->CallJavascriptFunctionUnsafe(
       new_kiosk_ui ? kKioskShowErrorNewAPI : kKioskShowErrorOldAPI,
-      base::StringValue(error_message));
+      base::Value(error_message));
 }
 
 void KioskAppMenuHandler::OnKioskAppsSettingsChanged() {

diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
index 9b6bd696..150cd0c 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc
+++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc

@@ -200,8 +200,8 @@
   std::string icon_str;
   if (!icon_image.isNull())
     icon_str = webui::GetBitmapDataUrl(icon_bitmap);
-  base::StringValue title(text);
-  base::StringValue icon(icon_str);
+  base::Value title(text);
+  base::Value icon(icon_str);
   web_ui_->CallJavascriptFunctionUnsafe("cr.ui.DropDown.updateNetworkTitle",
                                         title, icon);
 }

diff --git a/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.cc
index 1596d5a9..16e83af 100644
--- a/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/user_board_screen_handler.cc

@@ -91,7 +91,7 @@
     proximity_auth::ScreenlockBridge::LockHandler::AuthType auth_type,
     const base::string16& initial_value) {
   CallJS("login.AccountPickerScreen.setAuthType", account_id,
-         static_cast<int>(auth_type), base::StringValue(initial_value));
+         static_cast<int>(auth_type), base::Value(initial_value));
 }
 
 void UserBoardScreenHandler::Bind(UserSelectionScreen* screen) {

diff --git a/chrome/browser/ui/webui/chromeos/set_time_ui.cc b/chrome/browser/ui/webui/chromeos/set_time_ui.cc
index 00cfbff..154c9ed8 100644
--- a/chrome/browser/ui/webui/chromeos/set_time_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/set_time_ui.cc

@@ -65,8 +65,7 @@
 
   // system::TimezoneSettings::Observer:
   void TimezoneChanged(const icu::TimeZone& timezone) override {
-    base::StringValue timezone_id(
-        system::TimezoneSettings::GetTimezoneID(timezone));
+    base::Value timezone_id(system::TimezoneSettings::GetTimezoneID(timezone));
     web_ui()->CallJavascriptFunctionUnsafe("settime.TimeSetter.setTimezone",
                                            timezone_id);
   }

diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc
index 175dd11..e2d64ce 100644
--- a/chrome/browser/ui/webui/crashes_ui.cc
+++ b/chrome/browser/ui/webui/crashes_ui.cc

@@ -191,9 +191,9 @@
   base::Value enabled(crash_reporting_enabled);
   base::Value dynamic_backend(system_crash_reporter);
   base::Value manual_uploads(support_manual_uploads);
-  base::StringValue version(version_info::GetVersionNumber());
-  base::StringValue os_string(base::SysInfo::OperatingSystemName() + " " +
-                              base::SysInfo::OperatingSystemVersion());
+  base::Value version(version_info::GetVersionNumber());
+  base::Value os_string(base::SysInfo::OperatingSystemName() + " " +
+                        base::SysInfo::OperatingSystemVersion());
 
   std::vector<const base::Value*> args;
   args.push_back(&enabled);

diff --git a/chrome/browser/ui/webui/device_log_ui.cc b/chrome/browser/ui/webui/device_log_ui.cc
index 915f932..aead8776 100644
--- a/chrome/browser/ui/webui/device_log_ui.cc
+++ b/chrome/browser/ui/webui/device_log_ui.cc

@@ -38,7 +38,7 @@
 
  private:
   void GetLog(const base::ListValue* value) const {
-    base::StringValue data(device_event_log::GetAsString(
+    base::Value data(device_event_log::GetAsString(
         device_event_log::NEWEST_FIRST, "json", "",
         device_event_log::LOG_LEVEL_DEBUG, 0));
     web_ui()->CallJavascriptFunctionUnsafe("DeviceLogUI.getLogCallback", data);

diff --git a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc
index c7fc87d3..95d9805 100644
--- a/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc
+++ b/chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc

@@ -369,7 +369,7 @@
 }
 
 void KioskAppsHandler::ShowError(const std::string& app_id) {
-  base::StringValue app_id_value(app_id);
+  base::Value app_id_value(app_id);
   web_ui()->CallJavascriptFunctionUnsafe(
       "extensions.KioskAppsOverlay.showError", app_id_value);
 

diff --git a/chrome/browser/ui/webui/extensions/extension_loader_handler.cc b/chrome/browser/ui/webui/extensions/extension_loader_handler.cc
index 88c7485..e2e40ce 100644
--- a/chrome/browser/ui/webui/extensions/extension_loader_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_loader_handler.cc

@@ -197,9 +197,8 @@
   highlighter.SetHighlightedRegions(manifest_value.get());
 
   std::unique_ptr<base::DictionaryValue> failure(new base::DictionaryValue());
-  failure->Set("path",
-               new base::StringValue(prettified_path.LossyDisplayName()));
-  failure->Set("error", new base::StringValue(base::UTF8ToUTF16(error)));
+  failure->Set("path", new base::Value(prettified_path.LossyDisplayName()));
+  failure->Set("error", new base::Value(base::UTF8ToUTF16(error)));
   failure->Set("manifest", manifest_value.release());
   failures_.Append(std::move(failure));
 

diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc
index de91108..7b697b3 100644
--- a/chrome/browser/ui/webui/help/help_handler.cc
+++ b/chrome/browser/ui/webui/help/help_handler.cc

@@ -483,7 +483,7 @@
   base::Time build_time = base::SysInfo::GetLsbReleaseTime();
   base::string16 build_date = base::TimeFormatFriendlyDate(build_time);
   web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setBuildDate",
-                                         base::StringValue(build_date));
+                                         base::Value(build_date));
 #endif  // defined(OS_CHROMEOS)
 
   RefreshUpdateStatus();
@@ -637,8 +637,8 @@
   }
 
   web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setUpdateStatus",
-                                         base::StringValue(status_str),
-                                         base::StringValue(message));
+                                         base::Value(status_str),
+                                         base::Value(message));
 
   if (status == VersionUpdater::UPDATING) {
     web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setProgress",
@@ -652,7 +652,7 @@
     if (!types_msg.empty()) {
       web_ui()->CallJavascriptFunctionUnsafe(
           "help.HelpPage.setAndShowAllowedConnectionTypesMsg",
-          base::StringValue(types_msg));
+          base::Value(types_msg));
     } else {
       web_ui()->CallJavascriptFunctionUnsafe(
           "help.HelpPage.showAllowedConnectionTypesMsg", base::Value(false));
@@ -681,34 +681,34 @@
   }
 
   web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setPromotionState",
-                                         base::StringValue(state_str));
+                                         base::Value(state_str));
 }
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_CHROMEOS)
 void HelpHandler::OnOSVersion(const std::string& version) {
   web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setOSVersion",
-                                         base::StringValue(version));
+                                         base::Value(version));
 }
 
 void HelpHandler::OnARCVersion(const std::string& firmware) {
   web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setARCVersion",
-                                         base::StringValue(firmware));
+                                         base::Value(firmware));
 }
 
 void HelpHandler::OnOSFirmware(const std::string& firmware) {
   web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setOSFirmware",
-                                         base::StringValue(firmware));
+                                         base::Value(firmware));
 }
 
 void HelpHandler::OnCurrentChannel(const std::string& channel) {
   web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.updateCurrentChannel",
-                                         base::StringValue(channel));
+                                         base::Value(channel));
 }
 
 void HelpHandler::OnTargetChannel(const std::string& channel) {
   web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.updateTargetChannel",
-                                         base::StringValue(channel));
+                                         base::Value(channel));
 }
 
 void HelpHandler::OnRegulatoryLabelDirFound(const base::FilePath& path) {
@@ -730,14 +730,14 @@
   std::string url = std::string("chrome://") + chrome::kChromeOSAssetHost +
       "/" + path.MaybeAsASCII();
   web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.setRegulatoryLabelPath",
-                                         base::StringValue(url));
+                                         base::Value(url));
 }
 
 void HelpHandler::OnRegulatoryLabelTextRead(const std::string& text) {
   // Remove unnecessary whitespace.
   web_ui()->CallJavascriptFunctionUnsafe(
       "help.HelpPage.setRegulatoryLabelText",
-      base::StringValue(base::CollapseWhitespaceASCII(text, true)));
+      base::Value(base::CollapseWhitespaceASCII(text, true)));
 }
 
 void HelpHandler::OnEolStatus(update_engine::EndOfLifeStatus status) {
@@ -748,13 +748,13 @@
   }
 
   if (status == update_engine::EndOfLifeStatus::kSupported) {
-    web_ui()->CallJavascriptFunctionUnsafe(
-        "help.HelpPage.updateEolMessage", base::StringValue("device_supported"),
-        base::StringValue(""));
+    web_ui()->CallJavascriptFunctionUnsafe("help.HelpPage.updateEolMessage",
+                                           base::Value("device_supported"),
+                                           base::Value(""));
   } else {
     web_ui()->CallJavascriptFunctionUnsafe(
-        "help.HelpPage.updateEolMessage", base::StringValue("device_endoflife"),
-        base::StringValue(l10n_util::GetStringUTF16(IDS_ABOUT_PAGE_EOL_EOL)));
+        "help.HelpPage.updateEolMessage", base::Value("device_endoflife"),
+        base::Value(l10n_util::GetStringUTF16(IDS_ABOUT_PAGE_EOL_EOL)));
   }
 }
 

diff --git a/chrome/browser/ui/webui/inspect_ui.cc b/chrome/browser/ui/webui/inspect_ui.cc
index fdebd22..287e230d 100644
--- a/chrome/browser/ui/webui/inspect_ui.cc
+++ b/chrome/browser/ui/webui/inspect_ui.cc

@@ -607,8 +607,8 @@
 
 void InspectUI::PopulateTargets(const std::string& source,
                                 const base::ListValue& targets) {
-  web_ui()->CallJavascriptFunctionUnsafe("populateTargets",
-                                         base::StringValue(source), targets);
+  web_ui()->CallJavascriptFunctionUnsafe("populateTargets", base::Value(source),
+                                         targets);
 }
 
 void InspectUI::PopulateAdditionalTargets(const base::ListValue& targets) {

diff --git a/chrome/browser/ui/webui/inspect_ui_browsertest.cc b/chrome/browser/ui/webui/inspect_ui_browsertest.cc
index e0c14b5..2d9d4064 100644
--- a/chrome/browser/ui/webui/inspect_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/inspect_ui_browsertest.cc

@@ -39,10 +39,9 @@
 IN_PROC_BROWSER_TEST_F(InspectUITest, InspectUIPage) {
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIInspectURL));
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
-      "testTargetListed",
-      new base::StringValue("#pages"),
-      new base::StringValue("populateWebContentsTargets"),
-      new base::StringValue(chrome::kChromeUIInspectURL)));
+      "testTargetListed", new base::Value("#pages"),
+      new base::Value("populateWebContentsTargets"),
+      new base::Value(chrome::kChromeUIInspectURL)));
 }
 
 IN_PROC_BROWSER_TEST_F(InspectUITest, SharedWorker) {
@@ -56,16 +55,14 @@
       ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
-      "testTargetListed",
-      new base::StringValue("#workers"),
-      new base::StringValue("populateWorkerTargets"),
-      new base::StringValue(kSharedWorkerJs)));
+      "testTargetListed", new base::Value("#workers"),
+      new base::Value("populateWorkerTargets"),
+      new base::Value(kSharedWorkerJs)));
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
-      "testTargetListed",
-      new base::StringValue("#pages"),
-      new base::StringValue("populateWebContentsTargets"),
-      new base::StringValue(kSharedWorkerTestPage)));
+      "testTargetListed", new base::Value("#pages"),
+      new base::Value("populateWebContentsTargets"),
+      new base::Value(kSharedWorkerTestPage)));
 }
 
 // Flaky due to failure to bind a hardcoded port. crbug.com/566057

diff --git a/chrome/browser/ui/webui/instant_ui.cc b/chrome/browser/ui/webui/instant_ui.cc
index f5dbf44..9466b86f 100644
--- a/chrome/browser/ui/webui/instant_ui.cc
+++ b/chrome/browser/ui/webui/instant_ui.cc

@@ -103,10 +103,10 @@
   std::string pref_name;
   if (!args->GetString(0, &pref_name)) return;
 
-  base::StringValue pref_name_value(pref_name);
+  base::Value pref_name_value(pref_name);
   if (pref_name == prefs::kInstantUIZeroSuggestUrlPrefix) {
     PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
-    base::StringValue arg(prefs->GetString(pref_name.c_str()));
+    base::Value arg(prefs->GetString(pref_name.c_str()));
     web_ui()->CallJavascriptFunctionUnsafe(
         "instantConfig.getPreferenceValueResult", pref_name_value, arg);
   }

diff --git a/chrome/browser/ui/webui/invalidations_message_handler.cc b/chrome/browser/ui/webui/invalidations_message_handler.cc
index e6cf9d9..7415064 100644
--- a/chrome/browser/ui/webui/invalidations_message_handler.cc
+++ b/chrome/browser/ui/webui/invalidations_message_handler.cc

@@ -89,7 +89,7 @@
     const base::Time& last_changed_timestamp) {
   std::string state(syncer::InvalidatorStateToString(new_state));
   web_ui()->CallJavascriptFunctionUnsafe(
-      "chrome.invalidations.updateInvalidatorState", base::StringValue(state),
+      "chrome.invalidations.updateInvalidatorState", base::Value(state),
       base::Value(last_changed_timestamp.ToJsTime()));
 }
 
@@ -107,7 +107,7 @@
     list_of_objects.Append(std::move(dic));
   }
   web_ui()->CallJavascriptFunctionUnsafe("chrome.invalidations.updateIds",
-                                         base::StringValue(handler_name),
+                                         base::Value(handler_name),
                                          list_of_objects);
 }
 void InvalidationsMessageHandler::OnDebugMessage(

diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
index 5ec61e34..f55ba74f 100644
--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

@@ -350,7 +350,7 @@
 
   base::DictionaryValue info;
 
-  base::StringValue service_key(kKeyPrefixMDns + name);
+  base::Value service_key(kKeyPrefixMDns + name);
 
   if (description.id.empty()) {
     info.SetString(kDictionaryKeyServiceName, name);
@@ -372,7 +372,7 @@
 void LocalDiscoveryUIHandler::DeviceRemoved(const std::string& name) {
   device_descriptions_.erase(name);
   std::unique_ptr<base::Value> null_value = base::Value::CreateNullValue();
-  base::StringValue name_value(kKeyPrefixMDns + name);
+  base::Value name_value(kKeyPrefixMDns + name);
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "local_discovery.onUnregisteredDeviceUpdate", name_value, *null_value);
@@ -600,7 +600,7 @@
         l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT),
         base::UTF8ToUTF16(email));
   }
-  base::StringValue label(label_str);
+  base::Value label(label_str);
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "local_discovery.setupCloudPrintConnectorSection", disabled, label,

diff --git a/chrome/browser/ui/webui/local_state/local_state_ui.cc b/chrome/browser/ui/webui/local_state/local_state_ui.cc
index 42a27aa..0ebad38 100644
--- a/chrome/browser/ui/webui/local_state/local_state_ui.cc
+++ b/chrome/browser/ui/webui/local_state/local_state_ui.cc

@@ -76,7 +76,7 @@
     json = "Error loading Local State file.";
 
   web_ui()->CallJavascriptFunctionUnsafe("localState.setLocalState",
-                                         base::StringValue(json));
+                                         base::Value(json));
 }
 
 // Returns true if |pref_name| starts with one of the |valid_prefixes|.

diff --git a/chrome/browser/ui/webui/local_state/local_state_ui_unittest.cc b/chrome/browser/ui/webui/local_state/local_state_ui_unittest.cc
index 2fc8de3..4d179340 100644
--- a/chrome/browser/ui/webui/local_state/local_state_ui_unittest.cc
+++ b/chrome/browser/ui/webui/local_state/local_state_ui_unittest.cc

@@ -19,7 +19,7 @@
 
   base::DictionaryValue prefs;
   for (const std::string& key : all_pref_keys) {
-    prefs.Set(key, new base::StringValue(key + "_value"));
+    prefs.Set(key, new base::Value(key + "_value"));
   }
 
   internal::FilterPrefs(prefixes, &prefs);

diff --git a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc
index 4ce45f6..5a3355f 100644
--- a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc
+++ b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc

@@ -202,7 +202,7 @@
     upload_list.Append(std::move(upload));
   }
 
-  base::StringValue version(version_info::GetVersionNumber());
+  base::Value version(version_info::GetVersionNumber());
 
   web_ui()->CallJavascriptFunctionUnsafe("updateWebRtcLogsList", upload_list,
                                          version);

diff --git a/chrome/browser/ui/webui/media_router/media_router_ui.cc b/chrome/browser/ui/webui/media_router/media_router_ui.cc
index 8e8e9740..705823e7 100644
--- a/chrome/browser/ui/webui/media_router/media_router_ui.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_ui.cc

@@ -533,7 +533,7 @@
   const base::ListValue* origins =
       Profile::FromWebUI(web_ui())->GetPrefs()->GetList(
           prefs::kMediaRouterTabMirroringSources);
-  return origins->Find(base::StringValue(GetSerializedInitiatorOrigin())) !=
+  return origins->Find(base::Value(GetSerializedInitiatorOrigin())) !=
          origins->end();
 }
 
@@ -543,12 +543,11 @@
 
   switch (cast_mode) {
     case MediaCastMode::DEFAULT:
-      update->Remove(base::StringValue(GetSerializedInitiatorOrigin()),
-                     nullptr);
+      update->Remove(base::Value(GetSerializedInitiatorOrigin()), nullptr);
       break;
     case MediaCastMode::TAB_MIRROR:
       update->AppendIfNotPresent(
-          base::MakeUnique<base::StringValue>(GetSerializedInitiatorOrigin()));
+          base::MakeUnique<base::Value>(GetSerializedInitiatorOrigin()));
       break;
     case MediaCastMode::DESKTOP_MIRROR:
       // Desktop mirroring isn't domain-specific, so we don't record the

diff --git a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc
index 7d398e7..5c223c57 100644
--- a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc

@@ -282,12 +282,12 @@
     std::unique_ptr<base::DictionaryValue> route_value(RouteToValue(
         *route, false, media_router_ui_->GetRouteProviderExtensionId(),
         incognito_, current_cast_mode));
-    web_ui()->CallJavascriptFunctionUnsafe(
-        kOnCreateRouteResponseReceived, base::StringValue(sink_id),
-        *route_value, base::Value(route->for_display()));
+    web_ui()->CallJavascriptFunctionUnsafe(kOnCreateRouteResponseReceived,
+                                           base::Value(sink_id), *route_value,
+                                           base::Value(route->for_display()));
   } else {
     web_ui()->CallJavascriptFunctionUnsafe(
-        kOnCreateRouteResponseReceived, base::StringValue(sink_id),
+        kOnCreateRouteResponseReceived, base::Value(sink_id),
         *base::Value::CreateNullValue(), base::Value(false));
   }
 }
@@ -296,7 +296,7 @@
     const std::string& sink_id) {
   DVLOG(2) << "ReturnSearchResult";
   web_ui()->CallJavascriptFunctionUnsafe(kReceiveSearchResult,
-                                         base::StringValue(sink_id));
+                                         base::Value(sink_id));
 }
 
 void MediaRouterWebUIMessageHandler::UpdateIssue(const Issue& issue) {

diff --git a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc
index 626961b4..5d53704 100644
--- a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler_unittest.cc

@@ -457,7 +457,7 @@
   EXPECT_EQ("media_router.ui.onCreateRouteResponseReceived",
             call_data.function_name());
   const base::Value* arg1 = call_data.arg1();
-  const base::StringValue* sink_id_value = nullptr;
+  const base::Value* sink_id_value = nullptr;
   ASSERT_TRUE(arg1->GetAsString(&sink_id_value));
   EXPECT_EQ(sink_id, sink_id_value->GetString());
 
@@ -512,7 +512,7 @@
   EXPECT_EQ("media_router.ui.onCreateRouteResponseReceived",
             call_data.function_name());
   const base::Value* arg1 = call_data.arg1();
-  const base::StringValue* sink_id_value = nullptr;
+  const base::Value* sink_id_value = nullptr;
   ASSERT_TRUE(arg1->GetAsString(&sink_id_value));
   EXPECT_EQ(sink_id, sink_id_value->GetString());
 

diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index 268d526..21441c4d 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc

@@ -89,7 +89,7 @@
 #include "components/user_manager/user.h"
 #endif
 
-using base::StringValue;
+using base::Value;
 using content::BrowserThread;
 using content::WebContents;
 using content::WebUIMessageHandler;
@@ -484,7 +484,7 @@
 void NetInternalsMessageHandler::SendJavascriptCommand(
     const std::string& command,
     std::unique_ptr<base::Value> arg) {
-  std::unique_ptr<base::Value> command_value(new base::StringValue(command));
+  std::unique_ptr<base::Value> command_value(new base::Value(command));
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (arg) {
     web_ui()->CallJavascriptFunctionUnsafe("g_browser.receive",
@@ -845,7 +845,7 @@
   if (!user) {
     std::string error = "User not found.";
     SendJavascriptCommand("receivedONCFileParse",
-                          base::MakeUnique<base::StringValue>(error));
+                          base::MakeUnique<base::Value>(error));
     return;
   }
 
@@ -887,7 +887,7 @@
     error += "Some certificates couldn't be imported. ";
 
   SendJavascriptCommand("receivedONCFileParse",
-                        base::MakeUnique<base::StringValue>(error));
+                        base::MakeUnique<base::Value>(error));
 }
 
 void NetInternalsMessageHandler::OnImportONCFile(
@@ -909,9 +909,8 @@
 void NetInternalsMessageHandler::OnStoreDebugLogs(const base::ListValue* list) {
   DCHECK(list);
 
-  SendJavascriptCommand(
-      "receivedStoreDebugLogs",
-      base::MakeUnique<base::StringValue>("Creating log file..."));
+  SendJavascriptCommand("receivedStoreDebugLogs",
+                        base::MakeUnique<base::Value>("Creating log file..."));
   Profile* profile = Profile::FromWebUI(web_ui());
   const DownloadPrefs* const prefs = DownloadPrefs::FromBrowserContext(profile);
   base::FilePath path = prefs->DownloadPath();
@@ -932,7 +931,7 @@
   else
     status = "Failed to create log file";
   SendJavascriptCommand("receivedStoreDebugLogs",
-                        base::MakeUnique<base::StringValue>(status));
+                        base::MakeUnique<base::Value>(status));
 }
 
 void NetInternalsMessageHandler::OnSetNetworkDebugMode(
@@ -956,7 +955,7 @@
                                  : "Failed to change debug mode to ";
   status += subsystem;
   SendJavascriptCommand("receivedSetNetworkDebugMode",
-                        base::MakeUnique<base::StringValue>(status));
+                        base::MakeUnique<base::Value>(status));
 }
 #endif  // defined(OS_CHROMEOS)
 

diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
index c5853e0..4ca4af2b 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc

@@ -200,7 +200,7 @@
   std::string path;
   ASSERT_TRUE(list_value->GetString(0, &path));
   GURL url = net_internals_test_->embedded_test_server()->GetURL(path);
-  std::unique_ptr<base::Value> url_value(new base::StringValue(url.spec()));
+  std::unique_ptr<base::Value> url_value(new base::Value(url.spec()));
   RunJavascriptCallback(url_value.get());
 }
 
@@ -261,7 +261,7 @@
   incognito_browser_ = net_internals_test_->CreateIncognitoBrowser();
 
   // Tell the test harness that creation is complete.
-  base::StringValue command_value("onIncognitoBrowserCreatedForTest");
+  base::Value command_value("onIncognitoBrowserCreatedForTest");
   web_ui()->CallJavascriptFunctionUnsafe("g_browser.receive", command_value);
 }
 
@@ -305,7 +305,7 @@
   ASSERT_GT(log_contents.length(), 0u);
 
   std::unique_ptr<base::Value> log_contents_value(
-      new base::StringValue(log_contents));
+      new base::Value(log_contents));
   RunJavascriptCallback(log_contents_value.get());
 }
 

diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
index fae9d149..488ace9 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc

@@ -379,8 +379,8 @@
   if (!app_page_names || !app_page_names->GetSize()) {
     ListPrefUpdate update(prefs, prefs::kNtpAppPageNames);
     base::ListValue* list = update.Get();
-    list->Set(0, new base::StringValue(
-        l10n_util::GetStringUTF16(IDS_APP_DEFAULT_PAGE_NAME)));
+    list->Set(0, new base::Value(
+                     l10n_util::GetStringUTF16(IDS_APP_DEFAULT_PAGE_NAME)));
     dictionary->Set("appPageNames",
                     static_cast<base::ListValue*>(list->DeepCopy()));
   } else {
@@ -691,7 +691,7 @@
   PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
   ListPrefUpdate update(prefs, prefs::kNtpAppPageNames);
   base::ListValue* list = update.Get();
-  list->Set(static_cast<size_t>(page_index), new base::StringValue(name));
+  list->Set(static_cast<size_t>(page_index), new base::Value(name));
 }
 
 void AppLauncherHandler::HandleGenerateAppForLink(const base::ListValue* args) {
@@ -781,7 +781,7 @@
   if (highlight_app_id_.empty())
     return;
 
-  base::StringValue app_id(highlight_app_id_);
+  base::Value app_id(highlight_app_id_);
   web_ui()->CallJavascriptFunctionUnsafe("ntp.setAppToBeHighlighted", app_id);
   highlight_app_id_.clear();
 }
@@ -829,7 +829,7 @@
   // If we don't launch the app asynchronously, then the app's disabled
   // icon disappears but isn't replaced by the enabled icon, making a poor
   // visual experience.
-  base::StringValue app_id(extension_id_prompting_);
+  base::Value app_id(extension_id_prompting_);
   web_ui()->CallJavascriptFunctionUnsafe("ntp.launchAppAfterEnable", app_id);
 
   extension_enable_flow_.reset();

diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
index c5db07c..aa82c605 100644
--- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc
+++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc

@@ -89,9 +89,10 @@
 NewTabUI::~NewTabUI() {}
 
 void NewTabUI::OnShowBookmarkBarChanged() {
-  base::StringValue attached(
-      GetProfile()->GetPrefs()->GetBoolean(bookmarks::prefs::kShowBookmarkBar) ?
-          "true" : "false");
+  base::Value attached(
+      GetProfile()->GetPrefs()->GetBoolean(bookmarks::prefs::kShowBookmarkBar)
+          ? "true"
+          : "false");
   web_ui()->CallJavascriptFunctionUnsafe("ntp.setBookmarkBarAttached",
                                          attached);
 }

diff --git a/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.cc b/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.cc
index f114a17..77de128 100644
--- a/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.cc
+++ b/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.cc

@@ -115,17 +115,16 @@
 void OfflineInternalsUIMessageHandler::HandleDeletedPagesCallback(
     std::string callback_id,
     offline_pages::DeletePageResult result) {
-  ResolveJavascriptCallback(
-      base::StringValue(callback_id),
-      base::StringValue(GetStringFromDeletePageResult(result)));
+  ResolveJavascriptCallback(base::Value(callback_id),
+                            base::Value(GetStringFromDeletePageResult(result)));
 }
 
 void OfflineInternalsUIMessageHandler::HandleDeletedRequestsCallback(
     std::string callback_id,
     const offline_pages::MultipleItemStatuses& results) {
   ResolveJavascriptCallback(
-      base::StringValue(callback_id),
-      base::StringValue(GetStringFromDeleteRequestResults(results)));
+      base::Value(callback_id),
+      base::Value(GetStringFromDeleteRequestResults(results)));
 }
 
 void OfflineInternalsUIMessageHandler::HandleStoredPagesCallback(
@@ -146,7 +145,7 @@
     offline_page->SetInteger("accessCount", page.access_count);
     offline_page->SetString("originalUrl", page.original_url.spec());
   }
-  ResolveJavascriptCallback(base::StringValue(callback_id), results);
+  ResolveJavascriptCallback(base::Value(callback_id), results);
 }
 
 void OfflineInternalsUIMessageHandler::HandleRequestQueueCallback(
@@ -171,7 +170,7 @@
                                    request->original_url().spec());
     }
   }
-  ResolveJavascriptCallback(base::StringValue(callback_id), save_page_requests);
+  ResolveJavascriptCallback(base::Value(callback_id), save_page_requests);
 }
 
 void OfflineInternalsUIMessageHandler::HandleGetRequestQueue(
@@ -186,7 +185,7 @@
         weak_ptr_factory_.GetWeakPtr(), callback_id));
   } else {
     base::ListValue results;
-    ResolveJavascriptCallback(base::StringValue(callback_id), results);
+    ResolveJavascriptCallback(base::Value(callback_id), results);
   }
 }
 
@@ -202,7 +201,7 @@
                    weak_ptr_factory_.GetWeakPtr(), callback_id));
   } else {
     base::ListValue results;
-    ResolveJavascriptCallback(base::StringValue(callback_id), results);
+    ResolveJavascriptCallback(base::Value(callback_id), results);
   }
 }
 
@@ -221,8 +220,8 @@
 
   ResolveJavascriptCallback(
       *callback_id,
-      base::StringValue(net::NetworkChangeNotifier::IsOffline() ? "Offline"
-                                                                : "Online"));
+      base::Value(net::NetworkChangeNotifier::IsOffline() ? "Offline"
+                                                          : "Online"));
 }
 
 void OfflineInternalsUIMessageHandler::HandleSetRecordRequestQueue(

diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index c711347..bc01b90 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -1312,9 +1312,8 @@
 }
 
 void BrowserOptionsHandler::SetDefaultBrowserUIString(int status_string_id) {
-  base::StringValue status_string(
-      l10n_util::GetStringFUTF16(status_string_id,
-                                 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+  base::Value status_string(l10n_util::GetStringFUTF16(
+      status_string_id, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
 
   base::Value is_default(status_string_id ==
                          IDS_OPTIONS_DEFAULTBROWSER_DEFAULT);
@@ -1559,7 +1558,7 @@
   if (!email.empty()) {
     web_ui()->CallJavascriptFunctionUnsafe(
         "BrowserOptions.updateAccountPicture");
-    base::StringValue email_value(email);
+    base::Value email_value(email);
     web_ui()->CallJavascriptFunctionUnsafe(
         "BrowserOptions.updateAccountPicture", email_value);
     web_ui()->CallJavascriptFunctionUnsafe(
@@ -1827,7 +1826,7 @@
   bool visible = logging_enabled && success;
   web_ui()->CallJavascriptFunctionUnsafe(
       "BrowserOptions.setAudioHistorySectionVisible", base::Value(visible),
-      base::StringValue(audio_history_state));
+      base::Value(audio_history_state));
 }
 
 void BrowserOptionsHandler::HandleRequestGoogleNowAvailable(
@@ -1934,10 +1933,10 @@
     } else {
       base::string16 hotword_help_url =
           base::ASCIIToUTF16(chrome::kHotwordLearnMoreURL);
-      base::StringValue error_message(l10n_util::GetStringUTF16(error));
+      base::Value error_message(l10n_util::GetStringUTF16(error));
       if (error == IDS_HOTWORD_GENERIC_ERROR_MESSAGE) {
-        error_message = base::StringValue(
-            l10n_util::GetStringFUTF16(error, hotword_help_url));
+        error_message =
+            base::Value(l10n_util::GetStringFUTF16(error, hotword_help_url));
       }
       web_ui()->CallJavascriptFunctionUnsafe(function_name, error_message);
     }

diff --git a/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc b/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc
index 3d1545b..ed0ae53 100644
--- a/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc
+++ b/chrome/browser/ui/webui/options/certificate_manager_browsertest.cc

@@ -53,7 +53,7 @@
     policy.Set(policy::key::kOpenNetworkConfiguration,
                policy::POLICY_LEVEL_MANDATORY, policy::POLICY_SCOPE_USER,
                policy::POLICY_SOURCE_CLOUD,
-               base::MakeUnique<base::StringValue>(user_policy_blob), nullptr);
+               base::MakeUnique<base::Value>(user_policy_blob), nullptr);
     provider_.UpdateChromePolicy(policy);
     content::RunAllPendingInMessageLoop();
   }

diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
index 799151c..eda33f4 100644
--- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc

@@ -1011,7 +1011,7 @@
 
   // TODO(mattm): check here if root_cert is not a CA cert and show error.
 
-  base::StringValue cert_name(root_cert->subject().GetDisplayName());
+  base::Value cert_name(root_cert->subject().GetDisplayName());
   web_ui()->CallJavascriptFunctionUnsafe(
       "CertificateEditCaTrustOverlay.showImport", cert_name);
 }
@@ -1191,10 +1191,10 @@
 
 void CertificateManagerHandler::ShowError(const std::string& title,
                                           const std::string& error) const {
-  auto title_value = base::MakeUnique<base::StringValue>(title);
-  auto error_value = base::MakeUnique<base::StringValue>(error);
+  auto title_value = base::MakeUnique<base::Value>(title);
+  auto error_value = base::MakeUnique<base::Value>(error);
   auto ok_title_value =
-      base::MakeUnique<base::StringValue>(l10n_util::GetStringUTF8(IDS_OK));
+      base::MakeUnique<base::Value>(l10n_util::GetStringUTF8(IDS_OK));
   auto cancel_title_value = base::Value::CreateNullValue();
   auto ok_callback_value = base::Value::CreateNullValue();
   auto cancel_callback_value = base::Value::CreateNullValue();
@@ -1226,8 +1226,8 @@
     cert_error_list.Append(std::move(dict));
   }
 
-  base::StringValue title_value(title);
-  base::StringValue error_value(error);
+  base::Value title_value(title);
+  base::Value error_value(error);
   web_ui()->CallJavascriptFunctionUnsafe("CertificateImportErrorOverlay.show",
                                          title_value, error_value,
                                          cert_error_list);

diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc
index d03da55..34ea81b1 100644
--- a/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc
+++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc

@@ -44,8 +44,7 @@
         stub_settings_provider_(base::MakeUnique<StubCrosSettingsProvider>()),
         stub_settings_provider_ptr_(static_cast<StubCrosSettingsProvider*>(
             stub_settings_provider_.get())) {
-    stub_settings_provider_->Set(kDeviceOwner,
-                                 base::StringValue(kTestUsers[0]));
+    stub_settings_provider_->Set(kDeviceOwner, base::Value(kTestUsers[0]));
     for (size_t i = 0; i < arraysize(kTestUsers); ++i) {
       test_users_.push_back(AccountId::FromUserEmail(kTestUsers[i]));
     }

diff --git a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc
index 6a09c111..dfca5fd 100644
--- a/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/accounts_options_handler.cc

@@ -42,7 +42,7 @@
   if (CrosSettings::Get()->FindEmailInList(kAccountsPrefUsers, username, NULL))
     return false;
   if (service) {
-    base::StringValue username_value(username);
+    base::Value username_value(username);
     service->AppendToList(kAccountsPrefUsers, username_value);
   }
   return true;
@@ -127,7 +127,7 @@
 
   ProfileMetrics::LogProfileDeleteUser(ProfileMetrics::DELETE_PROFILE_SETTINGS);
 
-  base::StringValue canonical_email(gaia::CanonicalizeEmail(email));
+  base::Value canonical_email(gaia::CanonicalizeEmail(email));
   if (OwnerSettingsServiceChromeOS* service =
           OwnerSettingsServiceChromeOS::FromWebUI(web_ui())) {
     service->RemoveFromList(kAccountsPrefUsers, canonical_email);
@@ -168,8 +168,8 @@
   const user_manager::UserList& users =
       user_manager::UserManager::Get()->GetUsers();
   for (const auto* user : users) {
-    new_list->AppendIfNotPresent(base::MakeUnique<base::StringValue>(
-        user->GetAccountId().GetUserEmail()));
+    new_list->AppendIfNotPresent(
+        base::MakeUnique<base::Value>(user->GetAccountId().GetUserEmail()));
   }
 
   if (OwnerSettingsServiceChromeOS* service =

diff --git a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
index 73df723..d1796b1 100644
--- a/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

@@ -285,7 +285,7 @@
       if (previous_image_index_ >=
           default_user_image::kFirstDefaultImageIndex) {
         // User has image from the current set of default images.
-        base::StringValue image_url(
+        base::Value image_url(
             default_user_image::GetDefaultImageUrl(previous_image_index_));
         web_ui()->CallJavascriptFunctionUnsafe(
             "ChangePictureOptions.setSelectedImage", image_url);
@@ -301,7 +301,7 @@
 
 void ChangePictureOptionsHandler::SendProfileImage(const gfx::ImageSkia& image,
                                                    bool should_select) {
-  base::StringValue data_url(webui::GetBitmapDataUrl(*image.bitmap()));
+  base::Value data_url(webui::GetBitmapDataUrl(*image.bitmap()));
   base::Value select(should_select);
   web_ui()->CallJavascriptFunctionUnsafe("ChangePictureOptions.setProfileImage",
                                          data_url, select);
@@ -321,7 +321,7 @@
 
 void ChangePictureOptionsHandler::SendOldImage(const std::string& image_url) {
   previous_image_url_ = image_url;
-  base::StringValue url(image_url);
+  base::Value url(image_url);
   web_ui()->CallJavascriptFunctionUnsafe("ChangePictureOptions.setOldImage",
                                          url);
 }

diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
index 1133bfc..36f99585 100644
--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

@@ -254,7 +254,7 @@
   if (proxy_cros_settings_parser::IsProxyPref(pref_name)) {
     proxy_cros_settings_parser::SetProxyPrefValue(
         network_guid_, pref_name, value, GetUiProxyConfigService());
-    base::StringValue proxy_type(pref_name);
+    base::Value proxy_type(pref_name);
     web_ui()->CallJavascriptFunctionUnsafe(
         "options.internet.DetailsInternetPage.updateProxySettings", proxy_type);
     ProcessUserMetric(value, metric);

diff --git a/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc b/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc
index 8845d65..a4ee792b 100644
--- a/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/pointer_handler.cc

@@ -79,7 +79,7 @@
   } else {
     label = has_mouse_ ? "pointerOverlayTitleMouseOnly" : "";
   }
-  base::StringValue val(label);
+  base::Value val(label);
   web_ui()->CallJavascriptFunctionUnsafe("PointerOverlay.setTitle", val);
 }
 

diff --git a/chrome/browser/ui/webui/options/chromeos/power_handler.cc b/chrome/browser/ui/webui/options/chromeos/power_handler.cc
index 0411e30..8cd2cb2 100644
--- a/chrome/browser/ui/webui/options/chromeos/power_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/power_handler.cc

@@ -87,7 +87,7 @@
 void PowerHandler::OnPowerStatusChanged() {
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.PowerOverlay.setBatteryStatusText",
-      base::StringValue(GetStatusValue()));
+      base::Value(GetStatusValue()));
   UpdatePowerSources();
 }
 
@@ -165,7 +165,7 @@
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.PowerOverlay.setPowerSources", sources_list,
-      base::StringValue(status->GetCurrentPowerSourceID()),
+      base::Value(status->GetCurrentPowerSourceID()),
       base::Value(status->IsUsbChargerConnected()),
       base::Value(status->IsBatteryTimeBeingCalculated()));
 }

diff --git a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc
index 5943771c..7e7b7fa 100644
--- a/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc
+++ b/chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

@@ -102,7 +102,7 @@
             stub_settings_provider_.get())),
         test_owner_account_id_(AccountId::FromUserEmail(kTestOwner)),
         test_non_owner_account_id_(AccountId::FromUserEmail(kTestNonOwner)) {
-    stub_settings_provider_->Set(kDeviceOwner, base::StringValue(kTestOwner));
+    stub_settings_provider_->Set(kDeviceOwner, base::Value(kTestOwner));
   }
 
   ~SharedOptionsTest() override {}

diff --git a/chrome/browser/ui/webui/options/chromeos/storage_manager_handler.cc b/chrome/browser/ui/webui/options/chromeos/storage_manager_handler.cc
index 411fe5e7..98da03ec 100644
--- a/chrome/browser/ui/webui/options/chromeos/storage_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/storage_manager_handler.cc

@@ -261,7 +261,7 @@
   updating_downloads_size_ = false;
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.StorageManager.setDownloadsSize",
-      base::StringValue(ui::FormatBytes(size)));
+      base::Value(ui::FormatBytes(size)));
 }
 
 void StorageManagerHandler::UpdateDriveCacheSize() {
@@ -286,7 +286,7 @@
   updating_drive_cache_size_ = false;
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.StorageManager.setDriveCacheSize",
-      base::StringValue(ui::FormatBytes(size)));
+      base::Value(ui::FormatBytes(size)));
 }
 
 void StorageManagerHandler::UpdateBrowsingDataSize() {
@@ -357,8 +357,7 @@
     }
     updating_browsing_data_size_ = false;
     web_ui()->CallJavascriptFunctionUnsafe(
-        "options.StorageManager.setBrowsingDataSize",
-        base::StringValue(size_string));
+        "options.StorageManager.setBrowsingDataSize", base::Value(size_string));
   }
 }
 
@@ -385,7 +384,7 @@
     updating_other_users_size_ = false;
     web_ui()->CallJavascriptFunctionUnsafe(
         "options.StorageManager.setOtherUsersSize",
-        base::StringValue(ui::FormatBytes(0)));
+        base::Value(ui::FormatBytes(0)));
   }
 }
 
@@ -403,8 +402,7 @@
     }
     updating_other_users_size_ = false;
     web_ui()->CallJavascriptFunctionUnsafe(
-        "options.StorageManager.setOtherUsersSize",
-        base::StringValue(size_string));
+        "options.StorageManager.setOtherUsersSize", base::Value(size_string));
   }
 }
 
@@ -443,7 +441,7 @@
   }
   updating_arc_size_ = false;
   web_ui()->CallJavascriptFunctionUnsafe("options.StorageManager.setArcSize",
-                                         base::StringValue(size_string));
+                                         base::Value(size_string));
 }
 
 void StorageManagerHandler::OnClearDriveCacheDone(bool success) {

diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
index 4037188..157d1b6 100644
--- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc

@@ -145,7 +145,7 @@
   }
 
   web_ui()->CallJavascriptFunctionUnsafe(
-      "ClearBrowserDataOverlay.setBannerText", base::StringValue(text));
+      "ClearBrowserDataOverlay.setBannerText", base::Value(text));
 }
 
 void ClearBrowserDataHandler::OnPageOpened(const base::ListValue* value) {
@@ -386,8 +386,8 @@
   DCHECK(AreCountersEnabled());
   web_ui()->CallJavascriptFunctionUnsafe(
       "ClearBrowserDataOverlay.updateCounter",
-      base::StringValue(result->source()->GetPrefName()),
-      base::StringValue(GetChromeCounterTextFromResult(result.get())));
+      base::Value(result->source()->GetPrefName()),
+      base::Value(GetChromeCounterTextFromResult(result.get())));
 }
 
 void ClearBrowserDataHandler::OnStateChanged(syncer::SyncService* sync) {

diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index f51ac23..491cb0b1 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc

@@ -876,7 +876,7 @@
     }
   }
 
-  base::StringValue type_string(site_settings::ContentSettingsTypeToGroupName(
+  base::Value type_string(site_settings::ContentSettingsTypeToGroupName(
       CONTENT_SETTINGS_TYPE_GEOLOCATION));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
                                          type_string, exceptions);
@@ -916,7 +916,7 @@
                                         i->source));
   }
 
-  base::StringValue type_string(site_settings::ContentSettingsTypeToGroupName(
+  base::Value type_string(site_settings::ContentSettingsTypeToGroupName(
       CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
                                          type_string, exceptions);
@@ -990,7 +990,7 @@
   base::ListValue exceptions;
   site_settings::GetChooserExceptionsFromProfile(
       Profile::FromWebUI(web_ui()), false, chooser_type, &exceptions);
-  base::StringValue type_string(chooser_type.name);
+  base::Value type_string(chooser_type.name);
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
                                          type_string, exceptions);
 
@@ -1005,7 +1005,7 @@
   base::ListValue exceptions;
   site_settings::GetChooserExceptionsFromProfile(
       Profile::FromWebUI(web_ui()), true, chooser_type, &exceptions);
-  base::StringValue type_string(chooser_type.name);
+  base::Value type_string(chooser_type.name);
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setOTRExceptions",
                                          type_string, exceptions);
 }
@@ -1070,7 +1070,7 @@
     zoom_levels_exceptions.Append(std::move(exception));
   }
 
-  base::StringValue type_string(kZoomContentType);
+  base::Value type_string(kZoomContentType);
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
                                          type_string, zoom_levels_exceptions);
 }
@@ -1085,8 +1085,7 @@
   site_settings::GetExceptionsFromHostContentSettingsMap(
       settings_map, type, extension_registry, web_ui(), /*incognito=*/false,
       /*filter=*/nullptr, &exceptions);
-  base::StringValue type_string(
-      site_settings::ContentSettingsTypeToGroupName(type));
+  base::Value type_string(site_settings::ContentSettingsTypeToGroupName(type));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
                                          type_string, exceptions);
 
@@ -1115,8 +1114,7 @@
   site_settings::GetExceptionsFromHostContentSettingsMap(
       otr_settings_map, type, extension_registry, web_ui(), /*incognito=*/true,
       /*filter=*/nullptr, &exceptions);
-  base::StringValue type_string(
-      site_settings::ContentSettingsTypeToGroupName(type));
+  base::Value type_string(site_settings::ContentSettingsTypeToGroupName(type));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setOTRExceptions",
                                          type_string, exceptions);
 }
@@ -1350,9 +1348,9 @@
       ContentSettingsPattern::FromString(pattern_string);
 
   web_ui()->CallJavascriptFunctionUnsafe(
-      "ContentSettings.patternValidityCheckComplete",
-      base::StringValue(type_string), base::StringValue(mode_string),
-      base::StringValue(pattern_string), base::Value(pattern.IsValid()));
+      "ContentSettings.patternValidityCheckComplete", base::Value(type_string),
+      base::Value(mode_string), base::Value(pattern_string),
+      base::Value(pattern.IsValid()));
 }
 
 Profile* ContentSettingsHandler::GetProfile() {
@@ -1413,11 +1411,10 @@
   if (show_link != show) {
     web_ui()->CallJavascriptFunctionUnsafe(
         "ContentSettings.showMediaPepperFlashLink",
-        base::StringValue(link_type == DEFAULT_SETTING ? "default"
-                                                       : "exceptions"),
-        base::StringValue(content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC
-                              ? "mic"
-                              : "camera"),
+        base::Value(link_type == DEFAULT_SETTING ? "default" : "exceptions"),
+        base::Value(content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC
+                        ? "mic"
+                        : "camera"),
         base::Value(show));
     show_link = show;
   }
@@ -1475,7 +1472,7 @@
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "ContentSettings.setDevicesMenuVisibility",
-      base::StringValue(site_settings::ContentSettingsTypeToGroupName(type)),
+      base::Value(site_settings::ContentSettingsTypeToGroupName(type)),
       base::Value(!settings.policy_disable));
 }
 

diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc
index 5735164..4ab5062 100644
--- a/chrome/browser/ui/webui/options/core_options_handler.cc
+++ b/chrome/browser/ui/webui/options/core_options_handler.cc

@@ -579,7 +579,7 @@
         return;
       }
       GURL fixed = url_formatter::FixupURL(original, std::string());
-      temp_value.reset(new base::StringValue(fixed.spec()));
+      temp_value.reset(new base::Value(fixed.spec()));
       value = temp_value.get();
       break;
     }

diff --git a/chrome/browser/ui/webui/options/create_profile_handler.cc b/chrome/browser/ui/webui/options/create_profile_handler.cc
index 800471a..f820a99 100644
--- a/chrome/browser/ui/webui/options/create_profile_handler.cc
+++ b/chrome/browser/ui/webui/options/create_profile_handler.cc

@@ -230,8 +230,7 @@
   profile_creation_type_ = NO_CREATION_IN_PROGRESS;
   profile_path_being_created_.clear();
   web_ui()->CallJavascriptFunctionUnsafe(
-      GetJavascriptMethodName(PROFILE_CREATION_ERROR),
-      base::StringValue(error));
+      GetJavascriptMethodName(PROFILE_CREATION_ERROR), base::Value(error));
   // The ProfileManager calls us back with a NULL profile in some cases.
   if (profile) {
     webui::DeleteProfileAtPath(profile->GetPath(),
@@ -434,7 +433,7 @@
     const base::string16& warning) {
   DCHECK_EQ(SUPERVISED_PROFILE_CREATION, profile_creation_type_);
   web_ui()->CallJavascriptFunctionUnsafe(
-      "BrowserOptions.showCreateProfileWarning", base::StringValue(warning));
+      "BrowserOptions.showCreateProfileWarning", base::Value(warning));
 }
 
 void CreateProfileHandler::RecordSupervisedProfileCreationMetrics(

diff --git a/chrome/browser/ui/webui/options/easy_unlock_handler.cc b/chrome/browser/ui/webui/options/easy_unlock_handler.cc
index 5349133..ff3cf2dd 100644
--- a/chrome/browser/ui/webui/options/easy_unlock_handler.cc
+++ b/chrome/browser/ui/webui/options/easy_unlock_handler.cc

@@ -91,8 +91,7 @@
       break;
   }
   web_ui()->CallJavascriptFunctionUnsafe(
-      "EasyUnlockTurnOffOverlay.updateUIState",
-      base::StringValue(status_string));
+      "EasyUnlockTurnOffOverlay.updateUIState", base::Value(status_string));
 }
 
 void EasyUnlockHandler::HandleGetTurnOffFlowStatus(

diff --git a/chrome/browser/ui/webui/options/font_settings_handler.cc b/chrome/browser/ui/webui/options/font_settings_handler.cc
index f57a800..5eeb8a2 100644
--- a/chrome/browser/ui/webui/options/font_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/font_settings_handler.cc

@@ -206,7 +206,7 @@
 }
 
 void FontSettingsHandler::SetUpStandardFontSample() {
-  base::StringValue font_value(
+  base::Value font_value(
       FontSettingsUtilities::ResolveFontList(standard_font_.GetValue()));
   base::Value size_value(default_font_size_.GetValue());
   web_ui()->CallJavascriptFunctionUnsafe("FontSettings.setUpStandardFontSample",
@@ -214,7 +214,7 @@
 }
 
 void FontSettingsHandler::SetUpSerifFontSample() {
-  base::StringValue font_value(
+  base::Value font_value(
       FontSettingsUtilities::ResolveFontList(serif_font_.GetValue()));
   base::Value size_value(default_font_size_.GetValue());
   web_ui()->CallJavascriptFunctionUnsafe("FontSettings.setUpSerifFontSample",
@@ -222,7 +222,7 @@
 }
 
 void FontSettingsHandler::SetUpSansSerifFontSample() {
-  base::StringValue font_value(
+  base::Value font_value(
       FontSettingsUtilities::ResolveFontList(sans_serif_font_.GetValue()));
   base::Value size_value(default_font_size_.GetValue());
   web_ui()->CallJavascriptFunctionUnsafe(
@@ -230,7 +230,7 @@
 }
 
 void FontSettingsHandler::SetUpFixedFontSample() {
-  base::StringValue font_value(
+  base::Value font_value(
       FontSettingsUtilities::ResolveFontList(fixed_font_.GetValue()));
   base::Value size_value(default_fixed_font_size_.GetValue());
   web_ui()->CallJavascriptFunctionUnsafe("FontSettings.setUpFixedFontSample",

diff --git a/chrome/browser/ui/webui/options/language_options_handler_common.cc b/chrome/browser/ui/webui/options/language_options_handler_common.cc
index 4b6b396..c2f6468 100644
--- a/chrome/browser/ui/webui/options/language_options_handler_common.cc
+++ b/chrome/browser/ui/webui/options/language_options_handler_common.cc

@@ -166,21 +166,21 @@
     const std::string& language) {
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.LanguageOptions.onDictionaryDownloadBegin",
-      base::StringValue(language));
+      base::Value(language));
 }
 
 void LanguageOptionsHandlerCommon::OnHunspellDictionaryDownloadSuccess(
     const std::string& language) {
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.LanguageOptions.onDictionaryDownloadSuccess",
-      base::StringValue(language));
+      base::Value(language));
 }
 
 void LanguageOptionsHandlerCommon::OnHunspellDictionaryDownloadFailure(
     const std::string& language) {
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.LanguageOptions.onDictionaryDownloadFailure",
-      base::StringValue(language));
+      base::Value(language));
 }
 
 base::DictionaryValue* LanguageOptionsHandlerCommon::GetUILanguageCodeSet() {
@@ -232,7 +232,7 @@
       "LanguageOptions_UiLanguageChange_%s", language_code.c_str());
   content::RecordComputedAction(action);
   SetApplicationLocale(language_code);
-  base::StringValue language_value(language_code);
+  base::Value language_value(language_code);
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.LanguageOptions.uiLanguageSaved", language_value);
 }

diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.cc b/chrome/browser/ui/webui/options/manage_profile_handler.cc
index 2dbc2697..61f6b8e 100644
--- a/chrome/browser/ui/webui/options/manage_profile_handler.cc
+++ b/chrome/browser/ui/webui/options/manage_profile_handler.cc

@@ -218,13 +218,13 @@
 void ManageProfileHandler::OnProfileNameChanged(
     const base::FilePath& profile_path,
     const base::string16& old_profile_name) {
-  base::StringValue value(kManageProfileIdentifier);
+  base::Value value(kManageProfileIdentifier);
   SendProfileIconsAndNames(value);
 }
 
 void ManageProfileHandler::OnProfileAvatarChanged(
     const base::FilePath& profile_path) {
-  base::StringValue value(kManageProfileIdentifier);
+  base::Value value(kManageProfileIdentifier);
   SendProfileIconsAndNames(value);
 }
 
@@ -273,7 +273,7 @@
   DCHECK(ok);
   DCHECK(mode == kCreateProfileIdentifier || mode == kManageProfileIdentifier);
   if (ok) {
-    base::StringValue value(mode);
+    base::Value value(mode);
     SendProfileIconsAndNames(value);
   }
 }
@@ -293,8 +293,7 @@
       "ManageProfileOverlay.receiveNewProfileDefaults", profile_info);
 }
 
-void ManageProfileHandler::SendProfileIconsAndNames(
-    const base::StringValue& mode) {
+void ManageProfileHandler::SendProfileIconsAndNames(const base::Value& mode) {
   base::ListValue image_url_list;
   base::ListValue default_name_list;
 
@@ -435,8 +434,8 @@
   if (gaia_name.empty())
     return;
 
-  base::StringValue gaia_name_value(gaia_name);
-  base::StringValue mode_value(kManageProfileIdentifier);
+  base::Value gaia_name_value(gaia_name);
+  base::Value mode_value(kManageProfileIdentifier);
   web_ui()->CallJavascriptFunctionUnsafe("ManageProfileOverlay.setProfileName",
                                          gaia_name_value, mode_value);
 }
@@ -488,7 +487,7 @@
                     state == GoogleServiceAuthError::ACCOUNT_DELETED ||
                     state == GoogleServiceAuthError::ACCOUNT_DISABLED);
   web_ui()->CallJavascriptFunctionUnsafe(
-      "CreateProfileOverlay.updateSignedInStatus", base::StringValue(username),
+      "CreateProfileOverlay.updateSignedInStatus", base::Value(username),
       base::Value(has_error));
 
   OnCreateSupervisedUserPrefChange();

diff --git a/chrome/browser/ui/webui/options/manage_profile_handler.h b/chrome/browser/ui/webui/options/manage_profile_handler.h
index f677f015..b0688bf 100644
--- a/chrome/browser/ui/webui/options/manage_profile_handler.h
+++ b/chrome/browser/ui/webui/options/manage_profile_handler.h

@@ -16,7 +16,6 @@
 
 namespace base {
 class Value;
-using StringValue = Value;
 }
 
 namespace options {
@@ -65,7 +64,7 @@
 
   // Send all profile icons and their default names to the overlay.
   // |mode| is the dialog mode, i.e. "create" or "manage".
-  void SendProfileIconsAndNames(const base::StringValue& mode);
+  void SendProfileIconsAndNames(const base::Value& mode);
 
   // Sends an object to WebUI of the form:
   //   profileNames = {

diff --git a/chrome/browser/ui/webui/options/media_devices_selection_handler.cc b/chrome/browser/ui/webui/options/media_devices_selection_handler.cc
index 445562d..df8b459 100644
--- a/chrome/browser/ui/webui/options/media_devices_selection_handler.cc
+++ b/chrome/browser/ui/webui/options/media_devices_selection_handler.cc

@@ -130,8 +130,8 @@
   if (!devices.empty() && default_id.empty())
     default_id = devices[0].id;
 
-  base::StringValue default_value(default_id);
-  base::StringValue type_value(device_type);
+  base::Value default_value(default_id);
+  base::Value type_value(device_type);
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.updateDevicesMenu",
                                          type_value, device_list,
                                          default_value);

diff --git a/chrome/browser/ui/webui/options/password_manager_handler.cc b/chrome/browser/ui/webui/options/password_manager_handler.cc
index c3aacdb3..dd80fb4 100644
--- a/chrome/browser/ui/webui/options/password_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/password_manager_handler.cc

@@ -247,7 +247,7 @@
   // Call back the front end to reveal the password.
   web_ui()->CallJavascriptFunctionUnsafe("PasswordManager.showPassword",
                                          base::Value(static_cast<int>(index)),
-                                         base::StringValue(password_value));
+                                         base::Value(password_value));
 }
 
 void PasswordManagerHandler::HandleUpdatePasswordLists(

diff --git a/chrome/browser/ui/webui/options/preferences_browsertest.cc b/chrome/browser/ui/webui/options/preferences_browsertest.cc
index 49f0867..545e559 100644
--- a/chrome/browser/ui/webui/options/preferences_browsertest.cc
+++ b/chrome/browser/ui/webui/options/preferences_browsertest.cc

@@ -260,7 +260,7 @@
   ASSERT_TRUE(pref->GetAsDictionary(&dict));
   VerifyKeyValue(*dict, "value", *value);
   if (!controlledBy.empty())
-    VerifyKeyValue(*dict, "controlledBy", base::StringValue(controlledBy));
+    VerifyKeyValue(*dict, "controlledBy", base::Value(controlledBy));
   else
     EXPECT_FALSE(dict->HasKey("controlledBy"));
 
@@ -689,7 +689,7 @@
 
   // String pref.
   pref_names_.push_back(chromeos::kReleaseChannel);
-  default_values_.push_back(base::MakeUnique<base::StringValue>(""));
+  default_values_.push_back(base::MakeUnique<base::Value>(""));
 
   // List pref.
   pref_names_.push_back(chromeos::kAccountsPrefUsers);
@@ -712,9 +712,9 @@
   // Non-privileged string pref.
   pref_names_.push_back(chromeos::kSystemTimezone);
   default_values_.push_back(
-      base::MakeUnique<base::StringValue>("America/Los_Angeles"));
+      base::MakeUnique<base::Value>("America/Los_Angeles"));
   non_default_values_.push_back(
-      base::MakeUnique<base::StringValue>("America/New_York"));
+      base::MakeUnique<base::Value>("America/New_York"));
   decorated_non_default_values.push_back(
       non_default_values_.back()->CreateDeepCopy());
 
@@ -764,7 +764,7 @@
   // String pref.
   pref_names_.push_back(chromeos::kReleaseChannel);
   non_default_values_.push_back(
-      base::MakeUnique<base::StringValue>("stable-channel"));
+      base::MakeUnique<base::Value>("stable-channel"));
   decorated_non_default_values.push_back(
       non_default_values_.back()->CreateDeepCopy());
 
@@ -811,7 +811,7 @@
   // Non-privileged string pref.
   pref_names_.push_back(chromeos::kSystemTimezone);
   non_default_values_.push_back(
-      base::MakeUnique<base::StringValue>("America/New_York"));
+      base::MakeUnique<base::Value>("America/New_York"));
   decorated_non_default_values.push_back(
       non_default_values_.back()->CreateDeepCopy());
 
@@ -872,9 +872,8 @@
                              shill::kTypeEthernet,
                              shill::kStateOnline,
                              true /* add_to_visible */ );
-    service_test->SetServiceProperty("stub_ethernet",
-                                     shill::kProfileProperty,
-                                     base::StringValue(kUserProfilePath));
+    service_test->SetServiceProperty("stub_ethernet", shill::kProfileProperty,
+                                     base::Value(kUserProfilePath));
     profile_test->AddService(kUserProfilePath, "stub_wifi2");
   }
 
@@ -897,7 +896,7 @@
     policy::PolicyMap map;
     map.Set(policy_name, policy::POLICY_LEVEL_MANDATORY, scope,
             policy::POLICY_SOURCE_CLOUD,
-            base::MakeUnique<base::StringValue>(onc_policy), nullptr);
+            base::MakeUnique<base::Value>(onc_policy), nullptr);
     policy_provider_.UpdateChromePolicy(map);
 
     content::RunAllPendingInMessageLoop();
@@ -960,8 +959,7 @@
 
   // String pref.
   pref_names_.push_back(chromeos::proxy_cros_settings_parser::kProxySingleHttp);
-  non_default_values_.push_back(
-      base::MakeUnique<base::StringValue>("127.0.0.1"));
+  non_default_values_.push_back(base::MakeUnique<base::Value>("127.0.0.1"));
 
   // List pref.
   pref_names_.push_back(chromeos::proxy_cros_settings_parser::kProxyIgnoreList);
@@ -1036,8 +1034,8 @@
 
 IN_PROC_BROWSER_TEST_F(ProxyPreferencesBrowserTest, UserProxyPolicy) {
   policy_names_.push_back(policy::key::kProxyMode);
-  default_values_.push_back(base::MakeUnique<base::StringValue>(
-      ProxyPrefs::kAutoDetectProxyModeName));
+  default_values_.push_back(
+      base::MakeUnique<base::Value>(ProxyPrefs::kAutoDetectProxyModeName));
   SetUserPolicies(policy_names_, default_values_,
                   policy::POLICY_LEVEL_MANDATORY);
   content::RunAllPendingInMessageLoop();
@@ -1065,7 +1063,7 @@
   SetProxyPref(chromeos::proxy_cros_settings_parser::kProxySingleHttpPort,
                base::Value(123));
   SetProxyPref(chromeos::proxy_cros_settings_parser::kProxySingleHttp,
-               base::StringValue("www.adomain.xy"));
+               base::Value("www.adomain.xy"));
 
   VerifyCurrentProxyServer("www.adomain.xy:123",
                            onc::ONC_SOURCE_NONE);
@@ -1082,13 +1080,13 @@
 
   // Set hosts but no ports.
   SetProxyPref(chromeos::proxy_cros_settings_parser::kProxyHttpUrl,
-               base::StringValue("a.com"));
+               base::Value("a.com"));
   SetProxyPref(chromeos::proxy_cros_settings_parser::kProxyHttpsUrl,
-               base::StringValue("4.3.2.1"));
+               base::Value("4.3.2.1"));
   SetProxyPref(chromeos::proxy_cros_settings_parser::kProxyFtpUrl,
-               base::StringValue("c.com"));
+               base::Value("c.com"));
   SetProxyPref(chromeos::proxy_cros_settings_parser::kProxySocks,
-               base::StringValue("d.com"));
+               base::Value("d.com"));
 
   // Verify default ports.
   VerifyCurrentProxyServer(

diff --git a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc
index 41b1642..9979d8b 100644
--- a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc

@@ -296,7 +296,7 @@
   validity.SetBoolean("name", edit_controller_->IsTitleValid(name));
   validity.SetBoolean("keyword", edit_controller_->IsKeywordValid(keyword));
   validity.SetBoolean("url", edit_controller_->IsURLValid(url));
-  base::StringValue indexValue(modelIndex);
+  base::Value indexValue(modelIndex);
   web_ui()->CallJavascriptFunctionUnsafe(
       "SearchEngineManager.validityCheckCallback", validity, indexValue);
 }

diff --git a/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc b/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc
index d0f8037..9ff957d 100644
--- a/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc
+++ b/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc

@@ -54,7 +54,7 @@
   // affected profile and update or close as needed.
   void OnProfileWasRemoved(const base::FilePath& profile_path,
                            const base::string16& profile_name) override {
-    std::unique_ptr<base::StringValue> profile_path_value(
+    std::unique_ptr<base::Value> profile_path_value(
         base::CreateFilePathValue(profile_path));
     create_confirm_handler_->web_ui()->CallJavascriptFunctionUnsafe(
         "SupervisedUserCreateConfirmOverlay.onDeletedProfile",
@@ -68,11 +68,11 @@
         GetProfileAttributesWithPath(profile_path, &entry))
       return;
     base::string16 new_profile_name = entry->GetName();
-    std::unique_ptr<base::StringValue> profile_path_value(
+    std::unique_ptr<base::Value> profile_path_value(
         base::CreateFilePathValue(profile_path));
     create_confirm_handler_->web_ui()->CallJavascriptFunctionUnsafe(
         "SupervisedUserCreateConfirmOverlay.onUpdatedProfileName",
-        *profile_path_value, base::StringValue(new_profile_name));
+        *profile_path_value, base::Value(new_profile_name));
   }
 
   // Weak.

diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc
index 4e2457e..6c4e9b6 100644
--- a/chrome/browser/ui/webui/options/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc

@@ -285,7 +285,7 @@
 }
 
 void SyncSetupHandler::ConfigureSyncDone() {
-  base::StringValue page("done");
+  base::Value page("done");
   web_ui()->CallJavascriptFunctionUnsafe("SyncSetupOverlay.showSyncSetupPage",
                                          page);
 
@@ -427,7 +427,7 @@
 
 void SyncSetupHandler::DisplaySpinner() {
   configuring_sync_ = true;
-  base::StringValue page("spinner");
+  base::Value page("spinner");
   base::DictionaryValue args;
 
   const int kTimeoutSec = 30;
@@ -450,7 +450,7 @@
   // Do not listen to sync startup events.
   sync_startup_tracker_.reset();
 
-  base::StringValue page("timeout");
+  base::Value page("timeout");
   base::DictionaryValue args;
   web_ui()->CallJavascriptFunctionUnsafe("SyncSetupOverlay.showSyncSetupPage",
                                          page, args);
@@ -797,7 +797,7 @@
 
 void SyncSetupHandler::CloseUI() {
   CloseSyncSetup();
-  base::StringValue page("done");
+  base::Value page("done");
   web_ui()->CallJavascriptFunctionUnsafe("SyncSetupOverlay.showSyncSetupPage",
                                          page);
 }
@@ -942,7 +942,7 @@
         GetStringUTF16(IDS_SYNC_FULL_ENCRYPTION_DATA));
   }
 
-  base::StringValue page("configure");
+  base::Value page("configure");
   web_ui()->CallJavascriptFunctionUnsafe("SyncSetupOverlay.showSyncSetupPage",
                                          page, args);
 

diff --git a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.cc b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.cc
index 4b89d9c6..976f10af 100644
--- a/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.cc
+++ b/chrome/browser/ui/webui/password_manager_internals/password_manager_internals_ui.cc

@@ -99,7 +99,7 @@
     return;
   std::string no_quotes(text);
   std::replace(no_quotes.begin(), no_quotes.end(), '"', ' ');
-  base::StringValue text_string_value(net::EscapeForHTML(no_quotes));
+  base::Value text_string_value(net::EscapeForHTML(no_quotes));
   web_ui()->CallJavascriptFunctionUnsafe("addSavePasswordProgressLog",
                                          text_string_value);
 }

diff --git a/chrome/browser/ui/webui/policy_ui_browsertest.cc b/chrome/browser/ui/webui/policy_ui_browsertest.cc
index 6939af92..c6ed1f25 100644
--- a/chrome/browser/ui/webui/policy_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/policy_ui_browsertest.cc

@@ -224,7 +224,7 @@
   expected_values[policy::key::kRestoreOnStartupURLs] = "aaa,bbb,ccc";
   values.Set(policy::key::kHomepageLocation, policy::POLICY_LEVEL_MANDATORY,
              policy::POLICY_SCOPE_MACHINE, policy::POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>("http://google.com"), nullptr);
+             base::MakeUnique<base::Value>("http://google.com"), nullptr);
   expected_values[policy::key::kHomepageLocation] = "http://google.com";
   values.Set(policy::key::kRestoreOnStartup, policy::POLICY_LEVEL_RECOMMENDED,
              policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,

diff --git a/chrome/browser/ui/webui/policy_ui_handler.cc b/chrome/browser/ui/webui/policy_ui_handler.cc
index a18f2e59..9d8f9444 100644
--- a/chrome/browser/ui/webui/policy_ui_handler.cc
+++ b/chrome/browser/ui/webui/policy_ui_handler.cc

@@ -173,13 +173,13 @@
 }
 
 // Utility function that returns a JSON serialization of the given |dict|.
-std::unique_ptr<base::StringValue> DictionaryToJSONString(
+std::unique_ptr<base::Value> DictionaryToJSONString(
     const base::DictionaryValue& dict) {
   std::string json_string;
   base::JSONWriter::WriteWithOptions(dict,
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                      &json_string);
-  return base::MakeUnique<base::StringValue>(json_string);
+  return base::MakeUnique<base::Value>(json_string);
 }
 
 // Returns a copy of |value| with some values converted to a representation that

diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 8c783b5e..862ade1055 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc

@@ -1095,8 +1095,8 @@
   std::string printer_name;
   if (!args->GetString(0, &callback_id) || !args->GetString(1, &printer_name) ||
       callback_id.empty() || printer_name.empty()) {
-    RejectJavascriptCallback(base::StringValue(callback_id),
-                             base::StringValue(printer_name));
+    RejectJavascriptCallback(base::Value(callback_id),
+                             base::Value(printer_name));
     return;
   }
 
@@ -1287,9 +1287,8 @@
 void PrintPreviewHandler::SendAccessToken(const std::string& type,
                                           const std::string& access_token) {
   VLOG(1) << "Get getAccessToken finished";
-  web_ui()->CallJavascriptFunctionUnsafe("onDidGetAccessToken",
-                                         base::StringValue(type),
-                                         base::StringValue(access_token));
+  web_ui()->CallJavascriptFunctionUnsafe(
+      "onDidGetAccessToken", base::Value(type), base::Value(access_token));
 }
 
 void PrintPreviewHandler::SendPrinterCapabilities(
@@ -1298,7 +1297,7 @@
   if (!settings_info) {
     VLOG(1) << "Get printer capabilities failed";
     web_ui()->CallJavascriptFunctionUnsafe("failedToGetPrinterCapabilities",
-                                           base::StringValue(printer_name));
+                                           base::Value(printer_name));
     return;
   }
   VLOG(1) << "Get printer capabilities finished";
@@ -1327,7 +1326,7 @@
   response->SetBoolean("success", success);
   response->Set("capabilities", std::move(caps));
 
-  ResolveJavascriptCallback(base::StringValue(callback_id), *response);
+  ResolveJavascriptCallback(base::Value(callback_id), *response);
 }
 
 void PrintPreviewHandler::SetupPrinterList(
@@ -1365,7 +1364,7 @@
                                    data->size());
   std::string base64_data;
   base::Base64Encode(raw_data, &base64_data);
-  base::StringValue data_value(base64_data);
+  base::Value data_value(base64_data);
 
   web_ui()->CallJavascriptFunctionUnsafe("printToCloud", data_value);
 }
@@ -1658,7 +1657,7 @@
 
 void PrintPreviewHandler::SendPrivetCapabilitiesError(
     const std::string& device_name) {
-  base::StringValue name_value(device_name);
+  base::Value name_value(device_name);
   web_ui()->CallJavascriptFunctionUnsafe("failedToGetPrivetPrinterCapabilities",
                                          name_value);
 }
@@ -1748,13 +1747,12 @@
     const base::DictionaryValue& printer_info) {
   if (printer_info.empty()) {
     web_ui()->CallJavascriptFunctionUnsafe("failedToResolveProvisionalPrinter",
-                                           base::StringValue(printer_id));
+                                           base::Value(printer_id));
     return;
   }
 
   web_ui()->CallJavascriptFunctionUnsafe("onProvisionalPrinterResolved",
-                                         base::StringValue(printer_id),
-                                         printer_info);
+                                         base::Value(printer_id), printer_info);
 }
 
 void PrintPreviewHandler::OnGotExtensionPrinterCapabilities(
@@ -1762,14 +1760,12 @@
     const base::DictionaryValue& capabilities) {
   if (capabilities.empty()) {
     web_ui()->CallJavascriptFunctionUnsafe(
-        "failedToGetExtensionPrinterCapabilities",
-        base::StringValue(printer_id));
+        "failedToGetExtensionPrinterCapabilities", base::Value(printer_id));
     return;
   }
 
   web_ui()->CallJavascriptFunctionUnsafe("onExtensionCapabilitiesSet",
-                                         base::StringValue(printer_id),
-                                         capabilities);
+                                         base::Value(printer_id), capabilities);
 }
 
 void PrintPreviewHandler::OnExtensionPrintResult(bool success,
@@ -1782,7 +1778,7 @@
   // TODO(tbarzic): This function works for extension printers case too, but it
   // should be renamed to something more generic.
   web_ui()->CallJavascriptFunctionUnsafe("onPrivetPrintFailed",
-                                         base::StringValue(status));
+                                         base::Value(status));
 }
 
 void PrintPreviewHandler::RegisterForGaiaCookieChanges() {

diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc
index 0d5749bc..1c632127 100644
--- a/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc
+++ b/chrome/browser/ui/webui/quota_internals/quota_internals_handler.cc

@@ -77,7 +77,7 @@
 void QuotaInternalsHandler::SendMessage(const std::string& message,
                                         const base::Value& value) {
   web_ui()->CallJavascriptFunctionUnsafe("cr.quota.messageHandler",
-                                         base::StringValue(message), value);
+                                         base::Value(message), value);
 }
 
 void QuotaInternalsHandler::OnRequestInfo(const base::ListValue*) {

diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc
index e2fe6c5f..dd1d219 100644
--- a/chrome/browser/ui/webui/settings/about_handler.cc
+++ b/chrome/browser/ui/webui/settings/about_handler.cc

@@ -496,7 +496,7 @@
 void AboutHandler::OnGetVersionInfoReady(
     std::string callback_id,
     std::unique_ptr<base::DictionaryValue> version_info) {
-  ResolveJavascriptCallback(base::StringValue(callback_id), *version_info);
+  ResolveJavascriptCallback(base::Value(callback_id), *version_info);
 }
 
 void AboutHandler::HandleGetRegulatoryInfo(const base::ListValue* args) {
@@ -540,7 +540,7 @@
   channel_info->SetBoolean("canChangeChannel",
                            CanChangeChannel(Profile::FromWebUI(web_ui())));
 
-  ResolveJavascriptCallback(base::StringValue(callback_id), *channel_info);
+  ResolveJavascriptCallback(base::Value(callback_id), *channel_info);
 }
 
 void AboutHandler::HandleRequestUpdate(const base::ListValue* args) {
@@ -584,7 +584,7 @@
 #endif  // defined(OS_CHROMEOS)
 
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("update-status-changed"), *event);
+                         base::Value("update-status-changed"), *event);
 }
 
 #if defined(OS_MACOSX)
@@ -612,8 +612,7 @@
     promo_state.SetString("text", text);
 
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("promotion-state-changed"),
-                         promo_state);
+                         base::Value("promotion-state-changed"), promo_state);
 }
 #endif  // defined(OS_MACOSX)
 
@@ -622,7 +621,7 @@
     std::string callback_id,
     const base::FilePath& label_dir_path) {
   if (label_dir_path.empty()) {
-    ResolveJavascriptCallback(base::StringValue(callback_id),
+    ResolveJavascriptCallback(base::Value(callback_id),
                               *base::Value::CreateNullValue());
     return;
   }
@@ -650,7 +649,7 @@
       std::string("chrome://") + chrome::kChromeOSAssetHost + "/" + image_path;
   regulatory_info->SetString("url", url);
 
-  ResolveJavascriptCallback(base::StringValue(callback_id), *regulatory_info);
+  ResolveJavascriptCallback(base::Value(callback_id), *regulatory_info);
 }
 #endif  // defined(OS_CHROMEOS)
 

diff --git a/chrome/browser/ui/webui/settings/certificates_handler.cc b/chrome/browser/ui/webui/settings/certificates_handler.cc
index 37922e3..3c9af03 100644
--- a/chrome/browser/ui/webui/settings/certificates_handler.cc
+++ b/chrome/browser/ui/webui/settings/certificates_handler.cc

@@ -906,7 +906,7 @@
 
   // TODO(mattm): check here if root_cert is not a CA cert and show error.
 
-  base::StringValue cert_name(root_cert->subject().GetDisplayName());
+  base::Value cert_name(root_cert->subject().GetDisplayName());
   ResolveCallback(cert_name);
 }
 
@@ -989,7 +989,7 @@
   base::Value tpm_available_value(
       certificate_manager_model_->is_tpm_available());
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("certificates-model-ready"),
+                         base::Value("certificates-model-ready"),
                          user_db_available_value, tpm_available_value);
   certificate_manager_model_->Refresh();
 }
@@ -1083,20 +1083,20 @@
     std::sort(nodes->begin(), nodes->end(), comparator);
 
     CallJavascriptFunction("cr.webUIListenerCallback",
-                           base::StringValue("certificates-changed"),
-                           base::StringValue(tab_name), *nodes);
+                           base::Value("certificates-changed"),
+                           base::Value(tab_name), *nodes);
   }
 }
 
 void CertificatesHandler::ResolveCallback(const base::Value& response) {
   DCHECK(!webui_callback_id_.empty());
-  ResolveJavascriptCallback(base::StringValue(webui_callback_id_), response);
+  ResolveJavascriptCallback(base::Value(webui_callback_id_), response);
   webui_callback_id_.clear();
 }
 
 void CertificatesHandler::RejectCallback(const base::Value& response) {
   DCHECK(!webui_callback_id_.empty());
-  RejectJavascriptCallback(base::StringValue(webui_callback_id_), response);
+  RejectJavascriptCallback(base::Value(webui_callback_id_), response);
   webui_callback_id_.clear();
 }
 

diff --git a/chrome/browser/ui/webui/settings/chromeos/android_apps_handler.cc b/chrome/browser/ui/webui/settings/chromeos/android_apps_handler.cc
index c3bf83d8..099654c 100644
--- a/chrome/browser/ui/webui/settings/chromeos/android_apps_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/android_apps_handler.cc

@@ -82,7 +82,7 @@
   AllowJavascript();
   std::unique_ptr<base::DictionaryValue> info = BuildAndroidAppsInfo();
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("android-apps-info-update"), *info);
+                         base::Value("android-apps-info-update"), *info);
 }
 
 void AndroidAppsHandler::ShowAndroidAppsSettings(const base::ListValue* args) {

diff --git a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
index 1f73638..e9b8ae75 100644
--- a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc

@@ -144,8 +144,7 @@
     image_urls.Append(std::move(image_data));
   }
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("default-images-changed"),
-                         image_urls);
+                         base::Value("default-images-changed"), image_urls);
 }
 
 void ChangePictureHandler::HandleChooseFile(const base::ListValue* args) {
@@ -230,10 +229,10 @@
       if (previous_image_index_ >=
           default_user_image::kFirstDefaultImageIndex) {
         // User has image from the current set of default images.
-        base::StringValue image_url(
+        base::Value image_url(
             default_user_image::GetDefaultImageUrl(previous_image_index_));
         CallJavascriptFunction("cr.webUIListenerCallback",
-                               base::StringValue("selected-image-changed"),
+                               base::Value("selected-image-changed"),
                                image_url);
       } else {
         // User has an old default image, so present it in the same manner as a
@@ -247,10 +246,10 @@
 
 void ChangePictureHandler::SendProfileImage(const gfx::ImageSkia& image,
                                             bool should_select) {
-  base::StringValue data_url(webui::GetBitmapDataUrl(*image.bitmap()));
+  base::Value data_url(webui::GetBitmapDataUrl(*image.bitmap()));
   base::Value select(should_select);
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("profile-image-changed"), data_url,
+                         base::Value("profile-image-changed"), data_url,
                          select);
 }
 
@@ -268,9 +267,9 @@
 
 void ChangePictureHandler::SendOldImage(const std::string& image_url) {
   previous_image_url_ = image_url;
-  base::StringValue url(image_url);
+  base::Value url(image_url);
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("old-image-changed"), url);
+                         base::Value("old-image-changed"), url);
 }
 
 void ChangePictureHandler::HandleSelectImage(const base::ListValue* args) {
@@ -368,7 +367,7 @@
 
 void ChangePictureHandler::SetCameraPresent(bool present) {
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("camera-presence-changed"),
+                         base::Value("camera-presence-changed"),
                          base::Value(present));
 }
 

diff --git a/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc b/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc
index b4ab7c9..371bea8 100644
--- a/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.cc

@@ -148,7 +148,7 @@
   std::unique_ptr<base::DictionaryValue> response =
       base::MakeUnique<base::DictionaryValue>();
   response->Set("printerList", printers_list);
-  ResolveJavascriptCallback(base::StringValue(callback_id), *response);
+  ResolveJavascriptCallback(base::Value(callback_id), *response);
 }
 
 void CupsPrintersHandler::HandleUpdateCupsPrinter(const base::ListValue* args) {
@@ -251,14 +251,14 @@
         std::move(printer));
   }
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("on-add-cups-printer"),
-                         base::Value(success), base::StringValue(printer_name));
+                         base::Value("on-add-cups-printer"),
+                         base::Value(success), base::Value(printer_name));
 }
 
 void CupsPrintersHandler::OnAddPrinterError() {
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("on-add-cups-printer"),
-                         base::Value(false), base::StringValue(""));
+                         base::Value("on-add-cups-printer"), base::Value(false),
+                         base::Value(""));
 }
 
 void CupsPrintersHandler::HandleGetCupsPrinterManufacturers(
@@ -287,7 +287,7 @@
     base::DictionaryValue response;
     response.SetBoolean("success", true);
     response.Set("models", base::MakeUnique<base::ListValue>());
-    ResolveJavascriptCallback(base::StringValue(js_callback), response);
+    ResolveJavascriptCallback(base::Value(js_callback), response);
     return;
   }
 
@@ -328,7 +328,7 @@
   response.SetBoolean("success",
                       result_code == chromeos::printing::PpdProvider::SUCCESS);
   response.Set("manufacturers", std::move(manufacturers_value));
-  ResolveJavascriptCallback(base::StringValue(js_callback), response);
+  ResolveJavascriptCallback(base::Value(js_callback), response);
 }
 
 void CupsPrintersHandler::ResolvePrintersDone(
@@ -343,15 +343,15 @@
   response.SetBoolean("success",
                       result_code == chromeos::printing::PpdProvider::SUCCESS);
   response.Set("models", std::move(printers_value));
-  ResolveJavascriptCallback(base::StringValue(js_callback), response);
+  ResolveJavascriptCallback(base::Value(js_callback), response);
 }
 
 void CupsPrintersHandler::FileSelected(const base::FilePath& path,
                                        int index,
                                        void* params) {
   DCHECK(!webui_callback_id_.empty());
-  ResolveJavascriptCallback(base::StringValue(webui_callback_id_),
-                            base::StringValue(path.value()));
+  ResolveJavascriptCallback(base::Value(webui_callback_id_),
+                            base::Value(path.value()));
   webui_callback_id_.clear();
 }
 
@@ -362,7 +362,7 @@
   printer_discoverer_->AddObserver(this);
   if (!printer_discoverer_->StartDiscovery()) {
     CallJavascriptFunction("cr.webUIListenerCallback",
-                           base::StringValue("on-printer-discovery-failed"));
+                           base::Value("on-printer-discovery-failed"));
     printer_discoverer_->RemoveObserver(this);
   }
 }
@@ -386,13 +386,12 @@
   }
 
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("on-printer-discovered"),
-                         *printers_list);
+                         base::Value("on-printer-discovered"), *printers_list);
 }
 
 void CupsPrintersHandler::OnDiscoveryDone() {
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("on-printer-discovery-done"));
+                         base::Value("on-printer-discovery-done"));
 }
 
 }  // namespace settings

diff --git a/chrome/browser/ui/webui/settings/chromeos/date_time_handler.cc b/chrome/browser/ui/webui/settings/chromeos/date_time_handler.cc
index 605e28d..e21f0106 100644
--- a/chrome/browser/ui/webui/settings/chromeos/date_time_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/date_time_handler.cc

@@ -171,13 +171,13 @@
                            ->ShouldApplyResolvedTimezone();
 
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("time-zone-auto-detect-policy"),
+                         base::Value("time-zone-auto-detect-policy"),
                          base::Value(managed), base::Value(force_enabled));
 }
 
 void DateTimeHandler::SystemClockCanSetTimeChanged(bool can_set_time) {
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("can-set-date-time-changed"),
+                         base::Value("can-set-date-time-changed"),
                          base::Value(can_set_time));
 }
 

diff --git a/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc b/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc
index 72c7134..9ab0aa83 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.cc

@@ -76,7 +76,7 @@
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kHasChromeOSDiamondKey));
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("show-keys-changed"), has_caps_lock,
+                         base::Value("show-keys-changed"), has_caps_lock,
                          has_diamond_key);
 }
 

diff --git a/chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.cc b/chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.cc
index a82f579..7b36f47 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.cc

@@ -37,14 +37,13 @@
 
 void PointerHandler::TouchpadExists(bool exists) {
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("has-touchpad-changed"),
+                         base::Value("has-touchpad-changed"),
                          base::Value(exists));
 }
 
 void PointerHandler::MouseExists(bool exists) {
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("has-mouse-changed"),
-                         base::Value(exists));
+                         base::Value("has-mouse-changed"), base::Value(exists));
 }
 
 void PointerHandler::HandleInitialize(const base::ListValue* args) {

diff --git a/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc b/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc
index 383b155..8e4cc5f 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/device_power_handler.cc

@@ -116,8 +116,7 @@
   battery_dict.SetString("statusText", status_text);
 
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("battery-status-changed"),
-                         battery_dict);
+                         base::Value("battery-status-changed"), battery_dict);
 }
 
 void PowerHandler::SendPowerSources() {
@@ -131,10 +130,10 @@
     sources_list.Append(std::move(dict));
   }
 
-  CallJavascriptFunction(
-      "cr.webUIListenerCallback", base::StringValue("power-sources-changed"),
-      sources_list, base::StringValue(power_status_->GetCurrentPowerSourceID()),
-      base::Value(power_status_->IsUsbChargerConnected()));
+  CallJavascriptFunction("cr.webUIListenerCallback",
+                         base::Value("power-sources-changed"), sources_list,
+                         base::Value(power_status_->GetCurrentPowerSourceID()),
+                         base::Value(power_status_->IsUsbChargerConnected()));
 }
 
 }  // namespace settings

diff --git a/chrome/browser/ui/webui/settings/chromeos/device_storage_handler.cc b/chrome/browser/ui/webui/settings/chromeos/device_storage_handler.cc
index e33ec523..a5bc189 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_storage_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/device_storage_handler.cc

@@ -167,8 +167,7 @@
   size_stat.SetInteger("spaceState", storage_space_state);
 
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("storage-size-stat-changed"),
-                         size_stat);
+                         base::Value("storage-size-stat-changed"), size_stat);
 }
 
 void StorageHandler::UpdateDownloadsSize() {
@@ -190,8 +189,8 @@
 void StorageHandler::OnGetDownloadsSize(int64_t size) {
   updating_downloads_size_ = false;
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("storage-downloads-size-changed"),
-                         base::StringValue(ui::FormatBytes(size)));
+                         base::Value("storage-downloads-size-changed"),
+                         base::Value(ui::FormatBytes(size)));
 }
 
 void StorageHandler::UpdateDriveCacheSize() {
@@ -205,7 +204,7 @@
 
   // Shows the item "Offline cache" and start calculating size.
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("storage-drive-enabled-changed"),
+                         base::Value("storage-drive-enabled-changed"),
                          base::Value(true));
   updating_drive_cache_size_ = true;
   file_system->CalculateCacheSize(
@@ -215,8 +214,8 @@
 void StorageHandler::OnGetDriveCacheSize(int64_t size) {
   updating_drive_cache_size_ = false;
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("storage-drive-cache-size-changed"),
-                         base::StringValue(ui::FormatBytes(size)),
+                         base::Value("storage-drive-cache-size-changed"),
+                         base::Value(ui::FormatBytes(size)),
                          base::Value(size > 0));
 }
 
@@ -285,10 +284,9 @@
           IDS_OPTIONS_SETTINGS_STORAGE_SIZE_UNKNOWN);
     }
     updating_browsing_data_size_ = false;
-    CallJavascriptFunction(
-        "cr.webUIListenerCallback",
-        base::StringValue("storage-browsing-data-size-changed"),
-        base::StringValue(size_string));
+    CallJavascriptFunction("cr.webUIListenerCallback",
+                           base::Value("storage-browsing-data-size-changed"),
+                           base::Value(size_string));
   }
 }
 
@@ -313,10 +311,9 @@
   // We should show "0 B" if there is no other user.
   if (other_users_.empty()) {
     updating_other_users_size_ = false;
-    CallJavascriptFunction(
-        "cr.webUIListenerCallback",
-        base::StringValue("storage-other-users-size-changed"),
-        base::StringValue(ui::FormatBytes(0)));
+    CallJavascriptFunction("cr.webUIListenerCallback",
+                           base::Value("storage-other-users-size-changed"),
+                           base::Value(ui::FormatBytes(0)));
   }
 }
 
@@ -333,10 +330,9 @@
           IDS_OPTIONS_SETTINGS_STORAGE_SIZE_UNKNOWN);
     }
     updating_other_users_size_ = false;
-    CallJavascriptFunction(
-        "cr.webUIListenerCallback",
-        base::StringValue("storage-other-users-size-changed"),
-        base::StringValue(size_string));
+    CallJavascriptFunction("cr.webUIListenerCallback",
+                           base::Value("storage-other-users-size-changed"),
+                           base::Value(size_string));
   }
 }
 
@@ -353,7 +349,7 @@
 
   // Shows the item "Android apps and cache" and start calculating size.
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("storage-android-enabled-changed"),
+                         base::Value("storage-android-enabled-changed"),
                          base::Value(true));
   bool success = arc::ArcStorageManager::Get()->GetApplicationsSize(
       base::Bind(&StorageHandler::OnGetAndroidSize,
@@ -376,8 +372,8 @@
   }
   updating_android_size_ = false;
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("storage-android-size-changed"),
-                         base::StringValue(size_string));
+                         base::Value("storage-android-size-changed"),
+                         base::Value(size_string));
 }
 
 void StorageHandler::OnClearDriveCacheDone(bool success) {

diff --git a/chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.cc b/chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.cc
index 1f752da..34546b27 100644
--- a/chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.cc

@@ -85,8 +85,8 @@
 
   AllowJavascript();
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("onNoteTakingAppsUpdated"),
-                         apps_list, base::Value(waiting_for_android));
+                         base::Value("onNoteTakingAppsUpdated"), apps_list,
+                         base::Value(waiting_for_android));
 }
 
 void StylusHandler::RequestApps(const base::ListValue* unused_args) {
@@ -117,7 +117,7 @@
   DCHECK(ui::InputDeviceManager::GetInstance()->AreDeviceListsComplete());
   AllowJavascript();
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("has-stylus-changed"),
+                         base::Value("has-stylus-changed"),
                          base::Value(ash::palette_utils::HasStylusInput()));
 }
 

diff --git a/chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.cc b/chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.cc
index b1f0002..c16ef08 100644
--- a/chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler.cc

@@ -87,14 +87,13 @@
 
 void EasyUnlockSettingsHandler::OnTurnOffOperationStatusChanged() {
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("easy-unlock-turn-off-flow-status"),
-                         base::StringValue(GetTurnOffFlowStatus()));
+                         base::Value("easy-unlock-turn-off-flow-status"),
+                         base::Value(GetTurnOffFlowStatus()));
 }
 
 void EasyUnlockSettingsHandler::SendEnabledStatus() {
   CallJavascriptFunction(
-      "cr.webUIListenerCallback",
-      base::StringValue("easy-unlock-enabled-status"),
+      "cr.webUIListenerCallback", base::Value("easy-unlock-enabled-status"),
       base::Value(EasyUnlockService::Get(profile_)->IsEnabled()));
 }
 
@@ -145,8 +144,7 @@
   CHECK_EQ(1U, args->GetSize());
   const base::Value* callback_id;
   CHECK(args->Get(0, &callback_id));
-  ResolveJavascriptCallback(*callback_id,
-                            base::StringValue(GetTurnOffFlowStatus()));
+  ResolveJavascriptCallback(*callback_id, base::Value(GetTurnOffFlowStatus()));
 }
 
 void EasyUnlockSettingsHandler::HandleStartTurnOffFlow(

diff --git a/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.cc b/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.cc
index 542a575e..634da77 100644
--- a/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.cc

@@ -28,8 +28,8 @@
 
   DCHECK(int{fingerprints_list.size()} <= kMaxAllowedFingerprints);
   for (auto& fingerprint_name: fingerprints_list) {
-    std::unique_ptr<base::StringValue> str =
-        base::MakeUnique<base::StringValue>(fingerprint_name);
+    std::unique_ptr<base::Value> str =
+        base::MakeUnique<base::Value>(fingerprint_name);
     fingerprints->Append(std::move(str));
   }
 
@@ -102,7 +102,7 @@
 
   std::unique_ptr<base::DictionaryValue> fingerprint_info =
       GetFingerprintsInfo(fingerprints_list_);
-  ResolveJavascriptCallback(base::StringValue(callback_id), *fingerprint_info);
+  ResolveJavascriptCallback(base::Value(callback_id), *fingerprint_info);
 }
 
 void FingerprintHandler::HandleGetNumFingerprints(const base::ListValue* args) {
@@ -112,7 +112,7 @@
   std::string callback_id;
   CHECK(args->GetString(0, &callback_id));
 
-  ResolveJavascriptCallback(base::StringValue(callback_id),
+  ResolveJavascriptCallback(base::Value(callback_id),
                             base::Value(int{fingerprints_list_.size()}));
 }
 
@@ -133,8 +133,8 @@
   CHECK(args->GetInteger(1, &index));
 
   DCHECK(index < int{fingerprints_list_.size()});
-  ResolveJavascriptCallback(base::StringValue(callback_id),
-                            base::StringValue(fingerprints_list_[index]));
+  ResolveJavascriptCallback(base::Value(callback_id),
+                            base::Value(fingerprints_list_[index]));
 }
 
 void FingerprintHandler::HandleRemoveEnrollment(const base::ListValue* args) {
@@ -149,7 +149,7 @@
   DCHECK(index < int{fingerprints_list_.size()});
   bool deleteSucessful = true;
   fingerprints_list_.erase(fingerprints_list_.begin() + index);
-  ResolveJavascriptCallback(base::StringValue(callback_id),
+  ResolveJavascriptCallback(base::Value(callback_id),
                             base::Value(deleteSucessful));
 }
 

diff --git a/chrome/browser/ui/webui/settings/downloads_handler.cc b/chrome/browser/ui/webui/settings/downloads_handler.cc
index 4cbb9ac..7eacb649 100644
--- a/chrome/browser/ui/webui/settings/downloads_handler.cc
+++ b/chrome/browser/ui/webui/settings/downloads_handler.cc

@@ -68,7 +68,7 @@
   bool auto_open_downloads =
       manager && DownloadPrefs::FromDownloadManager(manager)->IsAutoOpenUsed();
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("auto-open-downloads-changed"),
+                         base::Value("auto-open-downloads-changed"),
                          base::Value(auto_open_downloads));
 }
 

diff --git a/chrome/browser/ui/webui/settings/font_handler.cc b/chrome/browser/ui/webui/settings/font_handler.cc
index 7eb28f0..4d7c4c3 100644
--- a/chrome/browser/ui/webui/settings/font_handler.cc
+++ b/chrome/browser/ui/webui/settings/font_handler.cc

@@ -104,7 +104,7 @@
 void FontHandler::NotifyAdvancedFontSettingsAvailability() {
   CallJavascriptFunction(
       "cr.webUIListenerCallback",
-      base::StringValue("advanced-font-settings-installed"),
+      base::Value("advanced-font-settings-installed"),
       base::Value(GetAdvancedFontSettingsExtension() != nullptr));
 }
 
@@ -144,7 +144,7 @@
       "extensionUrl",
       extension_url.Resolve(kAdvancedFontSettingsExtensionId).spec());
 
-  ResolveJavascriptCallback(base::StringValue(callback_id), response);
+  ResolveJavascriptCallback(base::Value(callback_id), response);
 }
 
 }  // namespace settings

diff --git a/chrome/browser/ui/webui/settings/languages_handler.cc b/chrome/browser/ui/webui/settings/languages_handler.cc
index 52ea1a1b..d3b4595c 100644
--- a/chrome/browser/ui/webui/settings/languages_handler.cc
+++ b/chrome/browser/ui/webui/settings/languages_handler.cc

@@ -61,7 +61,7 @@
         g_browser_process->local_state()->GetString(prefs::kApplicationLocale);
   }
 
-  ResolveJavascriptCallback(*callback_id, base::StringValue(locale));
+  ResolveJavascriptCallback(*callback_id, base::Value(locale));
 #else
   NOTREACHED() << "Attempting to get locale on unsupported platform";
 #endif  // defined(OS_WIN) || defined(OS_CHROMEOS)

diff --git a/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc b/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc
index 05ec166..06feda9 100644
--- a/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc
+++ b/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc

@@ -96,10 +96,9 @@
 }
 
 void MetricsReportingHandler::SendMetricsReportingChange() {
-  CallJavascriptFunction(
-      "cr.webUIListenerCallback",
-      base::StringValue("metrics-reporting-change"),
-      *CreateMetricsReportingDict());
+  CallJavascriptFunction("cr.webUIListenerCallback",
+                         base::Value("metrics-reporting-change"),
+                         *CreateMetricsReportingDict());
 }
 
 }  // namespace settings

diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc
index fd07196c..0ff3858 100644
--- a/chrome/browser/ui/webui/settings/people_handler.cc
+++ b/chrome/browser/ui/webui/settings/people_handler.cc

@@ -324,8 +324,8 @@
                              &PeopleHandler::DisplayTimeout);
 
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("page-status-changed"),
-                         base::StringValue(kSpinnerPageStatus));
+                         base::Value("page-status-changed"),
+                         base::Value(kSpinnerPageStatus));
 }
 
 void PeopleHandler::DisplayTimeout() {
@@ -336,8 +336,8 @@
   sync_startup_tracker_.reset();
 
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("page-status-changed"),
-                         base::StringValue(kTimeoutPageStatus));
+                         base::Value("page-status-changed"),
+                         base::Value(kTimeoutPageStatus));
 }
 
 void PeopleHandler::OnDidClosePage(const base::ListValue* args) {
@@ -391,7 +391,7 @@
   // dialog.
   if (!service || !service->IsEngineInitialized()) {
     CloseSyncSetup();
-    ResolveJavascriptCallback(*callback_id, base::StringValue(kDonePageStatus));
+    ResolveJavascriptCallback(*callback_id, base::Value(kDonePageStatus));
     return;
   }
 
@@ -399,8 +399,7 @@
                                 configuration.data_types);
 
   // Choosing data types to sync never fails.
-  ResolveJavascriptCallback(*callback_id,
-                            base::StringValue(kConfigurePageStatus));
+  ResolveJavascriptCallback(*callback_id, base::Value(kConfigurePageStatus));
 
   ProfileMetrics::LogProfileSyncInfo(ProfileMetrics::SYNC_CUSTOMIZE);
   if (!configuration.sync_everything)
@@ -422,7 +421,7 @@
   // dialog.
   if (!service || !service->IsEngineInitialized()) {
     CloseSyncSetup();
-    ResolveJavascriptCallback(*callback_id, base::StringValue(kDonePageStatus));
+    ResolveJavascriptCallback(*callback_id, base::Value(kDonePageStatus));
     return;
   }
 
@@ -473,10 +472,9 @@
     // TODO(tommycli): Switch this to RejectJavascriptCallback once the
     // Sync page JavaScript has been further refactored.
     ResolveJavascriptCallback(*callback_id,
-                              base::StringValue(kPassphraseFailedPageStatus));
+                              base::Value(kPassphraseFailedPageStatus));
   } else {
-    ResolveJavascriptCallback(*callback_id,
-                              base::StringValue(kConfigurePageStatus));
+    ResolveJavascriptCallback(*callback_id, base::Value(kConfigurePageStatus));
   }
 
   if (configuration.encrypt_all)
@@ -698,8 +696,8 @@
 void PeopleHandler::CloseUI() {
   CloseSyncSetup();
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("page-status-changed"),
-                         base::StringValue(kDonePageStatus));
+                         base::Value("page-status-changed"),
+                         base::Value(kDonePageStatus));
 }
 
 void PeopleHandler::GoogleSigninSucceeded(const std::string& /* account_id */,
@@ -888,7 +886,7 @@
   }
 
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("sync-prefs-changed"), args);
+                         base::Value("sync-prefs-changed"), args);
 }
 
 LoginUIService* PeopleHandler::GetLoginUIService() const {
@@ -897,7 +895,7 @@
 
 void PeopleHandler::UpdateSyncStatus() {
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("sync-status-changed"),
+                         base::Value("sync-status-changed"),
                          *GetSyncStatusDictionary());
 }
 

diff --git a/chrome/browser/ui/webui/settings/profile_info_handler.cc b/chrome/browser/ui/webui/settings/profile_info_handler.cc
index 175dac3..d6510f5 100644
--- a/chrome/browser/ui/webui/settings/profile_info_handler.cc
+++ b/chrome/browser/ui/webui/settings/profile_info_handler.cc

@@ -152,7 +152,7 @@
   // available. Therefore, webUIListenerCallback mechanism is used instead of
   // the Promise callback approach.
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue(kProfileStatsCountReadyEventName),
+                         base::Value(kProfileStatsCountReadyEventName),
                          base::Value(count));
 }
 #endif
@@ -171,14 +171,14 @@
 
 void ProfileInfoHandler::PushProfileInfo() {
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue(kProfileInfoChangedEventName),
+                         base::Value(kProfileInfoChangedEventName),
                          *GetAccountNameAndIcon());
 }
 
 void ProfileInfoHandler::PushProfileManagesSupervisedUsersStatus() {
   CallJavascriptFunction(
       "cr.webUIListenerCallback",
-      base::StringValue(kProfileManagesSupervisedUsersChangedEventName),
+      base::Value(kProfileManagesSupervisedUsersChangedEventName),
       base::Value(IsProfileManagingSupervisedUsers()));
 }
 

diff --git a/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc b/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc
index 42610c6..70d02e81 100644
--- a/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc
+++ b/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc

@@ -128,10 +128,9 @@
   std::unique_ptr<base::ListValue> ignored_handlers(new base::ListValue());
   GetIgnoredHandlers(ignored_handlers.get());
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("setProtocolHandlers"),
-                         handlers);
+                         base::Value("setProtocolHandlers"), handlers);
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("setIgnoredProtocolHandlers"),
+                         base::Value("setIgnoredProtocolHandlers"),
                          *ignored_handlers);
 }
 
@@ -150,7 +149,7 @@
 
 void ProtocolHandlersHandler::SendHandlersEnabledValue() {
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("setHandlersEnabled"),
+                         base::Value("setHandlersEnabled"),
                          base::Value(GetProtocolHandlerRegistry()->enabled()));
 }
 

diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome/browser/ui/webui/settings/reset_settings_handler.cc
index 372af03..ca62979 100644
--- a/chrome/browser/ui/webui/settings/reset_settings_handler.cc
+++ b/chrome/browser/ui/webui/settings/reset_settings_handler.cc

@@ -157,8 +157,8 @@
     std::string callback_id,
     bool send_feedback,
     reset_report::ChromeResetReport::ResetRequestOrigin request_origin) {
-  ResolveJavascriptCallback(
-      base::StringValue(callback_id), *base::Value::CreateNullValue());
+  ResolveJavascriptCallback(base::Value(callback_id),
+                            *base::Value::CreateNullValue());
   if (send_feedback && setting_snapshot_) {
     ResettableSettingsSnapshot current_snapshot(profile_);
     int difference = setting_snapshot_->FindDifferentFields(current_snapshot);
@@ -192,7 +192,7 @@
 void ResetSettingsHandler::OnGetReportedSettingsDone(std::string callback_id) {
   std::unique_ptr<base::ListValue> list =
       GetReadableFeedbackForSnapshot(profile_, *setting_snapshot_);
-  ResolveJavascriptCallback(base::StringValue(callback_id), *list);
+  ResolveJavascriptCallback(base::Value(callback_id), *list);
 }
 
 void ResetSettingsHandler::OnShowResetProfileDialog(
@@ -294,7 +294,7 @@
         IDS_TRIGGERED_RESET_PROFILE_SETTINGS_DEFAULT_TOOL_NAME);
   }
 
-  base::StringValue string_value(reset_tool_name);
+  base::Value string_value(reset_tool_name);
   ResolveJavascriptCallback(*callback_id, string_value);
 }
 

diff --git a/chrome/browser/ui/webui/settings/safe_browsing_handler.cc b/chrome/browser/ui/webui/settings/safe_browsing_handler.cc
index 918dcf9..1490781 100644
--- a/chrome/browser/ui/webui/settings/safe_browsing_handler.cc
+++ b/chrome/browser/ui/webui/settings/safe_browsing_handler.cc

@@ -64,9 +64,9 @@
          pref_name == prefs::kSafeBrowsingScoutReportingEnabled);
 
   base::Value is_enabled(safe_browsing::IsExtendedReportingEnabled(*prefs_));
-  CallJavascriptFunction(
-      "cr.webUIListenerCallback",
-      base::StringValue("safe-browsing-extended-reporting-change"), is_enabled);
+  CallJavascriptFunction("cr.webUIListenerCallback",
+                         base::Value("safe-browsing-extended-reporting-change"),
+                         is_enabled);
 }
 
 }  // namespace settings

diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.cc b/chrome/browser/ui/webui/settings/search_engines_handler.cc
index 53534e3..d5f70c77 100644
--- a/chrome/browser/ui/webui/settings/search_engines_handler.cc
+++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc

@@ -195,11 +195,11 @@
 void SearchEnginesHandler::OnModelChanged() {
   AllowJavascript();
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("search-engines-changed"),
+                         base::Value("search-engines-changed"),
                          *GetSearchEnginesList());
   // Google Now availability may have changed.
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("google-now-availability-changed"),
+                         base::Value("google-now-availability-changed"),
                          base::Value(IsGoogleNowAvailable(profile_)));
 }
 
@@ -518,7 +518,7 @@
     ResolveJavascriptCallback(*callback_id, status);
   } else {
     CallJavascriptFunction("cr.webUIListenerCallback",
-                           base::StringValue("hotword-info-update"), status);
+                           base::Value("hotword-info-update"), status);
   }
 }
 

diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
index dd8d078d..30f8aa2e 100644
--- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc

@@ -241,7 +241,7 @@
   UMA_HISTOGRAM_BOOLEAN(
       "History.ClearBrowsingData.ShownHistoryNoticeAfterClearing", show_notice);
 
-  ResolveJavascriptCallback(base::StringValue(webui_callback_id),
+  ResolveJavascriptCallback(base::Value(webui_callback_id),
                             base::Value(show_notice));
   task_observer_.reset();
 }
@@ -272,7 +272,7 @@
 
 void ClearBrowsingDataHandler::UpdateSyncState() {
   CallJavascriptFunction(
-      "cr.webUIListenerCallback", base::StringValue("update-footer"),
+      "cr.webUIListenerCallback", base::Value("update-footer"),
       base::Value(sync_service_ && sync_service_->IsSyncActive()),
       base::Value(show_history_footer_));
 }
@@ -326,9 +326,9 @@
 void ClearBrowsingDataHandler::UpdateCounterText(
     std::unique_ptr<browsing_data::BrowsingDataCounter::Result> result) {
   CallJavascriptFunction(
-      "cr.webUIListenerCallback", base::StringValue("update-counter-text"),
-      base::StringValue(result->source()->GetPrefName()),
-      base::StringValue(GetChromeCounterTextFromResult(result.get())));
+      "cr.webUIListenerCallback", base::Value("update-counter-text"),
+      base::Value(result->source()->GetPrefName()),
+      base::Value(GetChromeCounterTextFromResult(result.get())));
 }
 
 }  // namespace settings

diff --git a/chrome/browser/ui/webui/settings/settings_cookies_view_handler.cc b/chrome/browser/ui/webui/settings/settings_cookies_view_handler.cc
index d2d0b0e..fef6e14c 100644
--- a/chrome/browser/ui/webui/settings/settings_cookies_view_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_cookies_view_handler.cc

@@ -108,8 +108,7 @@
   args.SetInteger(kStart, start);
   args.Set(kChildren, std::move(children));
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("onTreeItemAdded"),
-                         args);
+                         base::Value("onTreeItemAdded"), args);
 }
 
 void CookiesViewHandler::TreeNodesRemoved(ui::TreeModel* model,
@@ -130,8 +129,7 @@
   args.SetInteger(kStart, start);
   args.SetInteger(kCount, count);
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("onTreeItemRemoved"),
-                         args);
+                         base::Value("onTreeItemRemoved"), args);
 }
 
 void CookiesViewHandler::TreeModelBeginBatch(CookiesTreeModel* model) {
@@ -199,7 +197,7 @@
       cookies_tree_model_->GetRoot(), base::UTF8ToUTF16(site));
 
   if (!node) {
-    RejectJavascriptCallback(base::StringValue(callback_id_),
+    RejectJavascriptCallback(base::Value(callback_id_),
                              *base::Value::CreateNullValue());
     callback_id_.clear();
     return;
@@ -262,7 +260,7 @@
     args.SetString(kId, model_util_->GetTreeNodeId(parent));
   args.Set(kChildren, std::move(children));
 
-  ResolveJavascriptCallback(base::StringValue(callback_id_), args);
+  ResolveJavascriptCallback(base::Value(callback_id_), args);
   callback_id_.clear();
 }
 
@@ -282,7 +280,7 @@
     args.SetString(kId, model_util_->GetTreeNodeId(parent));
   args.Set(kChildren, std::move(children));
 
-  ResolveJavascriptCallback(base::StringValue(callback_id_), args);
+  ResolveJavascriptCallback(base::Value(callback_id_), args);
   callback_id_.clear();
 }
 

diff --git a/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc b/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
index 867ac73d..f8cb64a 100644
--- a/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc

@@ -97,7 +97,8 @@
   dict.SetBoolean("isDisabledByPolicy", DefaultBrowserIsDisabledByPolicy());
 
   CallJavascriptFunction("cr.webUIListenerCallback",
-      base::StringValue("settings.updateDefaultBrowserState"), dict);
+                         base::Value("settings.updateDefaultBrowserState"),
+                         dict);
 }
 
 }  // namespace settings

diff --git a/chrome/browser/ui/webui/settings/settings_import_data_handler.cc b/chrome/browser/ui/webui/settings/settings_import_data_handler.cc
index ced4cd23..2b7a370 100644
--- a/chrome/browser/ui/webui/settings/settings_import_data_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_import_data_handler.cc

@@ -94,8 +94,8 @@
     importer_host_->set_observer(NULL);
 
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("import-data-status-changed"),
-                         base::StringValue(kImportStatusInProgress));
+                         base::Value("import-data-status-changed"),
+                         base::Value(kImportStatusInProgress));
   import_did_succeed_ = false;
 
   importer_host_ = new ExternalProcessImporterHost();
@@ -185,7 +185,7 @@
     browser_profiles.Append(std::move(browser_profile));
   }
 
-  ResolveJavascriptCallback(base::StringValue(callback_id), browser_profiles);
+  ResolveJavascriptCallback(base::Value(callback_id), browser_profiles);
 }
 
 void ImportDataHandler::ImportStarted() {
@@ -212,10 +212,9 @@
   importer_host_ = NULL;
 
   CallJavascriptFunction(
-      "cr.webUIListenerCallback",
-      base::StringValue("import-data-status-changed"),
-      base::StringValue(import_did_succeed_ ? kImportStatusSucceeded
-                                            : kImportStatusFailed));
+      "cr.webUIListenerCallback", base::Value("import-data-status-changed"),
+      base::Value(import_did_succeed_ ? kImportStatusSucceeded
+                                      : kImportStatusFailed));
 }
 
 void ImportDataHandler::FileSelected(const base::FilePath& path,

diff --git a/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc b/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc
index 6a00c7c..999d4f8e 100644
--- a/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc

@@ -92,7 +92,7 @@
     const base::FilePath& profile_path) {
   // This is necessary to send the potentially updated GAIA photo.
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("available-icons-changed"),
+                         base::Value("available-icons-changed"),
                          *GetAvailableIcons());
 }
 
@@ -194,8 +194,8 @@
   ProfileAttributesStorage& storage =
       g_browser_process->profile_manager()->GetProfileAttributesStorage();
   if (storage.GetNumberOfProfiles() <= 1u) {
-    ResolveJavascriptCallback(base::StringValue(callback_id),
-                              base::StringValue(kProfileShortcutSettingHidden));
+    ResolveJavascriptCallback(base::Value(callback_id),
+                              base::Value(kProfileShortcutSettingHidden));
     return;
   }
 
@@ -212,9 +212,9 @@
     const std::string& callback_id, bool has_shortcuts) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ResolveJavascriptCallback(
-      base::StringValue(callback_id),
-      base::StringValue(has_shortcuts ? kProfileShortcutFound
-                                      : kProfileShortcutNotFound));
+      base::Value(callback_id),
+      base::Value(has_shortcuts ? kProfileShortcutFound
+                                : kProfileShortcutNotFound));
 }
 
 void ManageProfileHandler::HandleAddProfileShortcut(

diff --git a/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc b/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc
index 8070f704..56093d1f 100644
--- a/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc

@@ -137,13 +137,11 @@
   if (!devices.empty() && default_id.empty())
     default_id = devices[0].id;
 
-  base::StringValue default_value(default_id);
-  base::StringValue type_value(device_type);
+  base::Value default_value(default_id);
+  base::Value type_value(device_type);
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("updateDevicesMenu"),
-                         type_value,
-                         device_list,
-                         default_value);
+                         base::Value("updateDevicesMenu"), type_value,
+                         device_list, default_value);
 }
 
 std::string MediaDevicesSelectionHandler::GetDeviceDisplayName(

diff --git a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc
index 2acbea12..c0b8702 100644
--- a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc

@@ -86,8 +86,7 @@
   }
 
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("update-startup-pages"),
-                         startup_pages);
+                         base::Value("update-startup-pages"), startup_pages);
 }
 
 void StartupPagesHandler::OnItemsChanged(int start, int length) {

diff --git a/chrome/browser/ui/webui/settings/site_settings_handler.cc b/chrome/browser/ui/webui/settings/site_settings_handler.cc
index 08b1e24e..824daae 100644
--- a/chrome/browser/ui/webui/settings/site_settings_handler.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_handler.cc

@@ -206,8 +206,8 @@
     if (entry.usage <= 0) continue;
     if (entry.host == usage_host_) {
       CallJavascriptFunction("settings.WebsiteUsagePrivateApi.returnUsageTotal",
-                             base::StringValue(entry.host),
-                             base::StringValue(ui::FormatBytes(entry.usage)),
+                             base::Value(entry.host),
+                             base::Value(ui::FormatBytes(entry.usage)),
                              base::Value(entry.type));
       return;
     }
@@ -217,7 +217,7 @@
 void SiteSettingsHandler::OnUsageInfoCleared(storage::QuotaStatusCode code) {
   if (code == storage::kQuotaStatusOk) {
     CallJavascriptFunction("settings.WebsiteUsagePrivateApi.onUsageCleared",
-                           base::StringValue(clearing_origin_));
+                           base::Value(clearing_origin_));
   }
 }
 
@@ -232,19 +232,19 @@
   if (primary_pattern.ToString().empty()) {
     CallJavascriptFunction(
         "cr.webUIListenerCallback",
-        base::StringValue("contentSettingCategoryChanged"),
-        base::StringValue(site_settings::ContentSettingsTypeToGroupName(
-            content_type)));
+        base::Value("contentSettingCategoryChanged"),
+        base::Value(
+            site_settings::ContentSettingsTypeToGroupName(content_type)));
   } else {
     CallJavascriptFunction(
         "cr.webUIListenerCallback",
-        base::StringValue("contentSettingSitePermissionChanged"),
-        base::StringValue(site_settings::ContentSettingsTypeToGroupName(
-            content_type)),
-        base::StringValue(primary_pattern.ToString()),
-        base::StringValue(
-            secondary_pattern == ContentSettingsPattern::Wildcard() ?
-            "" : secondary_pattern.ToString()));
+        base::Value("contentSettingSitePermissionChanged"),
+        base::Value(
+            site_settings::ContentSettingsTypeToGroupName(content_type)),
+        base::Value(primary_pattern.ToString()),
+        base::Value(secondary_pattern == ContentSettingsPattern::Wildcard()
+                        ? ""
+                        : secondary_pattern.ToString()));
   }
 }
 
@@ -617,7 +617,7 @@
       !(was_destroyed && profile == profile_->GetOffTheRecordProfile());
 
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("onIncognitoStatusChanged"),
+                         base::Value("onIncognitoStatusChanged"),
                          base::Value(incognito_enabled));
 }
 
@@ -703,7 +703,7 @@
   }
 
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("onZoomLevelsChanged"),
+                         base::Value("onZoomLevelsChanged"),
                          zoom_levels_exceptions);
 }
 

diff --git a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
index 57bd3f0f..34527db3a 100644
--- a/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc

@@ -292,7 +292,7 @@
   PrefService* pref_service = browser()->profile()->GetPrefs();
   ListPrefUpdate updater(pref_service,
                          prefs::kReverseAutologinRejectedEmailList);
-  updater->AppendIfNotPresent(base::MakeUnique<base::StringValue>(email));
+  updater->AppendIfNotPresent(base::MakeUnique<base::Value>(email));
 }
 
 void InlineLoginUIBrowserTest::AllowSigninCookies(bool enable) {

diff --git a/chrome/browser/ui/webui/signin/signin_create_profile_handler.cc b/chrome/browser/ui/webui/signin/signin_create_profile_handler.cc
index 299151962..c6f3282 100644
--- a/chrome/browser/ui/webui/signin/signin_create_profile_handler.cc
+++ b/chrome/browser/ui/webui/signin/signin_create_profile_handler.cc

@@ -184,7 +184,7 @@
 void SigninCreateProfileHandler::RequestDefaultProfileIcons(
     const base::ListValue* args) {
   web_ui()->CallJavascriptFunctionUnsafe(
-      "cr.webUIListenerCallback", base::StringValue("profile-icons-received"),
+      "cr.webUIListenerCallback", base::Value("profile-icons-received"),
       *profiles::GetDefaultProfileAvatarIconsAndLabels());
 
   SendNewProfileDefaults();
@@ -197,8 +197,8 @@
   profile_info.SetString("name", storage.ChooseNameForNewProfile(0));
 
   web_ui()->CallJavascriptFunctionUnsafe(
-      "cr.webUIListenerCallback",
-      base::StringValue("profile-defaults-received"), profile_info);
+      "cr.webUIListenerCallback", base::Value("profile-defaults-received"),
+      profile_info);
 }
 
 void SigninCreateProfileHandler::RequestSignedInProfiles(
@@ -219,9 +219,9 @@
 
     user_info_list.Append(std::move(user_info));
   }
-  web_ui()->CallJavascriptFunctionUnsafe(
-      "cr.webUIListenerCallback", base::StringValue("signedin-users-received"),
-      user_info_list);
+  web_ui()->CallJavascriptFunctionUnsafe("cr.webUIListenerCallback",
+                                         base::Value("signedin-users-received"),
+                                         user_info_list);
 }
 
 void SigninCreateProfileHandler::OnProfileAuthInfoChanged(
@@ -439,7 +439,7 @@
   DCHECK_NE(NO_CREATION_IN_PROGRESS, profile_creation_type_);
   web_ui()->CallJavascriptFunctionUnsafe(
       "cr.webUIListenerCallback", GetWebUIListenerName(PROFILE_CREATION_ERROR),
-      base::StringValue(error));
+      base::Value(error));
   // The ProfileManager calls us back with a NULL profile in some cases.
   if (profile) {
     webui::DeleteProfileAtPath(profile->GetPath(),
@@ -497,16 +497,16 @@
   }
 }
 
-base::StringValue SigninCreateProfileHandler::GetWebUIListenerName(
+base::Value SigninCreateProfileHandler::GetWebUIListenerName(
     ProfileCreationStatus status) const {
   switch (status) {
     case PROFILE_CREATION_SUCCESS:
-      return base::StringValue("create-profile-success");
+      return base::Value("create-profile-success");
     case PROFILE_CREATION_ERROR:
-      return base::StringValue("create-profile-error");
+      return base::Value("create-profile-error");
   }
   NOTREACHED();
-  return base::StringValue(std::string());
+  return base::Value(std::string());
 }
 
 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
@@ -768,9 +768,9 @@
 void SigninCreateProfileHandler::ShowProfileCreationWarning(
     const base::string16& warning) {
   DCHECK_EQ(SUPERVISED_PROFILE_CREATION, profile_creation_type_);
-  web_ui()->CallJavascriptFunctionUnsafe(
-      "cr.webUIListenerCallback", base::StringValue("create-profile-warning"),
-      base::StringValue(warning));
+  web_ui()->CallJavascriptFunctionUnsafe("cr.webUIListenerCallback",
+                                         base::Value("create-profile-warning"),
+                                         base::Value(warning));
 }
 
 void SigninCreateProfileHandler::RecordSupervisedProfileCreationMetrics(

diff --git a/chrome/browser/ui/webui/signin/signin_create_profile_handler.h b/chrome/browser/ui/webui/signin/signin_create_profile_handler.h
index 46c5de5..87bf6e4 100644
--- a/chrome/browser/ui/webui/signin/signin_create_profile_handler.h
+++ b/chrome/browser/ui/webui/signin/signin_create_profile_handler.h

@@ -158,7 +158,7 @@
 
   base::string16 GetProfileCreationErrorMessageLocal() const;
 
-  base::StringValue GetWebUIListenerName(ProfileCreationStatus status) const;
+  base::Value GetWebUIListenerName(ProfileCreationStatus status) const;
 
   // Used to allow canceling a profile creation (particularly a supervised-user
   // registration) in progress. Set when profile creation is begun, and

diff --git a/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler.cc b/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler.cc
index 1a53687..f7e115ff 100644
--- a/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler.cc
+++ b/chrome/browser/ui/webui/signin/signin_supervised_user_import_handler.cc

@@ -218,9 +218,7 @@
 
 void SigninSupervisedUserImportHandler::RejectCallback(
     const base::string16& error) {
-  RejectJavascriptCallback(
-      base::StringValue(webui_callback_id_),
-      base::StringValue(error));
+  RejectJavascriptCallback(base::Value(webui_callback_id_), base::Value(error));
   webui_callback_id_.clear();
 }
 
@@ -297,9 +295,7 @@
   }
 
   // Resolve callback with response.
-  ResolveJavascriptCallback(
-      base::StringValue(webui_callback_id_),
-      supervised_users);
+  ResolveJavascriptCallback(base::Value(webui_callback_id_), supervised_users);
   webui_callback_id_.clear();
 }
 

diff --git a/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc b/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
index 1bc5644..4cd0b140 100644
--- a/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
+++ b/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc

@@ -86,7 +86,7 @@
     // Use the placeholder avatar icon until the account picture URL is fetched.
     picture_url_to_load = profiles::GetPlaceholderAvatarIconUrl();
   }
-  base::StringValue picture_url_value(picture_url_to_load);
+  base::Value picture_url_value(picture_url_to_load);
   web_ui()->CallJavascriptFunctionUnsafe("sync.confirmation.setUserImageURL",
                                          picture_url_value);
 }

diff --git a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
index 26c0eee0..142e598 100644
--- a/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc
+++ b/chrome/browser/ui/webui/signin/user_manager_screen_handler.cc

@@ -322,8 +322,7 @@
 void UserManagerScreenHandler::ShowBannerMessage(
     const base::string16& message) {
   web_ui()->CallJavascriptFunctionUnsafe(
-      "login.AccountPickerScreen.showBannerMessage",
-      base::StringValue(message));
+      "login.AccountPickerScreen.showBannerMessage", base::Value(message));
 }
 
 void UserManagerScreenHandler::ShowUserPodCustomIcon(
@@ -336,14 +335,14 @@
     return;
   web_ui()->CallJavascriptFunctionUnsafe(
       "login.AccountPickerScreen.showUserPodCustomIcon",
-      base::StringValue(account_id.GetUserEmail()), *icon);
+      base::Value(account_id.GetUserEmail()), *icon);
 }
 
 void UserManagerScreenHandler::HideUserPodCustomIcon(
     const AccountId& account_id) {
   web_ui()->CallJavascriptFunctionUnsafe(
       "login.AccountPickerScreen.hideUserPodCustomIcon",
-      base::StringValue(account_id.GetUserEmail()));
+      base::Value(account_id.GetUserEmail()));
 }
 
 void UserManagerScreenHandler::EnableInput() {
@@ -361,8 +360,8 @@
   user_auth_type_map_[account_id.GetUserEmail()] = auth_type;
   web_ui()->CallJavascriptFunctionUnsafe(
       "login.AccountPickerScreen.setAuthType",
-      base::StringValue(account_id.GetUserEmail()), base::Value(auth_type),
-      base::StringValue(auth_value));
+      base::Value(account_id.GetUserEmail()), base::Value(auth_type),
+      base::Value(auth_value));
 }
 
 proximity_auth::ScreenlockBridge::LockHandler::AuthType
@@ -500,9 +499,8 @@
 
   if (profiles::AreAllNonChildNonSupervisedProfilesLocked()) {
     web_ui()->CallJavascriptFunctionUnsafe(
-        "cr.webUIListenerCallback",
-        base::StringValue("show-error-dialog"),
-        base::StringValue(l10n_util::GetStringUTF8(
+        "cr.webUIListenerCallback", base::Value("show-error-dialog"),
+        base::Value(l10n_util::GetStringUTF8(
             IDS_USER_MANAGER_REMOVE_PROFILE_PROFILES_LOCKED_ERROR)));
     return;
   }
@@ -535,7 +533,7 @@
 
   AllowJavascript();
   ResolveJavascriptCallback(
-      base::StringValue(webui_callback_id),
+      base::Value(webui_callback_id),
       base::Value(profiles::AreAllNonChildNonSupervisedProfilesLocked()));
 }
 
@@ -603,7 +601,7 @@
   if (!base::GetValueAsFilePath(*profile_path_value, &profile_path))
     return;
 
-  base::StringValue return_profile_path(profile_path.value());
+  base::Value return_profile_path(profile_path.value());
   Profile* profile = g_browser_process->profile_manager()->
       GetProfileByPath(profile_path);
 
@@ -630,9 +628,9 @@
       stats_success &= item.success;
     }
     if (stats_success) {
-      web_ui()->CallJavascriptFunctionUnsafe(
-          "updateRemoveWarningDialog", base::StringValue(profile_path.value()),
-          return_value);
+      web_ui()->CallJavascriptFunctionUnsafe("updateRemoveWarningDialog",
+                                             base::Value(profile_path.value()),
+                                             return_value);
       return;
     }
   }
@@ -654,9 +652,9 @@
     stat->SetBooleanWithoutPathExpansion("success", item.success);
     return_value.SetWithoutPathExpansion(item.category, std::move(stat));
   }
-  web_ui()->CallJavascriptFunctionUnsafe(
-      "updateRemoveWarningDialog", base::StringValue(profile_path.value()),
-      return_value);
+  web_ui()->CallJavascriptFunctionUnsafe("updateRemoveWarningDialog",
+                                         base::Value(profile_path.value()),
+                                         return_value);
 }
 
 void UserManagerScreenHandler::HandleGetRemoveWarningDialogMessage(
@@ -684,12 +682,12 @@
       (has_errors ? IDS_LOGIN_POD_USER_REMOVE_WARNING_NONSYNC_WITH_ERRORS :
                     IDS_LOGIN_POD_USER_REMOVE_WARNING_NONSYNC);
 
-  base::StringValue message = base::StringValue(
-      l10n_util::GetPluralStringFUTF16(message_id, total_count));
+  base::Value message =
+      base::Value(l10n_util::GetPluralStringFUTF16(message_id, total_count));
 
   web_ui()->CallJavascriptFunctionUnsafe("updateRemoveWarningDialogSetMessage",
-                                         base::StringValue(profile_path),
-                                         message, base::Value(total_count));
+                                         base::Value(profile_path), message,
+                                         base::Value(total_count));
 }
 
 void UserManagerScreenHandler::OnGetTokenInfoResponse(
@@ -998,11 +996,11 @@
   } else {
     web_ui()->CallJavascriptFunctionUnsafe(
         "cr.ui.UserManager.showSignInError", base::Value(0),
-        base::StringValue(l10n_util::GetStringUTF8(
+        base::Value(l10n_util::GetStringUTF8(
             auth == ProfileMetrics::AUTH_FAILED_OFFLINE
                 ? IDS_LOGIN_ERROR_AUTHENTICATING_OFFLINE
                 : IDS_LOGIN_ERROR_AUTHENTICATING)),
-        base::StringValue(""), base::Value(0));
+        base::Value(""), base::Value(0));
   }
 }
 

diff --git a/chrome/browser/ui/webui/snippets_internals_message_handler.cc b/chrome/browser/ui/webui/snippets_internals_message_handler.cc
index a186159f..c67289d6 100644
--- a/chrome/browser/ui/webui/snippets_internals_message_handler.cc
+++ b/chrome/browser/ui/webui/snippets_internals_message_handler.cc

@@ -317,7 +317,7 @@
     SendString("switch-fetch-url", fetcher->fetch_url().spec());
     web_ui()->CallJavascriptFunctionUnsafe(
         "chrome.SnippetsInternals.receiveJson",
-        base::StringValue(fetcher->last_json()));
+        base::Value(fetcher->last_json()));
   }
 
   SendContentSuggestions();
@@ -326,8 +326,8 @@
 void SnippetsInternalsMessageHandler::SendClassification() {
   web_ui()->CallJavascriptFunctionUnsafe(
       "chrome.SnippetsInternals.receiveClassification",
-      base::StringValue(content_suggestions_service_->user_classifier()
-                            ->GetUserClassDescriptionForDebugging()),
+      base::Value(content_suggestions_service_->user_classifier()
+                      ->GetUserClassDescriptionForDebugging()),
       base::Value(
           content_suggestions_service_->user_classifier()->GetEstimatedAvgTime(
               UserClassifier::Metric::NTP_OPENED)),
@@ -346,7 +346,7 @@
   web_ui()->CallJavascriptFunctionUnsafe(
       "chrome.SnippetsInternals."
       "receiveLastRemoteSuggestionsBackgroundFetchTime",
-      base::StringValue(base::TimeFormatShortDateAndTime(time)));
+      base::Value(base::TimeFormatShortDateAndTime(time)));
 }
 
 void SnippetsInternalsMessageHandler::SendContentSuggestions() {
@@ -408,8 +408,8 @@
 
 void SnippetsInternalsMessageHandler::SendString(const std::string& name,
                                                  const std::string& value) {
-  base::StringValue string_name(name);
-  base::StringValue string_value(value);
+  base::Value string_name(name);
+  base::Value string_value(value);
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "chrome.SnippetsInternals.receiveProperty", string_name, string_value);

diff --git a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc
index 57872aac..2bd6144 100644
--- a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc
+++ b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc

@@ -86,7 +86,7 @@
   // TODO(calvinlo): OnSyncStateUpdated should be updated to also provide the
   // notification mechanism (XMPP or Polling).
   web_ui()->CallJavascriptFunctionUnsafe("SyncService.onGetServiceStatus",
-                                         base::StringValue(state_string));
+                                         base::Value(state_string));
 }
 
 void SyncFileSystemInternalsHandler::OnFileSynced(
@@ -121,7 +121,7 @@
   const std::string state_string = extensions::api::sync_file_system::ToString(
       extensions::SyncServiceStateToExtensionEnum(state_enum));
   web_ui()->CallJavascriptFunctionUnsafe("SyncService.onGetServiceStatus",
-                                         base::StringValue(state_string));
+                                         base::Value(state_string));
 }
 
 void SyncFileSystemInternalsHandler::GetNotificationSource(
@@ -132,9 +132,8 @@
     return;
   bool xmpp_enabled = drive_notification_manager->push_notification_enabled();
   std::string notification_source = xmpp_enabled ? "XMPP" : "Polling";
-  web_ui()->CallJavascriptFunctionUnsafe(
-      "SyncService.onGetNotificationSource",
-      base::StringValue(notification_source));
+  web_ui()->CallJavascriptFunctionUnsafe("SyncService.onGetNotificationSource",
+                                         base::Value(notification_source));
 }
 
 void SyncFileSystemInternalsHandler::GetLog(

diff --git a/chrome/browser/ui/webui/sync_internals_message_handler.cc b/chrome/browser/ui/webui/sync_internals_message_handler.cc
index 4a5a532..eab283c 100644
--- a/chrome/browser/ui/webui/sync_internals_message_handler.cc
+++ b/chrome/browser/ui/webui/sync_internals_message_handler.cc

@@ -147,8 +147,7 @@
   event_details.Set(syncer::sync_ui_util::kTypes, type_list.release());
   web_ui()->CallJavascriptFunctionUnsafe(
       syncer::sync_ui_util::kDispatchEvent,
-      base::StringValue(syncer::sync_ui_util::kOnReceivedListOfTypes),
-      event_details);
+      base::Value(syncer::sync_ui_util::kOnReceivedListOfTypes), event_details);
 }
 
 void SyncInternalsMessageHandler::HandleGetAllNodes(
@@ -184,7 +183,7 @@
       syncer::ProtocolEvent::ToValue(event));
   web_ui()->CallJavascriptFunctionUnsafe(
       syncer::sync_ui_util::kDispatchEvent,
-      base::StringValue(syncer::sync_ui_util::kOnProtocolEvent), *value);
+      base::Value(syncer::sync_ui_util::kOnProtocolEvent), *value);
 }
 
 void SyncInternalsMessageHandler::OnCommitCountersUpdated(
@@ -215,7 +214,7 @@
   details->Set(syncer::sync_ui_util::kCounters, value.release());
   web_ui()->CallJavascriptFunctionUnsafe(
       syncer::sync_ui_util::kDispatchEvent,
-      base::StringValue(syncer::sync_ui_util::kOnCountersUpdated), *details);
+      base::Value(syncer::sync_ui_util::kOnCountersUpdated), *details);
 }
 
 void SyncInternalsMessageHandler::HandleJsEvent(
@@ -224,8 +223,7 @@
   DVLOG(1) << "Handling event: " << name
            << " with details " << details.ToString();
   web_ui()->CallJavascriptFunctionUnsafe(syncer::sync_ui_util::kDispatchEvent,
-                                         base::StringValue(name),
-                                         details.Get());
+                                         base::Value(name), details.Get());
 }
 
 void SyncInternalsMessageHandler::SendAboutInfo() {
@@ -236,7 +234,7 @@
                                                             signin);
   web_ui()->CallJavascriptFunctionUnsafe(
       syncer::sync_ui_util::kDispatchEvent,
-      base::StringValue(syncer::sync_ui_util::kOnAboutInfoUpdated), *value);
+      base::Value(syncer::sync_ui_util::kOnAboutInfoUpdated), *value);
 }
 
 // Gets the ProfileSyncService of the underlying original profile.

diff --git a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
index 43bb3f9..8827d4e8 100644
--- a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
+++ b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc

@@ -89,23 +89,20 @@
   base::DictionaryValue dict;
   dict.Set("time",
            new base::Value(language_detection_details->time.ToJsTime()));
-  dict.Set("url",
-           new base::StringValue(language_detection_details->url.spec()));
+  dict.Set("url", new base::Value(language_detection_details->url.spec()));
   dict.Set("content_language",
-           new base::StringValue(language_detection_details->content_language));
+           new base::Value(language_detection_details->content_language));
   dict.Set("cld_language",
-           new base::StringValue(language_detection_details->cld_language));
+           new base::Value(language_detection_details->cld_language));
   dict.Set("is_cld_reliable",
            new base::Value(language_detection_details->is_cld_reliable));
   dict.Set("has_notranslate",
            new base::Value(language_detection_details->has_notranslate));
-  dict.Set(
-      "html_root_language",
-      new base::StringValue(language_detection_details->html_root_language));
+  dict.Set("html_root_language",
+           new base::Value(language_detection_details->html_root_language));
   dict.Set("adopted_language",
-           new base::StringValue(language_detection_details->adopted_language));
-  dict.Set("content",
-           new base::StringValue(language_detection_details->contents));
+           new base::Value(language_detection_details->adopted_language));
+  dict.Set("content", new base::Value(language_detection_details->contents));
   SendMessageToJs("languageDetectionInfoAdded", dict);
 }
 
@@ -113,7 +110,7 @@
     const translate::TranslateErrorDetails& details) {
   base::DictionaryValue dict;
   dict.Set("time", new base::Value(details.time.ToJsTime()));
-  dict.Set("url", new base::StringValue(details.url.spec()));
+  dict.Set("url", new base::Value(details.url.spec()));
   dict.Set("error", new base::Value(details.error));
   SendMessageToJs("translateErrorDetailsAdded", dict);
 }
@@ -122,9 +119,9 @@
     const translate::TranslateEventDetails& details) {
   base::DictionaryValue dict;
   dict.Set("time", new base::Value(details.time.ToJsTime()));
-  dict.Set("filename", new base::StringValue(details.filename));
+  dict.Set("filename", new base::Value(details.filename));
   dict.Set("line", new base::Value(details.line));
-  dict.Set("message", new base::StringValue(details.message));
+  dict.Set("message", new base::Value(details.message));
   SendMessageToJs("translateEventDetailsAdded", dict);
 }
 
@@ -187,7 +184,7 @@
 void TranslateInternalsHandler::SendMessageToJs(const std::string& message,
                                                 const base::Value& value) {
   const char func[] = "cr.translateInternals.messageHandler";
-  base::StringValue message_data(message);
+  base::Value message_data(message);
   web_ui()->CallJavascriptFunctionUnsafe(func, message_data, value);
 }
 
@@ -252,7 +249,7 @@
 
   base::DictionaryValue dict;
   if (!country.empty()) {
-    dict.Set("country", new base::StringValue(country));
+    dict.Set("country", new base::Value(country));
     dict.Set("update", new base::Value(was_updated));
   }
   SendMessageToJs("countryUpdated", dict);

diff --git a/chrome/browser/ui/webui/uber/uber_ui.cc b/chrome/browser/ui/webui/uber/uber_ui.cc
index e3f14a2..5cc1e167 100644
--- a/chrome/browser/ui/webui/uber/uber_ui.cc
+++ b/chrome/browser/ui/webui/uber/uber_ui.cc

@@ -133,8 +133,8 @@
                        chrome::kChromeUIHistoryHost);
   web_ui->CallJavascriptFunctionUnsafe(
       "uber_frame.setNavigationOverride",
-      base::StringValue(chrome::kChromeUIHistoryHost),
-      base::StringValue(overrides_history ? "yes" : "no"));
+      base::Value(chrome::kChromeUIHistoryHost),
+      base::Value(overrides_history ? "yes" : "no"));
 }
 
 }  // namespace

diff --git a/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc b/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc
index f3b9676..ef6ea8f 100644
--- a/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc
+++ b/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc

@@ -22,7 +22,7 @@
 void UserActionsUIHandler::RegisterMessages() {}
 
 void UserActionsUIHandler::OnUserAction(const std::string& action) {
-  base::StringValue user_action_name(action);
+  base::Value user_action_name(action);
   web_ui()->CallJavascriptFunctionUnsafe("userActions.observeUserAction",
                                          user_action_name);
 }

diff --git a/chrome/browser/ui/webui/version_handler.cc b/chrome/browser/ui/webui/version_handler.cc
index b044d55..3d7f7ba7 100644
--- a/chrome/browser/ui/webui/version_handler.cc
+++ b/chrome/browser/ui/webui/version_handler.cc

@@ -97,8 +97,8 @@
                                     base::string16* profile_path_data) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
-  base::StringValue exec_path(*executable_path_data);
-  base::StringValue profile_path(*profile_path_data);
+  base::Value exec_path(*executable_path_data);
+  base::Value profile_path(*profile_path_data);
   web_ui()->CallJavascriptFunctionUnsafe(version_ui::kReturnFilePaths,
                                          exec_path, profile_path);
 }
@@ -125,7 +125,7 @@
     }
   }
 
-  base::StringValue arg(flash_version_and_path);
+  base::Value arg(flash_version_and_path);
 
   web_ui()->CallJavascriptFunctionUnsafe(version_ui::kReturnFlashVersion, arg);
 }

diff --git a/chrome/browser/ui/webui/version_handler_chromeos.cc b/chrome/browser/ui/webui/version_handler_chromeos.cc
index f61d780d..676496b 100644
--- a/chrome/browser/ui/webui/version_handler_chromeos.cc
+++ b/chrome/browser/ui/webui/version_handler_chromeos.cc

@@ -40,16 +40,16 @@
 }
 
 void VersionHandlerChromeOS::OnVersion(const std::string& version) {
-  base::StringValue arg(version);
+  base::Value arg(version);
   web_ui()->CallJavascriptFunctionUnsafe("returnOsVersion", arg);
 }
 
 void VersionHandlerChromeOS::OnOSFirmware(const std::string& version) {
-  base::StringValue arg(version);
+  base::Value arg(version);
   web_ui()->CallJavascriptFunctionUnsafe("returnOsFirmwareVersion", arg);
 }
 
 void VersionHandlerChromeOS::OnARCVersion(const std::string& version) {
-  base::StringValue arg(version);
+  base::Value arg(version);
   web_ui()->CallJavascriptFunctionUnsafe("returnARCVersion", arg);
 }

diff --git a/chrome/browser/ui/webui/webui_webview_browsertest.cc b/chrome/browser/ui/webui/webui_webview_browsertest.cc
index 5c529012..250d314 100644
--- a/chrome/browser/ui/webui/webui_webview_browsertest.cc
+++ b/chrome/browser/ui/webui/webui_webview_browsertest.cc

@@ -140,8 +140,7 @@
   ui_test_utils::NavigateToURL(browser(), GetWebViewEnabledWebUIURL());
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
-      "testDisplayNone",
-      new base::StringValue(GetTestUrl("empty.html").spec())));
+      "testDisplayNone", new base::Value(GetTestUrl("empty.html").spec())));
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest, ExecuteScriptCode) {
@@ -149,7 +148,7 @@
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
       "testExecuteScriptCode",
-      new base::StringValue(GetTestUrl("empty.html").spec())));
+      new base::Value(GetTestUrl("empty.html").spec())));
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest, ExecuteScriptCodeFromFile) {
@@ -157,7 +156,7 @@
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
       "testExecuteScriptCodeFromFile",
-      new base::StringValue(GetTestUrl("empty.html").spec())));
+      new base::Value(GetTestUrl("empty.html").spec())));
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest, AddContentScript) {
@@ -165,7 +164,7 @@
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
       "testAddContentScript",
-      new base::StringValue(GetTestUrl("empty.html").spec())));
+      new base::Value(GetTestUrl("empty.html").spec())));
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest, AddMultiContentScripts) {
@@ -173,7 +172,7 @@
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
       "testAddMultiContentScripts",
-      new base::StringValue(GetTestUrl("empty.html").spec())));
+      new base::Value(GetTestUrl("empty.html").spec())));
 }
 
 IN_PROC_BROWSER_TEST_F(
@@ -183,7 +182,7 @@
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
       "testAddContentScriptWithSameNameShouldOverwriteTheExistingOne",
-      new base::StringValue(GetTestUrl("empty.html").spec())));
+      new base::Value(GetTestUrl("empty.html").spec())));
 }
 
 IN_PROC_BROWSER_TEST_F(
@@ -193,7 +192,7 @@
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
       "testAddContentScriptToOneWebViewShouldNotInjectToTheOtherWebView",
-      new base::StringValue(GetTestUrl("empty.html").spec())));
+      new base::Value(GetTestUrl("empty.html").spec())));
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest, AddAndRemoveContentScripts) {
@@ -201,7 +200,7 @@
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
       "testAddAndRemoveContentScripts",
-      new base::StringValue(GetTestUrl("empty.html").spec())));
+      new base::Value(GetTestUrl("empty.html").spec())));
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest,
@@ -210,7 +209,7 @@
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
       "testAddContentScriptsWithNewWindowAPI",
-      new base::StringValue(GetTestUrl("guest_from_opener.html").spec())));
+      new base::Value(GetTestUrl("guest_from_opener.html").spec())));
 }
 
 // https://crbug.com/665512.
@@ -221,7 +220,7 @@
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
       "testContentScriptIsInjectedAfterTerminateAndReloadWebView",
-      new base::StringValue(GetTestUrl("empty.html").spec())));
+      new base::Value(GetTestUrl("empty.html").spec())));
 }
 
 // TODO(crbug.com/662673) Flaky on CrOS trybots.
@@ -238,7 +237,7 @@
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
       "testContentScriptExistsAsLongAsWebViewTagExists",
-      new base::StringValue(GetTestUrl("empty.html").spec())));
+      new base::Value(GetTestUrl("empty.html").spec())));
 }
 
 IN_PROC_BROWSER_TEST_F(WebUIWebViewBrowserTest, AddContentScriptWithCode) {
@@ -246,7 +245,7 @@
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
       "testAddContentScriptWithCode",
-      new base::StringValue(GetTestUrl("empty.html").spec())));
+      new base::Value(GetTestUrl("empty.html").spec())));
 }
 
 #if defined(OS_CHROMEOS)
@@ -261,7 +260,7 @@
 
   ASSERT_TRUE(WebUIBrowserTest::RunJavascriptAsyncTest(
       "testAddContentScript",
-      new base::StringValue(GetTestUrl("empty.html").spec())));
+      new base::Value(GetTestUrl("empty.html").spec())));
 }
 #endif
 

diff --git a/chrome/browser/ui/webui/welcome_win10_handler.cc b/chrome/browser/ui/webui/welcome_win10_handler.cc
index 3fc37d4..eab42d6 100644
--- a/chrome/browser/ui/webui/welcome_win10_handler.cc
+++ b/chrome/browser/ui/webui/welcome_win10_handler.cc

@@ -171,6 +171,6 @@
 }
 
 void WelcomeWin10Handler::SendPinnedToTaskbarStateResult() {
-  ResolveJavascriptCallback(base::StringValue(pinned_state_callback_id_),
+  ResolveJavascriptCallback(base::Value(pinned_state_callback_id_),
                             base::Value(pinned_state_result_.value()));
 }

diff --git a/chrome/common/custom_handlers/protocol_handler.cc b/chrome/common/custom_handlers/protocol_handler.cc
index 63f3d9ac..0990f48d 100644
--- a/chrome/common/custom_handlers/protocol_handler.cc
+++ b/chrome/common/custom_handlers/protocol_handler.cc

@@ -61,8 +61,8 @@
 
 std::unique_ptr<base::DictionaryValue> ProtocolHandler::Encode() const {
   auto d = base::MakeUnique<base::DictionaryValue>();
-  d->Set("protocol", new base::StringValue(protocol_));
-  d->Set("url", new base::StringValue(url_.spec()));
+  d->Set("protocol", new base::Value(protocol_));
+  d->Set("url", new base::Value(url_.spec()));
   return d;
 }
 

diff --git a/chrome/common/extensions/manifest_unittest.cc b/chrome/common/extensions/manifest_unittest.cc
index 8c97744..747bf8a4 100644
--- a/chrome/common/extensions/manifest_unittest.cc
+++ b/chrome/common/extensions/manifest_unittest.cc

@@ -114,8 +114,7 @@
   std::unique_ptr<Manifest> manifest2(manifest->DeepCopy());
   EXPECT_TRUE(manifest->Equals(manifest2.get()));
   EXPECT_TRUE(manifest2->Equals(manifest.get()));
-  MutateManifest(
-      &manifest, "foo", new base::StringValue("blah"));
+  MutateManifest(&manifest, "foo", new base::Value("blah"));
   EXPECT_FALSE(manifest->Equals(manifest2.get()));
 }
 
@@ -168,8 +167,7 @@
   AssertType(manifest.get(), Manifest::TYPE_HOSTED_APP);
   MutateManifest(
       &manifest, keys::kWebURLs, NULL);
-  MutateManifest(
-      &manifest, keys::kLaunchWebURL, new base::StringValue("foo"));
+  MutateManifest(&manifest, keys::kLaunchWebURL, new base::Value("foo"));
   AssertType(manifest.get(), Manifest::TYPE_HOSTED_APP);
   MutateManifest(
       &manifest, keys::kLaunchWebURL, NULL);

diff --git a/chrome/common/extensions/sync_type_unittest.cc b/chrome/common/extensions/sync_type_unittest.cc
index 8a85933..2ac283b4 100644
--- a/chrome/common/extensions/sync_type_unittest.cc
+++ b/chrome/common/extensions/sync_type_unittest.cc

@@ -65,7 +65,7 @@
     }
     if (has_plugin_permission) {
       base::ListValue* plugins = new base::ListValue();
-      plugins->Set(0, new base::StringValue("plugin"));
+      plugins->Set(0, new base::Value("plugin"));
       source.Set(keys::kPermissions, plugins);
     }
 

diff --git a/chrome/service/service_process_prefs.cc b/chrome/service/service_process_prefs.cc
index 71886cfb..e829880f 100644
--- a/chrome/service/service_process_prefs.cc
+++ b/chrome/service/service_process_prefs.cc

@@ -40,7 +40,7 @@
 
 void ServiceProcessPrefs::SetString(const std::string& key,
                                     const std::string& value) {
-  prefs_->SetValue(key, base::MakeUnique<base::StringValue>(value),
+  prefs_->SetValue(key, base::MakeUnique<base::Value>(value),
                    WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
 }
 

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index a5f5007e..1007bbb 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn

@@ -3125,6 +3125,7 @@
     "../browser/browsing_data/browsing_data_service_worker_helper_unittest.cc",
     "../browser/browsing_data/chrome_browsing_data_remover_delegate_unittest.cc",
     "../browser/browsing_data/cookies_tree_model_unittest.cc",
+    "../browser/browsing_data/site_data_counting_helper_unittest.cc",
     "../browser/browsing_data/site_data_size_collector_unittest.cc",
     "../browser/budget_service/budget_database_unittest.cc",
     "../browser/budget_service/budget_manager_unittest.cc",

diff --git a/chrome/test/base/extension_js_browser_test.cc b/chrome/test/base/extension_js_browser_test.cc
index 48c9c9b4..403b48c7 100644
--- a/chrome/test/base/extension_js_browser_test.cc
+++ b/chrome/test/base/extension_js_browser_test.cc

@@ -33,8 +33,8 @@
   if (!load_waiter_->browser_context())
     return false;
   ConstValueVector args;
-  args.push_back(new base::StringValue(test_fixture));
-  args.push_back(new base::StringValue(test_name));
+  args.push_back(new base::Value(test_fixture));
+  args.push_back(new base::Value(test_name));
   std::vector<base::string16> scripts;
   if (!libs_loaded_) {
     BuildJavascriptLibraries(&scripts);

diff --git a/chrome/test/base/javascript_browser_test.cc b/chrome/test/base/javascript_browser_test.cc
index f0deef37..3d762f2 100644
--- a/chrome/test/base/javascript_browser_test.cc
+++ b/chrome/test/base/javascript_browser_test.cc

@@ -108,7 +108,7 @@
   ConstValueVector arguments;
   base::Value* is_async_arg = new base::Value(is_async);
   arguments.push_back(is_async_arg);
-  base::StringValue* function_name_arg = new base::StringValue(function_name);
+  base::Value* function_name_arg = new base::Value(function_name);
   arguments.push_back(function_name_arg);
   base::ListValue* baked_argument_list = new base::ListValue();
   ConstValueVector::const_iterator arguments_iterator;

diff --git a/chrome/test/base/web_ui_browser_test.cc b/chrome/test/base/web_ui_browser_test.cc
index 4c8d5bc7..fd4e69d5 100644
--- a/chrome/test/base/web_ui_browser_test.cc
+++ b/chrome/test/base/web_ui_browser_test.cc

@@ -126,8 +126,8 @@
                                           const std::string& test_fixture,
                                           const std::string& test_name) {
   ConstValueVector args;
-  args.push_back(new base::StringValue(test_fixture));
-  args.push_back(new base::StringValue(test_name));
+  args.push_back(new base::Value(test_fixture));
+  args.push_back(new base::Value(test_name));
 
   if (is_async)
     return RunJavascriptAsyncTest("RUN_TEST_F", args);
@@ -207,8 +207,8 @@
     RenderViewHost* preload_host) {
   ASSERT_FALSE(libraries_preloaded_);
   ConstValueVector args;
-  args.push_back(new base::StringValue(preload_test_fixture));
-  args.push_back(new base::StringValue(preload_test_name));
+  args.push_back(new base::Value(preload_test_fixture));
+  args.push_back(new base::Value(preload_test_name));
   RunJavascriptUsingHandler(
       "preloadJavascriptLibraries", args, false, false, preload_host);
   libraries_preloaded_ = true;

diff --git a/chrome/test/base/web_ui_browser_test_browsertest.cc b/chrome/test/base/web_ui_browser_test_browsertest.cc
index 5b7f673..0f8906e 100644
--- a/chrome/test/base/web_ui_browser_test_browsertest.cc
+++ b/chrome/test/base/web_ui_browser_test_browsertest.cc

@@ -90,12 +90,12 @@
 
   // Starts a failing test.
   void RunTestFailsAssert() {
-    RunJavascriptFunction("runAsync", new base::StringValue("testFailsAssert"));
+    RunJavascriptFunction("runAsync", new base::Value("testFailsAssert"));
   }
 
   // Starts a passing test.
   void RunTestPasses() {
-    RunJavascriptFunction("runAsync", new base::StringValue("testPasses"));
+    RunJavascriptFunction("runAsync", new base::Value("testPasses"));
   }
 
  protected:
@@ -165,8 +165,8 @@
 // message). (Async version).
 IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestAsyncFailsAssert) {
   EXPECT_CALL(message_handler_, HandleTestFails(::testing::_));
-  ASSERT_FALSE(RunJavascriptAsyncTest(
-      "startAsyncTest", new base::StringValue("testFailsAssert")));
+  ASSERT_FALSE(RunJavascriptAsyncTest("startAsyncTest",
+                                      new base::Value("testFailsAssert")));
 }
 
 // Test that expectations continue the function, but fail the test.
@@ -174,8 +174,8 @@
   ::testing::InSequence s;
   EXPECT_CALL(message_handler_, HandleTestContinues(::testing::_));
   EXPECT_CALL(message_handler_, HandleTestFails(::testing::_));
-  ASSERT_FALSE(RunJavascriptAsyncTest(
-      "startAsyncTest", new base::StringValue("testFailsExpect")));
+  ASSERT_FALSE(RunJavascriptAsyncTest("startAsyncTest",
+                                      new base::Value("testFailsExpect")));
 }
 
 // Test that test continues and passes. (Sync version).
@@ -191,8 +191,8 @@
   EXPECT_CALL(message_handler_, HandleTestPasses(::testing::_))
       .WillOnce(::testing::InvokeWithoutArgs(
           this, &WebUIBrowserAsyncTest::TestDone));
-  ASSERT_TRUE(RunJavascriptAsyncTest(
-      "startAsyncTest", new base::StringValue("testPasses")));
+  ASSERT_TRUE(
+      RunJavascriptAsyncTest("startAsyncTest", new base::Value("testPasses")));
 }
 
 // Test that two tests pass.
@@ -206,8 +206,8 @@
   EXPECT_CALL(message_handler_, HandleTestPasses(::testing::_))
       .WillOnce(::testing::InvokeWithoutArgs(
           this, &WebUIBrowserAsyncTest::TestDone));
-  ASSERT_TRUE(RunJavascriptAsyncTest(
-      "startAsyncTest", new base::StringValue("testPasses")));
+  ASSERT_TRUE(
+      RunJavascriptAsyncTest("startAsyncTest", new base::Value("testPasses")));
 }
 
 // Test that first test passes; second fails.
@@ -218,8 +218,8 @@
       .WillOnce(::testing::InvokeWithoutArgs(
           this, &WebUIBrowserAsyncTest::RunTestFailsAssert));
   EXPECT_CALL(message_handler_, HandleTestFails(::testing::_));
-  ASSERT_FALSE(RunJavascriptAsyncTest(
-      "startAsyncTest", new base::StringValue("testPasses")));
+  ASSERT_FALSE(
+      RunJavascriptAsyncTest("startAsyncTest", new base::Value("testPasses")));
 }
 
 // Test that testDone() with failure first then sync pass still fails.
@@ -231,7 +231,7 @@
   // Call runAsync directly instead of deferring through startAsyncTest. It will
   // call testDone() on failure, then return.
   ASSERT_FALSE(RunJavascriptAsyncTest(
-      "runAsync", new base::StringValue("testAsyncDoneFailFirstSyncPass")));
+      "runAsync", new base::Value("testAsyncDoneFailFirstSyncPass")));
 }
 
 // Test that calling testDone during RunJavascriptAsyncTest still completes

diff --git a/chrome/test/chromedriver/alert_commands.cc b/chrome/test/chromedriver/alert_commands.cc
index 9910dd77..682ab962 100644
--- a/chrome/test/chromedriver/alert_commands.cc
+++ b/chrome/test/chromedriver/alert_commands.cc

@@ -57,7 +57,7 @@
       web_view->GetJavaScriptDialogManager()->GetDialogMessage(&message);
   if (status.IsError())
     return status;
-  value->reset(new base::StringValue(message));
+  value->reset(new base::Value(message));
   return Status(kOk);
 }
 

diff --git a/chrome/test/chromedriver/chrome/log.cc b/chrome/test/chromedriver/chrome/log.cc
index c98ab48..93024c0 100644
--- a/chrome/test/chromedriver/chrome/log.cc
+++ b/chrome/test/chromedriver/chrome/log.cc

@@ -72,7 +72,7 @@
     return std::move(list_copy);
   } else if (value->GetAsString(&data)) {
     TruncateString(&data);
-    return std::unique_ptr<base::Value>(new base::StringValue(data));
+    return std::unique_ptr<base::Value>(new base::Value(data));
   }
   return std::unique_ptr<base::Value>(value->DeepCopy());
 }
@@ -110,6 +110,6 @@
 std::string FormatJsonForDisplay(const std::string& json) {
   std::unique_ptr<base::Value> value = base::JSONReader::Read(json);
   if (!value)
-    value.reset(new base::StringValue(json));
+    value.reset(new base::Value(json));
   return FormatValueForDisplay(*value);
 }

diff --git a/chrome/test/chromedriver/commands.cc b/chrome/test/chromedriver/commands.cc
index 64a8aee..3087083 100644
--- a/chrome/test/chromedriver/commands.cc
+++ b/chrome/test/chromedriver/commands.cc

@@ -92,7 +92,7 @@
   (*session_remaining_count)--;
 
   std::unique_ptr<base::DictionaryValue> session(new base::DictionaryValue());
-  session->Set("id", new base::StringValue(session_id));
+  session->Set("id", new base::Value(session_id));
   session->Set("capabilities", value->DeepCopy());
   session_list->Append(std::move(session));
 

diff --git a/chrome/test/chromedriver/commands_unittest.cc b/chrome/test/chromedriver/commands_unittest.cc
index af76682..8f61845 100644
--- a/chrome/test/chromedriver/commands_unittest.cc
+++ b/chrome/test/chromedriver/commands_unittest.cc

@@ -71,8 +71,8 @@
   std::unique_ptr<base::DictionaryValue> capabilities(
       new base::DictionaryValue());
 
-  capabilities->Set("capability1", new base::StringValue("test1"));
-  capabilities->Set("capability2", new base::StringValue("test2"));
+  capabilities->Set("capability1", new base::Value("test1"));
+  capabilities->Set("capability2", new base::Value("test2"));
 
   callback.Run(Status(kOk), std::move(capabilities), session_id, false);
 }

diff --git a/chrome/test/chromedriver/element_commands.cc b/chrome/test/chromedriver/element_commands.cc
index 7f3d164..403e721 100644
--- a/chrome/test/chromedriver/element_commands.cc
+++ b/chrome/test/chromedriver/element_commands.cc

@@ -515,7 +515,7 @@
       session, web_view, element_id, property_name, &property_value);
   if (status.IsError())
     return status;
-  value->reset(new base::StringValue(property_value));
+  value->reset(new base::Value(property_value));
   return Status(kOk);
 }
 

diff --git a/chrome/test/chromedriver/session_commands.cc b/chrome/test/chromedriver/session_commands.cc
index 528603c..1a39f53 100644
--- a/chrome/test/chromedriver/session_commands.cc
+++ b/chrome/test/chromedriver/session_commands.cc

@@ -279,8 +279,7 @@
   if (status.IsError())
     return status;
 
-  value->reset(
-      new base::StringValue(WebViewIdToWindowHandle(web_view->GetId())));
+  value->reset(new base::Value(WebViewIdToWindowHandle(web_view->GetId())));
   return Status(kOk);
 }
 
@@ -822,7 +821,7 @@
   if (status.IsError())
     return Status(kUnknownError, "unable to unzip 'file'", status);
 
-  value->reset(new base::StringValue(upload.value()));
+  value->reset(new base::Value(upload.value()));
   return Status(kOk);
 }
 

diff --git a/chrome/test/chromedriver/window_commands.cc b/chrome/test/chromedriver/window_commands.cc
index 5aa83bc..7444d47 100644
--- a/chrome/test/chromedriver/window_commands.cc
+++ b/chrome/test/chromedriver/window_commands.cc

@@ -486,7 +486,7 @@
         return status;
     }
   }
-  value->reset(new base::StringValue(url));
+  value->reset(new base::Value(url));
   return Status(kOk);
 }
 
@@ -885,7 +885,7 @@
   if (status.IsError())
     return status;
 
-  value->reset(new base::StringValue(screenshot));
+  value->reset(new base::Value(screenshot));
   return Status(kOk);
 }
 

diff --git a/chromeos/dbus/fake_shill_device_client.cc b/chromeos/dbus/fake_shill_device_client.cc
index f1d0e18..c567864 100644
--- a/chromeos/dbus/fake_shill_device_client.cc
+++ b/chromeos/dbus/fake_shill_device_client.cc

@@ -266,7 +266,7 @@
                                        const base::Closure& callback,
                                        const ErrorCallback& error_callback) {
   SetPropertyInternal(device_path, shill::kCarrierProperty,
-                      base::StringValue(carrier), callback, error_callback);
+                      base::Value(carrier), callback, error_callback);
 }
 
 void FakeShillDeviceClient::Reset(const dbus::ObjectPath& device_path,

diff --git a/chromeos/dbus/fake_shill_manager_client.cc b/chromeos/dbus/fake_shill_manager_client.cc
index bd8190d4..0c103e71 100644
--- a/chromeos/dbus/fake_shill_manager_client.cc
+++ b/chromeos/dbus/fake_shill_manager_client.cc

@@ -111,10 +111,11 @@
 }
 
 void UpdatePortaledWifiState(const std::string& service_path) {
-  DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface()
-      ->SetServiceProperty(service_path,
-                           shill::kStateProperty,
-                           base::StringValue(shill::kStatePortal));
+  DBusThreadManager::Get()
+      ->GetShillServiceClient()
+      ->GetTestInterface()
+      ->SetServiceProperty(service_path, shill::kStateProperty,
+                           base::Value(shill::kStatePortal));
 }
 
 bool IsCellularTechnology(const std::string& type) {
@@ -383,14 +384,13 @@
 
 void FakeShillManagerClient::AddDevice(const std::string& device_path) {
   if (GetListProperty(shill::kDevicesProperty)
-          ->AppendIfNotPresent(
-              base::MakeUnique<base::StringValue>(device_path))) {
+          ->AppendIfNotPresent(base::MakeUnique<base::Value>(device_path))) {
     CallNotifyObserversPropertyChanged(shill::kDevicesProperty);
   }
 }
 
 void FakeShillManagerClient::RemoveDevice(const std::string& device_path) {
-  base::StringValue device_path_value(device_path);
+  base::Value device_path_value(device_path);
   if (GetListProperty(shill::kDevicesProperty)->Remove(
       device_path_value, NULL)) {
     CallNotifyObserversPropertyChanged(shill::kDevicesProperty);
@@ -405,20 +405,20 @@
 void FakeShillManagerClient::AddTechnology(const std::string& type,
                                            bool enabled) {
   if (GetListProperty(shill::kAvailableTechnologiesProperty)
-          ->AppendIfNotPresent(base::MakeUnique<base::StringValue>(type))) {
+          ->AppendIfNotPresent(base::MakeUnique<base::Value>(type))) {
     CallNotifyObserversPropertyChanged(
         shill::kAvailableTechnologiesProperty);
   }
   if (enabled &&
       GetListProperty(shill::kEnabledTechnologiesProperty)
-          ->AppendIfNotPresent(base::MakeUnique<base::StringValue>(type))) {
+          ->AppendIfNotPresent(base::MakeUnique<base::Value>(type))) {
     CallNotifyObserversPropertyChanged(
         shill::kEnabledTechnologiesProperty);
   }
 }
 
 void FakeShillManagerClient::RemoveTechnology(const std::string& type) {
-  base::StringValue type_value(type);
+  base::Value type_value(type);
   if (GetListProperty(shill::kAvailableTechnologiesProperty)->Remove(
       type_value, NULL)) {
     CallNotifyObserversPropertyChanged(
@@ -435,13 +435,13 @@
                                                        bool initializing) {
   if (initializing) {
     if (GetListProperty(shill::kUninitializedTechnologiesProperty)
-            ->AppendIfNotPresent(base::MakeUnique<base::StringValue>(type))) {
+            ->AppendIfNotPresent(base::MakeUnique<base::Value>(type))) {
       CallNotifyObserversPropertyChanged(
           shill::kUninitializedTechnologiesProperty);
     }
   } else {
-    if (GetListProperty(shill::kUninitializedTechnologiesProperty)->Remove(
-            base::StringValue(type), NULL)) {
+    if (GetListProperty(shill::kUninitializedTechnologiesProperty)
+            ->Remove(base::Value(type), NULL)) {
       CallNotifyObserversPropertyChanged(
           shill::kUninitializedTechnologiesProperty);
     }
@@ -463,7 +463,7 @@
 void FakeShillManagerClient::AddProfile(const std::string& profile_path) {
   const char* key = shill::kProfilesProperty;
   if (GetListProperty(key)->AppendIfNotPresent(
-          base::MakeUnique<base::StringValue>(profile_path))) {
+          base::MakeUnique<base::Value>(profile_path))) {
     CallNotifyObserversPropertyChanged(key);
   }
 }
@@ -483,7 +483,7 @@
     bool notify_observers) {
   VLOG(2) << "AddManagerService: " << service_path;
   GetListProperty(shill::kServiceCompleteListProperty)
-      ->AppendIfNotPresent(base::MakeUnique<base::StringValue>(service_path));
+      ->AppendIfNotPresent(base::MakeUnique<base::Value>(service_path));
   SortManagerServices(false);
   if (notify_observers)
     CallNotifyObserversPropertyChanged(shill::kServiceCompleteListProperty);
@@ -492,7 +492,7 @@
 void FakeShillManagerClient::RemoveManagerService(
     const std::string& service_path) {
   VLOG(2) << "RemoveManagerService: " << service_path;
-  base::StringValue service_path_value(service_path);
+  base::Value service_path_value(service_path);
   GetListProperty(shill::kServiceCompleteListProperty)->Remove(
       service_path_value, NULL);
   CallNotifyObserversPropertyChanged(shill::kServiceCompleteListProperty);
@@ -510,7 +510,7 @@
   if (service_path == default_service_ && !IsConnectedState(state)) {
     // Default service is no longer connected; clear.
     default_service_.clear();
-    base::StringValue default_service_value(default_service_);
+    base::Value default_service_value(default_service_);
     SetManagerProperty(shill::kDefaultServiceProperty, default_service_value);
   }
 }
@@ -572,7 +572,7 @@
   }
   if (default_service_ != new_default_service) {
     default_service_ = new_default_service;
-    base::StringValue default_service_value(default_service_);
+    base::Value default_service_value(default_service_);
     SetManagerProperty(shill::kDefaultServiceProperty, default_service_value);
   }
 }
@@ -647,9 +647,8 @@
     AddTechnology(shill::kTypeEthernet, enabled);
     devices->AddDevice(
         "/device/eth1", shill::kTypeEthernet, "stub_eth_device1");
-    devices->SetDeviceProperty("/device/eth1",
-                               shill::kAddressProperty,
-                               base::StringValue("0123456789ab"));
+    devices->SetDeviceProperty("/device/eth1", shill::kAddressProperty,
+                               base::Value("0123456789ab"));
     base::ListValue eth_ip_configs;
     eth_ip_configs.AppendString("ipconfig_v4_path");
     eth_ip_configs.AppendString("ipconfig_v6_path");
@@ -683,9 +682,8 @@
     }
     AddTechnology(shill::kTypeWifi, enabled);
     devices->AddDevice("/device/wifi1", shill::kTypeWifi, "stub_wifi_device1");
-    devices->SetDeviceProperty("/device/wifi1",
-                               shill::kAddressProperty,
-                               base::StringValue("23456789abcd"));
+    devices->SetDeviceProperty("/device/wifi1", shill::kAddressProperty,
+                               base::Value("23456789abcd"));
     base::ListValue wifi_ip_configs;
     wifi_ip_configs.AppendString("ipconfig_v4_path");
     wifi_ip_configs.AppendString("ipconfig_v6_path");
@@ -700,9 +698,8 @@
                          shill::kTypeWifi,
                          state,
                          add_to_visible);
-    services->SetServiceProperty(kWifi1Path,
-                                 shill::kSecurityClassProperty,
-                                 base::StringValue(shill::kSecurityWep));
+    services->SetServiceProperty(kWifi1Path, shill::kSecurityClassProperty,
+                                 base::Value(shill::kSecurityWep));
     services->SetServiceProperty(kWifi1Path, shill::kConnectableProperty,
                                  base::Value(true));
     profiles->AddService(shared_profile, kWifi1Path);
@@ -713,17 +710,16 @@
                          shill::kTypeWifi, shill::kStateIdle, add_to_visible);
     if (s_dynamic_wep) {
       services->SetServiceProperty(kWifi2Path, shill::kSecurityClassProperty,
-                                   base::StringValue(shill::kSecurityWep));
-      services->SetServiceProperty(
-          kWifi2Path, shill::kEapKeyMgmtProperty,
-          base::StringValue(shill::kKeyManagementIEEE8021X));
+                                   base::Value(shill::kSecurityWep));
+      services->SetServiceProperty(kWifi2Path, shill::kEapKeyMgmtProperty,
+                                   base::Value(shill::kKeyManagementIEEE8021X));
       services->SetServiceProperty(kWifi2Path, shill::kEapMethodProperty,
-                                   base::StringValue(shill::kEapMethodPEAP));
+                                   base::Value(shill::kEapMethodPEAP));
       services->SetServiceProperty(kWifi2Path, shill::kEapIdentityProperty,
-                                   base::StringValue("John Doe"));
+                                   base::Value("John Doe"));
     } else {
       services->SetServiceProperty(kWifi2Path, shill::kSecurityClassProperty,
-                                   base::StringValue(shill::kSecurityPsk));
+                                   base::Value(shill::kSecurityPsk));
     }
     services->SetServiceProperty(kWifi2Path, shill::kSignalStrengthProperty,
                                  base::Value(80));
@@ -746,7 +742,7 @@
                            shill::kStateIdle, add_to_visible);
       services->SetServiceProperty(kPortaledWifiPath,
                                    shill::kSecurityClassProperty,
-                                   base::StringValue(shill::kSecurityNone));
+                                   base::Value(shill::kSecurityNone));
       services->SetConnectBehavior(
           kPortaledWifiPath,
           base::Bind(&UpdatePortaledWifiState, kPortaledWifiPath));
@@ -794,9 +790,8 @@
     AddTechnology(shill::kTypeCellular, enabled);
     devices->AddDevice(
         "/device/cellular1", shill::kTypeCellular, "stub_cellular_device1");
-    devices->SetDeviceProperty("/device/cellular1",
-                               shill::kCarrierProperty,
-                               base::StringValue(shill::kCarrierSprint));
+    devices->SetDeviceProperty("/device/cellular1", shill::kCarrierProperty,
+                               base::Value(shill::kCarrierSprint));
     base::ListValue carrier_list;
     carrier_list.AppendString(shill::kCarrierSprint);
     carrier_list.AppendString(shill::kCarrierGenericUMTS);
@@ -823,7 +818,7 @@
                          shill::kTypeCellular,
                          state,
                          add_to_visible);
-    base::StringValue technology_value(cellular_technology_);
+    base::Value technology_value(cellular_technology_);
     devices->SetDeviceProperty("/device/cellular1",
                                shill::kTechnologyFamilyProperty,
                                technology_value);
@@ -836,16 +831,14 @@
 
     if (activated) {
       services->SetServiceProperty(
-          kCellularServicePath,
-          shill::kActivationStateProperty,
-          base::StringValue(shill::kActivationStateActivated));
+          kCellularServicePath, shill::kActivationStateProperty,
+          base::Value(shill::kActivationStateActivated));
       services->SetServiceProperty(
           kCellularServicePath, shill::kConnectableProperty, base::Value(true));
     } else {
       services->SetServiceProperty(
-          kCellularServicePath,
-          shill::kActivationStateProperty,
-          base::StringValue(shill::kActivationStateNotActivated));
+          kCellularServicePath, shill::kActivationStateProperty,
+          base::Value(shill::kActivationStateNotActivated));
     }
 
     std::string shill_roaming_state;
@@ -857,7 +850,7 @@
       shill_roaming_state = roaming_state_;
     services->SetServiceProperty(kCellularServicePath,
                                  shill::kRoamingStateProperty,
-                                 base::StringValue(shill_roaming_state));
+                                 base::Value(shill_roaming_state));
 
     base::DictionaryValue apn;
     apn.SetStringWithoutPathExpansion(shill::kApnProperty, "testapn");
@@ -1000,7 +993,7 @@
   const base::ListValue* technologies;
   if (stub_properties_.GetListWithoutPathExpansion(
           shill::kEnabledTechnologiesProperty, &technologies)) {
-    base::StringValue type_value(type);
+    base::Value type_value(type);
     if (technologies->Find(type_value) != technologies->end())
       enabled = true;
   }
@@ -1014,9 +1007,9 @@
   base::ListValue* enabled_list =
       GetListProperty(shill::kEnabledTechnologiesProperty);
   if (enabled)
-    enabled_list->AppendIfNotPresent(base::MakeUnique<base::StringValue>(type));
+    enabled_list->AppendIfNotPresent(base::MakeUnique<base::Value>(type));
   else
-    enabled_list->Remove(base::StringValue(type), NULL);
+    enabled_list->Remove(base::Value(type), NULL);
   CallNotifyObserversPropertyChanged(
       shill::kEnabledTechnologiesProperty);
   base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE, callback);
@@ -1112,9 +1105,9 @@
     }
     shill_device_property_map_[shill::kTypeCellular]
                               [shill::kSIMLockStatusProperty] = simlock_dict;
-    shill_device_property_map_
-        [shill::kTypeCellular][shill::kTechnologyFamilyProperty] =
-            new base::StringValue(shill::kNetworkTechnologyGsm);
+    shill_device_property_map_[shill::kTypeCellular]
+                              [shill::kTechnologyFamilyProperty] =
+                                  new base::Value(shill::kNetworkTechnologyGsm);
     return true;
   } else if (arg0 == "sim_present") {
     bool present = (arg1 == "1");

diff --git a/chromeos/dbus/fake_shill_profile_client.cc b/chromeos/dbus/fake_shill_profile_client.cc
index fef353d..9a5fe1a 100644
--- a/chromeos/dbus/fake_shill_profile_client.cc
+++ b/chromeos/dbus/fake_shill_profile_client.cc

@@ -109,7 +109,7 @@
     return;
   }
 
-  base::StringValue profile_path_value("");
+  base::Value profile_path_value("");
   DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface()->
       SetServiceProperty(entry_path,
                          shill::kProfileProperty,
@@ -194,7 +194,7 @@
   service_properties->GetStringWithoutPathExpansion(shill::kProfileProperty,
                                                     &service_profile_path);
   if (service_profile_path.empty()) {
-    base::StringValue profile_path_value(profile_path);
+    base::Value profile_path_value(profile_path);
     service_test->SetServiceProperty(service_path,
                                      shill::kProfileProperty,
                                      profile_path_value);

diff --git a/chromeos/dbus/fake_shill_service_client.cc b/chromeos/dbus/fake_shill_service_client.cc
index 00735b4..254f603 100644
--- a/chromeos/dbus/fake_shill_service_client.cc
+++ b/chromeos/dbus/fake_shill_service_client.cc

@@ -190,7 +190,7 @@
   service_properties->SetStringWithoutPathExpansion(shill::kErrorProperty, "");
 
   // Set Associating.
-  base::StringValue associating_value(shill::kStateAssociation);
+  base::Value associating_value(shill::kStateAssociation);
   SetServiceProperty(service_path.value(), shill::kStateProperty,
                      associating_value);
 
@@ -213,7 +213,7 @@
     return;
   }
   // Set Idle after a delay
-  base::StringValue idle_value(shill::kStateIdle);
+  base::Value idle_value(shill::kStateIdle);
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, base::Bind(&FakeShillServiceClient::SetProperty,
                             weak_ptr_factory_.GetWeakPtr(), service_path,
@@ -240,9 +240,8 @@
     LOG(ERROR) << "Service not found: " << service_path.value();
     error_callback.Run("Error.InvalidService", "Invalid Service");
   }
-  SetServiceProperty(service_path.value(),
-                     shill::kActivationStateProperty,
-                     base::StringValue(shill::kActivationStateActivating));
+  SetServiceProperty(service_path.value(), shill::kActivationStateProperty,
+                     base::Value(shill::kActivationStateActivating));
   // Set Activated after a delay
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE,
@@ -323,9 +322,8 @@
   }
 
   if (!ipconfig_path.empty()) {
-    properties->SetWithoutPathExpansion(
-        shill::kIPConfigProperty,
-        new base::StringValue(ipconfig_path));
+    properties->SetWithoutPathExpansion(shill::kIPConfigProperty,
+                                        new base::Value(ipconfig_path));
   }
 
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
@@ -571,20 +569,17 @@
     properties->GetString(shill::kTypeProperty, &type);
     if (type != service_type)
       continue;
-    properties->SetWithoutPathExpansion(
-        shill::kStateProperty,
-        new base::StringValue(shill::kStateIdle));
+    properties->SetWithoutPathExpansion(shill::kStateProperty,
+                                        new base::Value(shill::kStateIdle));
   }
 }
 
 void FakeShillServiceClient::SetCellularActivated(
     const dbus::ObjectPath& service_path,
     const ErrorCallback& error_callback) {
-  SetProperty(service_path,
-              shill::kActivationStateProperty,
-              base::StringValue(shill::kActivationStateActivated),
-              base::Bind(&base::DoNothing),
-              error_callback);
+  SetProperty(service_path, shill::kActivationStateProperty,
+              base::Value(shill::kActivationStateActivated),
+              base::Bind(&base::DoNothing), error_callback);
   SetProperty(service_path, shill::kConnectableProperty, base::Value(true),
               base::Bind(&base::DoNothing), error_callback);
 }
@@ -612,20 +607,20 @@
   if (passphrase == "failure") {
     // Simulate a password failure.
     SetServiceProperty(service_path, shill::kErrorProperty,
-                       base::StringValue(shill::kErrorBadPassphrase));
+                       base::Value(shill::kErrorBadPassphrase));
     SetServiceProperty(service_path, shill::kStateProperty,
-                       base::StringValue(shill::kStateFailure));
+                       base::Value(shill::kStateFailure));
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(
             base::IgnoreResult(&FakeShillServiceClient::SetServiceProperty),
             weak_ptr_factory_.GetWeakPtr(), service_path, shill::kErrorProperty,
-            base::StringValue(shill::kErrorBadPassphrase)));
+            base::Value(shill::kErrorBadPassphrase)));
   } else {
     // Set Online.
     VLOG(1) << "Setting state to Online " << service_path;
     SetServiceProperty(service_path, shill::kStateProperty,
-                       base::StringValue(shill::kStateOnline));
+                       base::Value(shill::kStateOnline));
   }
 }
 

diff --git a/chromeos/dbus/gsm_sms_client_unittest.cc b/chromeos/dbus/gsm_sms_client_unittest.cc
index 5cadf58..fb52c37 100644
--- a/chromeos/dbus/gsm_sms_client_unittest.cc
+++ b/chromeos/dbus/gsm_sms_client_unittest.cc

@@ -256,10 +256,10 @@
   response_ = response.get();
   // Create expected result.
   base::DictionaryValue expected_result;
-  expected_result.SetWithoutPathExpansion(
-      kNumberKey, new base::StringValue(kExampleNumber));
+  expected_result.SetWithoutPathExpansion(kNumberKey,
+                                          new base::Value(kExampleNumber));
   expected_result.SetWithoutPathExpansion(kTextKey,
-                                          new base::StringValue(kExampleText));
+                                          new base::Value(kExampleText));
   expected_result_ = &expected_result;
   // Call Get.
   client_->Get(kServiceName, dbus::ObjectPath(kObjectPath), kIndex,
@@ -298,9 +298,8 @@
   // Create expected result.
   base::ListValue expected_result;
   auto sms = base::MakeUnique<base::DictionaryValue>();
-  sms->SetWithoutPathExpansion(kNumberKey,
-                               new base::StringValue(kExampleNumber));
-  sms->SetWithoutPathExpansion(kTextKey, new base::StringValue(kExampleText));
+  sms->SetWithoutPathExpansion(kNumberKey, new base::Value(kExampleNumber));
+  sms->SetWithoutPathExpansion(kTextKey, new base::Value(kExampleText));
   expected_result.Append(std::move(sms));
   expected_result_ = &expected_result;
   // Call List.

diff --git a/chromeos/dbus/shill_client_unittest_base.cc b/chromeos/dbus/shill_client_unittest_base.cc
index c4bb922..c8120be 100644
--- a/chromeos/dbus/shill_client_unittest_base.cc
+++ b/chromeos/dbus/shill_client_unittest_base.cc

@@ -42,7 +42,7 @@
         !entry_reader.PopString(&key) ||
         !entry_reader.PopString(&value))
       return NULL;
-    result->SetWithoutPathExpansion(key, new base::StringValue(value));
+    result->SetWithoutPathExpansion(key, new base::Value(value));
   }
   return result.release();
 }
@@ -316,15 +316,14 @@
   base::DictionaryValue* properties = new base::DictionaryValue;
   properties->SetWithoutPathExpansion(
       shill::kGuidProperty,
-      new base::StringValue("00000000-0000-0000-0000-000000000000"));
-  properties->SetWithoutPathExpansion(
-      shill::kModeProperty, new base::StringValue(shill::kModeManaged));
+      new base::Value("00000000-0000-0000-0000-000000000000"));
+  properties->SetWithoutPathExpansion(shill::kModeProperty,
+                                      new base::Value(shill::kModeManaged));
   properties->SetWithoutPathExpansion(shill::kTypeProperty,
-                                      new base::StringValue(shill::kTypeWifi));
+                                      new base::Value(shill::kTypeWifi));
   shill_property_util::SetSSID("testssid", properties);
-  properties->SetWithoutPathExpansion(
-      shill::kSecurityClassProperty,
-      new base::StringValue(shill::kSecurityPsk));
+  properties->SetWithoutPathExpansion(shill::kSecurityClassProperty,
+                                      new base::Value(shill::kSecurityPsk));
   return properties;
 }
 

diff --git a/chromeos/dbus/shill_ipconfig_client_unittest.cc b/chromeos/dbus/shill_ipconfig_client_unittest.cc
index 8f884d7..dd79e2c 100644
--- a/chromeos/dbus/shill_ipconfig_client_unittest.cc
+++ b/chromeos/dbus/shill_ipconfig_client_unittest.cc

@@ -106,7 +106,7 @@
   // Create the expected value.
   base::DictionaryValue value;
   value.SetWithoutPathExpansion(shill::kAddressProperty,
-                                new base::StringValue(kAddress));
+                                new base::Value(kAddress));
   value.SetWithoutPathExpansion(shill::kMtuProperty, new base::Value(kMtu));
 
   // Set expectations.
@@ -127,7 +127,7 @@
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
-  base::StringValue value(kAddress);
+  base::Value value(kAddress);
   PrepareForMethodCall(shill::kSetPropertyFunction,
                        base::Bind(&ExpectStringAndValueArguments,
                                   shill::kAddressProperty,

diff --git a/chromeos/dbus/shill_manager_client_unittest.cc b/chromeos/dbus/shill_manager_client_unittest.cc
index f46cad6..67e2c7c 100644
--- a/chromeos/dbus/shill_manager_client_unittest.cc
+++ b/chromeos/dbus/shill_manager_client_unittest.cc

@@ -184,8 +184,7 @@
   base::ListValue* type_entry_value = new base::ListValue;
   auto property_dict_value = base::MakeUnique<base::DictionaryValue>();
   property_dict_value->SetWithoutPathExpansion(
-      shill::kGeoMacAddressProperty,
-      new base::StringValue("01:23:45:67:89:AB"));
+      shill::kGeoMacAddressProperty, new base::Value("01:23:45:67:89:AB"));
   type_entry_value->Append(std::move(property_dict_value));
   type_dict_value.SetWithoutPathExpansion("wifi", type_entry_value);
 
@@ -205,7 +204,7 @@
   // Create response.
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   // Set expectations.
-  base::StringValue value("portal list");
+  base::Value value("portal list");
   PrepareForMethodCall(shill::kSetPropertyFunction,
                        base::Bind(ExpectStringAndValueArguments,
                                   shill::kCheckPortalListProperty,

diff --git a/chromeos/dbus/shill_profile_client_unittest.cc b/chromeos/dbus/shill_profile_client_unittest.cc
index 5be2b33..24932cc 100644
--- a/chromeos/dbus/shill_profile_client_unittest.cc
+++ b/chromeos/dbus/shill_profile_client_unittest.cc

@@ -143,7 +143,7 @@
   // Create the expected value.
   base::DictionaryValue value;
   value.SetWithoutPathExpansion(shill::kTypeProperty,
-                                new base::StringValue(shill::kTypeWifi));
+                                new base::Value(shill::kTypeWifi));
   // Set expectations.
   PrepareForMethodCall(shill::kGetEntryFunction,
                        base::Bind(&ExpectStringArgument, kExampleEntryPath),

diff --git a/chromeos/dbus/shill_service_client_unittest.cc b/chromeos/dbus/shill_service_client_unittest.cc
index b53e5ca..7adc828 100644
--- a/chromeos/dbus/shill_service_client_unittest.cc
+++ b/chromeos/dbus/shill_service_client_unittest.cc

@@ -117,7 +117,7 @@
   std::unique_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
 
   // Set expectations.
-  const base::StringValue value(kValue);
+  const base::Value value(kValue);
   PrepareForMethodCall(shill::kSetPropertyFunction,
                        base::Bind(&ExpectStringAndValueArguments,
                                   shill::kPassphraseProperty,

diff --git a/chromeos/network/client_cert_resolver_unittest.cc b/chromeos/network/client_cert_resolver_unittest.cc
index 0fe79c15..8caac7a 100644
--- a/chromeos/network/client_cert_resolver_unittest.cc
+++ b/chromeos/network/client_cert_resolver_unittest.cc

@@ -172,8 +172,8 @@
                                         true /* visible */);
     // Set an arbitrary cert id, so that we can check afterwards whether we
     // cleared the property or not.
-    service_test_->SetServiceProperty(
-        kWifiStub, shill::kEapCertIdProperty, base::StringValue("invalid id"));
+    service_test_->SetServiceProperty(kWifiStub, shill::kEapCertIdProperty,
+                                      base::Value("invalid id"));
     profile_test_->AddService(kUserProfilePath, kWifiStub);
 
     DBusThreadManager::Get()
@@ -260,7 +260,7 @@
 
   void SetWifiState(const std::string& state) {
     ASSERT_TRUE(service_test_->SetServiceProperty(
-        kWifiStub, shill::kStateProperty, base::StringValue(state)));
+        kWifiStub, shill::kStateProperty, base::Value(state)));
   }
 
   void GetServiceProperty(const std::string& prop_name,

diff --git a/chromeos/network/host_resolver_impl_chromeos_unittest.cc b/chromeos/network/host_resolver_impl_chromeos_unittest.cc
index 0ec0fb46..ca48394 100644
--- a/chromeos/network/host_resolver_impl_chromeos_unittest.cc
+++ b/chromeos/network/host_resolver_impl_chromeos_unittest.cc

@@ -127,11 +127,11 @@
                    const std::string& method,
                    const std::string& address) {
     DBusThreadManager::Get()->GetShillIPConfigClient()->SetProperty(
-        dbus::ObjectPath(path), shill::kAddressProperty,
-        base::StringValue(address), base::Bind(&DoNothingWithCallStatus));
+        dbus::ObjectPath(path), shill::kAddressProperty, base::Value(address),
+        base::Bind(&DoNothingWithCallStatus));
     DBusThreadManager::Get()->GetShillIPConfigClient()->SetProperty(
-        dbus::ObjectPath(path), shill::kMethodProperty,
-        base::StringValue(method), base::Bind(&DoNothingWithCallStatus));
+        dbus::ObjectPath(path), shill::kMethodProperty, base::Value(method),
+        base::Bind(&DoNothingWithCallStatus));
   }
 
   std::unique_ptr<NetworkStateHandler> network_state_handler_;

diff --git a/chromeos/network/network_cert_migrator_unittest.cc b/chromeos/network/network_cert_migrator_unittest.cc
index 006027b0..d57a4ae 100644
--- a/chromeos/network/network_cert_migrator_unittest.cc
+++ b/chromeos/network/network_cert_migrator_unittest.cc

@@ -107,24 +107,22 @@
 
     // Ensure that the service appears as 'configured', i.e. is associated to a
     // Shill profile.
-    service_test_->SetServiceProperty(
-        network_id, shill::kProfileProperty, base::StringValue(kProfile));
+    service_test_->SetServiceProperty(network_id, shill::kProfileProperty,
+                                      base::Value(kProfile));
   }
 
   void SetupNetworkWithEapCertId(bool wifi, const std::string& cert_id) {
     std::string type = wifi ? shill::kTypeWifi: shill::kTypeEthernetEap;
     std::string name = wifi ? kWifiStub : kEthernetEapStub;
     AddService(name, type, shill::kStateOnline);
-    service_test_->SetServiceProperty(
-        name, shill::kEapCertIdProperty, base::StringValue(cert_id));
-    service_test_->SetServiceProperty(
-        name, shill::kEapKeyIdProperty, base::StringValue(cert_id));
+    service_test_->SetServiceProperty(name, shill::kEapCertIdProperty,
+                                      base::Value(cert_id));
+    service_test_->SetServiceProperty(name, shill::kEapKeyIdProperty,
+                                      base::Value(cert_id));
 
     if (wifi) {
-      service_test_->SetServiceProperty(
-          name,
-          shill::kSecurityClassProperty,
-          base::StringValue(shill::kSecurity8021x));
+      service_test_->SetServiceProperty(name, shill::kSecurityClassProperty,
+                                        base::Value(shill::kSecurity8021x));
     }
   }
 

diff --git a/chromeos/network/network_configuration_handler.cc b/chromeos/network/network_configuration_handler.cc
index bdc8c0c..271bcb0f 100644
--- a/chromeos/network/network_configuration_handler.cc
+++ b/chromeos/network/network_configuration_handler.cc

@@ -365,7 +365,7 @@
     const network_handler::ErrorCallback& error_callback) {
   NET_LOG(USER) << "SetNetworkProfile: " << service_path << ": "
                 << profile_path;
-  base::StringValue profile_path_value(profile_path);
+  base::Value profile_path_value(profile_path);
   DBusThreadManager::Get()->GetShillServiceClient()->SetProperty(
       dbus::ObjectPath(service_path), shill::kProfileProperty,
       profile_path_value,

diff --git a/chromeos/network/network_configuration_handler_unittest.cc b/chromeos/network/network_configuration_handler_unittest.cc
index 3b00374..2ae84f3 100644
--- a/chromeos/network/network_configuration_handler_unittest.cc
+++ b/chromeos/network/network_configuration_handler_unittest.cc

@@ -305,11 +305,10 @@
   std::string expected_json = "{\n   \"SSID\": \"MyNetwork\"\n}\n";
   std::string networkName = "MyNetwork";
   std::string key = "SSID";
-  std::unique_ptr<base::StringValue> networkNameValue(
-      new base::StringValue(networkName));
+  std::unique_ptr<base::Value> networkNameValue(new base::Value(networkName));
 
   base::DictionaryValue value;
-  value.Set(key, new base::StringValue(networkName));
+  value.Set(key, new base::Value(networkName));
   dictionary_value_result_ = &value;
   EXPECT_CALL(*mock_service_client_,
               SetProperty(dbus::ObjectPath(service_path), key,
@@ -334,11 +333,10 @@
   std::string service_path = "/service/1";
   std::string networkName = "MyNetwork";
   std::string key = "SSID";
-  std::unique_ptr<base::StringValue> networkNameValue(
-      new base::StringValue(networkName));
+  std::unique_ptr<base::Value> networkNameValue(new base::Value(networkName));
 
   base::DictionaryValue value;
-  value.Set(key, new base::StringValue(networkName));
+  value.Set(key, new base::Value(networkName));
   dictionary_value_result_ = &value;
   EXPECT_CALL(*mock_service_client_, SetProperties(_, _, _, _))
       .WillOnce(
@@ -354,12 +352,11 @@
   std::string service_path = "/service/1";
   std::string networkName = "MyNetwork";
   std::string key = "SSID";
-  std::unique_ptr<base::StringValue> networkNameValue(
-      new base::StringValue(networkName));
+  std::unique_ptr<base::Value> networkNameValue(new base::Value(networkName));
 
   // First set up a value to clear.
   base::DictionaryValue value;
-  value.Set(key, new base::StringValue(networkName));
+  value.Set(key, new base::Value(networkName));
   dictionary_value_result_ = &value;
   EXPECT_CALL(*mock_service_client_, SetProperties(_, _, _, _))
       .WillOnce(
@@ -386,12 +383,11 @@
   std::string service_path = "/service/1";
   std::string networkName = "MyNetwork";
   std::string key = "SSID";
-  std::unique_ptr<base::StringValue> networkNameValue(
-      new base::StringValue(networkName));
+  std::unique_ptr<base::Value> networkNameValue(new base::Value(networkName));
 
   // First set up a value to clear.
   base::DictionaryValue value;
-  value.Set(key, new base::StringValue(networkName));
+  value.Set(key, new base::Value(networkName));
   dictionary_value_result_ = &value;
   EXPECT_CALL(*mock_service_client_, SetProperties(_, _, _, _))
       .WillOnce(
@@ -421,10 +417,9 @@
   std::string profile = "profile path";
   base::DictionaryValue value;
   shill_property_util::SetSSID(networkName, &value);
-  value.SetWithoutPathExpansion(shill::kTypeProperty,
-                                new base::StringValue(type));
+  value.SetWithoutPathExpansion(shill::kTypeProperty, new base::Value(type));
   value.SetWithoutPathExpansion(shill::kProfileProperty,
-                                new base::StringValue(profile));
+                                new base::Value(profile));
 
   EXPECT_CALL(*mock_manager_client_,
               ConfigureServiceForProfile(dbus::ObjectPath(profile), _, _, _))

diff --git a/chromeos/network/network_connect_unittest.cc b/chromeos/network/network_connect_unittest.cc
index d39a9321..0a3cd44 100644
--- a/chromeos/network/network_connect_unittest.cc
+++ b/chromeos/network/network_connect_unittest.cc

@@ -106,9 +106,9 @@
                             "stub_wifi_device1");
     device_test_->AddDevice(kCellular1DevicePath, shill::kTypeCellular,
                             "stub_cellular_device1");
-    device_test_->SetDeviceProperty(
-        kCellular1DevicePath, shill::kTechnologyFamilyProperty,
-        base::StringValue(shill::kNetworkTechnologyGsm));
+    device_test_->SetDeviceProperty(kCellular1DevicePath,
+                                    shill::kTechnologyFamilyProperty,
+                                    base::Value(shill::kNetworkTechnologyGsm));
 
     service_test_ =
         DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
@@ -121,12 +121,11 @@
                               add_to_visible);
     service_test_->SetServiceProperty(kWiFi1ServicePath,
                                       shill::kSecurityClassProperty,
-                                      base::StringValue(shill::kSecurityWep));
+                                      base::Value(shill::kSecurityWep));
     service_test_->SetServiceProperty(
         kWiFi1ServicePath, shill::kConnectableProperty, base::Value(true));
-    service_test_->SetServiceProperty(kWiFi1ServicePath,
-                                      shill::kPassphraseProperty,
-                                      base::StringValue("password"));
+    service_test_->SetServiceProperty(
+        kWiFi1ServicePath, shill::kPassphraseProperty, base::Value("password"));
 
     // Create a cellular network.
     service_test_->AddService(kCellular1ServicePath, kCellular1Guid,
@@ -136,7 +135,7 @@
         kCellular1ServicePath, shill::kConnectableProperty, base::Value(true));
     service_test_->SetServiceProperty(
         kCellular1ServicePath, shill::kActivationStateProperty,
-        base::StringValue(shill::kActivationStateActivated));
+        base::Value(shill::kActivationStateActivated));
     service_test_->SetServiceProperty(kCellular1ServicePath,
                                       shill::kOutOfCreditsProperty,
                                       base::Value(false));
@@ -249,7 +248,7 @@
 
   service_test_->SetServiceProperty(
       kCellular1ServicePath, shill::kActivationStateProperty,
-      base::StringValue(shill::kActivationStateNotActivated));
+      base::Value(shill::kActivationStateNotActivated));
   base::RunLoop().RunUntilIdle();
 
   NetworkConnect::Get()->ConnectToNetworkId(kCellular1Guid);
@@ -260,10 +259,10 @@
 
   service_test_->SetServiceProperty(
       kCellular1ServicePath, shill::kActivationStateProperty,
-      base::StringValue(shill::kActivationStateNotActivated));
+      base::Value(shill::kActivationStateNotActivated));
   service_test_->SetServiceProperty(
       kCellular1ServicePath, shill::kActivationTypeProperty,
-      base::StringValue(shill::kActivationTypeNonCellular));
+      base::Value(shill::kActivationTypeNonCellular));
   base::RunLoop().RunUntilIdle();
 
   NetworkConnect::Get()->ConnectToNetworkId(kCellular1Guid);

diff --git a/chromeos/network/network_state_handler_unittest.cc b/chromeos/network/network_state_handler_unittest.cc
index d62e288..e2784e0 100644
--- a/chromeos/network/network_state_handler_unittest.cc
+++ b/chromeos/network/network_state_handler_unittest.cc

@@ -546,7 +546,7 @@
   ASSERT_TRUE(ethernet);
   EXPECT_EQ("", ethernet->security_class());
   EXPECT_EQ(1, test_observer_->PropertyUpdatesForService(eth1));
-  base::StringValue security_class_value("TestSecurityClass");
+  base::Value security_class_value("TestSecurityClass");
   SetServiceProperty(eth1, shill::kSecurityClassProperty, security_class_value);
   base::RunLoop().RunUntilIdle();
   ethernet = network_state_handler_->GetNetworkState(eth1);
@@ -634,7 +634,7 @@
   EXPECT_EQ(0, test_observer_->ConnectionStateChangesForService(eth1));
 
   // Change a network state.
-  base::StringValue connection_state_idle_value(shill::kStateIdle);
+  base::Value connection_state_idle_value(shill::kStateIdle);
   service_test_->SetServiceProperty(eth1, shill::kStateProperty,
                                    connection_state_idle_value);
   base::RunLoop().RunUntilIdle();
@@ -655,7 +655,7 @@
 
   EXPECT_EQ(0u, test_observer_->default_network_change_count());
   // Disconnect ethernet.
-  base::StringValue connection_state_idle_value(shill::kStateIdle);
+  base::Value connection_state_idle_value(shill::kStateIdle);
   service_test_->SetServiceProperty(eth1, shill::kStateProperty,
                                     connection_state_idle_value);
   base::RunLoop().RunUntilIdle();
@@ -678,7 +678,7 @@
   const std::string wifi1 = kShillManagerClientStubDefaultWifi;
 
   // Disconnect ethernet and wifi.
-  base::StringValue connection_state_idle_value(shill::kStateIdle);
+  base::Value connection_state_idle_value(shill::kStateIdle);
   service_test_->SetServiceProperty(eth1, shill::kStateProperty,
                                     connection_state_idle_value);
   service_test_->SetServiceProperty(wifi1, shill::kStateProperty,
@@ -688,7 +688,7 @@
 
   // Connect ethernet, should become the default network.
   test_observer_->reset_change_counts();
-  base::StringValue connection_state_ready_value(shill::kStateReady);
+  base::Value connection_state_ready_value(shill::kStateReady);
   service_test_->SetServiceProperty(eth1, shill::kStateProperty,
                                     connection_state_ready_value);
   base::RunLoop().RunUntilIdle();
@@ -708,9 +708,9 @@
   // DefaultService property changes.
   const std::string wifi1 = kShillManagerClientStubDefaultWifi;
   SetServiceProperty(eth1, shill::kStateProperty,
-                     base::StringValue(shill::kStateIdle));
+                     base::Value(shill::kStateIdle));
   manager_test_->SetManagerProperty(shill::kDefaultServiceProperty,
-                                    base::StringValue(wifi1));
+                                    base::Value(wifi1));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(wifi1, test_observer_->default_network());
   EXPECT_EQ(1u, test_observer_->default_network_change_count());
@@ -719,7 +719,7 @@
   // default network notification.
   test_observer_->reset_change_counts();
   service_test_->SetServiceProperty(wifi1, shill::kStateProperty,
-                                    base::StringValue(shill::kStateReady));
+                                    base::Value(shill::kStateReady));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(shill::kStateReady,
             test_observer_->default_network_connection_state());
@@ -729,7 +729,7 @@
   // a default network change.
   test_observer_->reset_change_counts();
   SetServiceProperty(wifi1, shill::kSecurityClassProperty,
-                     base::StringValue("TestSecurityClass"));
+                     base::Value("TestSecurityClass"));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1u, test_observer_->default_network_change_count());
 
@@ -744,19 +744,19 @@
   // fire once when the network is connected.
   test_observer_->reset_change_counts();
   SetServiceProperty(wifi1, shill::kStateProperty,
-                     base::StringValue(shill::kStateIdle));
+                     base::Value(shill::kStateIdle));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1u, test_observer_->default_network_change_count());
   EXPECT_EQ(std::string(), test_observer_->default_network());
 
   const std::string wifi2 = kShillManagerClientStubWifi2;
   manager_test_->SetManagerProperty(shill::kDefaultServiceProperty,
-                                    base::StringValue(wifi2));
+                                    base::Value(wifi2));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(1u, test_observer_->default_network_change_count());
   // Change the connection state of the default network, observer should fire.
   SetServiceProperty(wifi2, shill::kStateProperty,
-                     base::StringValue(shill::kStateReady));
+                     base::Value(shill::kStateReady));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(wifi2, test_observer_->default_network());
   EXPECT_EQ(2u, test_observer_->default_network_change_count());
@@ -878,9 +878,9 @@
   device_test_->SetDeviceProperty(
       kShillManagerClientStubWifiDevice, shill::kIPConfigsProperty,
       device_ip_configs);
-  service_test_->SetServiceProperty(
-      kShillManagerClientStubDefaultWifi, shill::kIPConfigProperty,
-      base::StringValue(kIPConfigPath));
+  service_test_->SetServiceProperty(kShillManagerClientStubDefaultWifi,
+                                    shill::kIPConfigProperty,
+                                    base::Value(kIPConfigPath));
   UpdateManagerProperties();
   EXPECT_EQ(1, test_observer_->PropertyUpdatesForDevice(
       kShillManagerClientStubWifiDevice));

diff --git a/chromeos/network/onc/onc_translator_onc_to_shill.cc b/chromeos/network/onc/onc_translator_onc_to_shill.cc
index 606fe32..39e75c9 100644
--- a/chromeos/network/onc/onc_translator_onc_to_shill.cc
+++ b/chromeos/network/onc/onc_translator_onc_to_shill.cc

@@ -31,12 +31,11 @@
 
 namespace {
 
-std::unique_ptr<base::StringValue> ConvertValueToString(
-    const base::Value& value) {
+std::unique_ptr<base::Value> ConvertValueToString(const base::Value& value) {
   std::string str;
   if (!value.GetAsString(&str))
     base::JSONWriter::Write(value, &str);
-  return base::MakeUnique<base::StringValue>(str);
+  return base::MakeUnique<base::Value>(str);
 }
 
 // This class is responsible to translate the local fields of the given

diff --git a/chromeos/network/onc/onc_translator_shill_to_onc.cc b/chromeos/network/onc/onc_translator_shill_to_onc.cc
index d923b5d..ce403666 100644
--- a/chromeos/network/onc/onc_translator_shill_to_onc.cc
+++ b/chromeos/network/onc/onc_translator_shill_to_onc.cc

@@ -33,7 +33,7 @@
                                                   base::Value::Type type) {
   std::unique_ptr<base::Value> value;
   if (type == base::Value::Type::STRING) {
-    value.reset(new base::StringValue(str));
+    value.reset(new base::Value(str));
   } else {
     value = base::JSONReader::Read(str);
   }

diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc
index 4f956c4..a2c2d32 100644
--- a/chromeos/network/onc/onc_utils.cc
+++ b/chromeos/network/onc/onc_utils.cc

@@ -353,7 +353,7 @@
       bool* found_unknown_field,
       bool* error) override {
     if (FieldIsCredential(object_signature, field_name)) {
-      return std::unique_ptr<base::Value>(new base::StringValue(mask_));
+      return std::unique_ptr<base::Value>(new base::Value(mask_));
     } else {
       return Mapper::MapField(field_name, object_signature, onc_value,
                               found_unknown_field, error);
@@ -790,8 +790,8 @@
 
   const base::ListValue* recommended_keys = nullptr;
   return (onc->GetList(recommended_property_key, &recommended_keys) &&
-          recommended_keys->Find(base::StringValue(property_basename)) !=
-          recommended_keys->end());
+          recommended_keys->Find(base::Value(property_basename)) !=
+              recommended_keys->end());
 }
 
 namespace {

diff --git a/chromeos/network/proxy/proxy_config_handler.cc b/chromeos/network/proxy/proxy_config_handler.cc
index cc3a276..ed96a8b3 100644
--- a/chromeos/network/proxy/proxy_config_handler.cc
+++ b/chromeos/network/proxy/proxy_config_handler.cc

@@ -115,7 +115,7 @@
     base::JSONWriter::Write(proxy_config.GetDictionary(), &proxy_config_str);
     shill_service_client->SetProperty(
         dbus::ObjectPath(network.path()), shill::kProxyConfigProperty,
-        base::StringValue(proxy_config_str),
+        base::Value(proxy_config_str),
         base::Bind(&NotifyNetworkStateHandler, network.path()),
         base::Bind(&network_handler::ShillErrorCallbackFunction,
                    "SetProxyConfig.SetProperty Failed", network.path(),

diff --git a/chromeos/network/shill_property_handler.cc b/chromeos/network/shill_property_handler.cc
index d913d30..74ea70a 100644
--- a/chromeos/network/shill_property_handler.cc
+++ b/chromeos/network/shill_property_handler.cc

@@ -202,7 +202,7 @@
   // Send updated prohibited technology list to shill.
   const std::string prohibited_list =
       base::JoinString(prohibited_technologies, ",");
-  base::StringValue value(prohibited_list);
+  base::Value value(prohibited_list);
   shill_manager_->SetProperty(
       "ProhibitedTechnologies", value, base::Bind(&base::DoNothing),
       base::Bind(&network_handler::ShillErrorCallbackFunction,
@@ -212,7 +212,7 @@
 
 void ShillPropertyHandler::SetCheckPortalList(
     const std::string& check_portal_list) {
-  base::StringValue value(check_portal_list);
+  base::Value value(check_portal_list);
   shill_manager_->SetProperty(
       shill::kCheckPortalListProperty, value, base::Bind(&base::DoNothing),
       base::Bind(&network_handler::ShillErrorCallbackFunction,

diff --git a/chromeos/network/shill_property_handler_unittest.cc b/chromeos/network/shill_property_handler_unittest.cc
index 35d8c74..0778663c 100644
--- a/chromeos/network/shill_property_handler_unittest.cc
+++ b/chromeos/network/shill_property_handler_unittest.cc

@@ -420,7 +420,7 @@
   // Set the properties for an IP Config object.
   const std::string kTestIPConfigPath("test_ip_config_path");
 
-  base::StringValue ip_address("192.168.1.1");
+  base::Value ip_address("192.168.1.1");
   DBusThreadManager::Get()->GetShillIPConfigClient()->SetProperty(
       dbus::ObjectPath(kTestIPConfigPath),
       shill::kAddressProperty, ip_address,
@@ -437,7 +437,7 @@
       dbus::ObjectPath(kTestIPConfigPath),
       shill::kPrefixlenProperty, prefixlen,
       base::Bind(&DoNothingWithCallStatus));
-  base::StringValue gateway("192.0.0.1");
+  base::Value gateway("192.0.0.1");
   DBusThreadManager::Get()->GetShillIPConfigClient()->SetProperty(
       dbus::ObjectPath(kTestIPConfigPath),
       shill::kGatewayProperty, gateway,
@@ -453,10 +453,9 @@
   EXPECT_EQ(1, listener_->initial_property_updates(
       shill::kServiceCompleteListProperty)[kTestServicePath1]);
   DBusThreadManager::Get()->GetShillServiceClient()->SetProperty(
-      dbus::ObjectPath(kTestServicePath1),
-      shill::kIPConfigProperty,
-      base::StringValue(kTestIPConfigPath),
-      base::Bind(&base::DoNothing), base::Bind(&ErrorCallbackFunction));
+      dbus::ObjectPath(kTestServicePath1), shill::kIPConfigProperty,
+      base::Value(kTestIPConfigPath), base::Bind(&base::DoNothing),
+      base::Bind(&ErrorCallbackFunction));
   base::RunLoop().RunUntilIdle();
   // IPConfig property change on the service should trigger an IPConfigs update.
   EXPECT_EQ(1, listener_->property_updates(

diff --git a/components/arc/bluetooth/bluetooth_type_converters_unittest.cc b/components/arc/bluetooth/bluetooth_type_converters_unittest.cc
index c89ad8a..7971556 100644
--- a/components/arc/bluetooth/bluetooth_type_converters_unittest.cc
+++ b/components/arc/bluetooth/bluetooth_type_converters_unittest.cc

@@ -362,7 +362,7 @@
   std::string actualUUID;
   auto uuidAttributeBlueZ = bluez::BluetoothServiceAttributeValueBlueZ(
       bluez::BluetoothServiceAttributeValueBlueZ::UUID, sizeof(uint16_t),
-      base::MakeUnique<base::StringValue>(valueUUID));
+      base::MakeUnique<base::Value>(valueUUID));
 
   auto uuidAttributeMojo =
       ConvertTo<arc::mojom::BluetoothSdpAttributePtr>(uuidAttributeBlueZ);
@@ -379,7 +379,7 @@
   std::string actualString;
   auto stringAttributeBlueZ = bluez::BluetoothServiceAttributeValueBlueZ(
       bluez::BluetoothServiceAttributeValueBlueZ::STRING, valueString.length(),
-      base::MakeUnique<base::StringValue>(valueString));
+      base::MakeUnique<base::Value>(valueString));
 
   auto stringAttributeMojo =
       ConvertTo<arc::mojom::BluetoothSdpAttributePtr>(stringAttributeBlueZ);
@@ -400,7 +400,7 @@
       sequence(new bluez::BluetoothServiceAttributeValueBlueZ::Sequence());
   sequence->push_back(bluez::BluetoothServiceAttributeValueBlueZ(
       bluez::BluetoothServiceAttributeValueBlueZ::UUID, sizeof(uint16_t),
-      base::MakeUnique<base::StringValue>(l2capUUID)));
+      base::MakeUnique<base::Value>(l2capUUID)));
   sequence->push_back(bluez::BluetoothServiceAttributeValueBlueZ(
       bluez::BluetoothServiceAttributeValueBlueZ::UINT, sizeof(uint16_t),
       base::MakeUnique<base::Value>(l2capChannel)));

diff --git a/components/autofill/content/renderer/password_form_conversion_utils.cc b/components/autofill/content/renderer/password_form_conversion_utils.cc
index 3aa8e5b3..b92ff5f 100644
--- a/components/autofill/content/renderer/password_form_conversion_utils.cc
+++ b/components/autofill/content/renderer/password_form_conversion_utils.cc

@@ -680,10 +680,11 @@
   SyntheticForm synthetic_form;
   PopulateSyntheticFormFromWebForm(web_form, &synthetic_form);
 
-  WebFormElementToFormData(web_form, blink::WebFormControlElement(),
-                           field_value_and_properties_map,
-                           form_util::EXTRACT_NONE, &password_form->form_data,
-                           NULL /* FormFieldData */);
+  if (!WebFormElementToFormData(
+          web_form, blink::WebFormControlElement(),
+          field_value_and_properties_map, form_util::EXTRACT_NONE,
+          &password_form->form_data, NULL /* FormFieldData */))
+    return std::unique_ptr<PasswordForm>();
 
   if (!GetPasswordForm(synthetic_form, password_form.get(),
                        field_value_and_properties_map, form_predictions))
@@ -705,10 +706,12 @@
     return std::unique_ptr<PasswordForm>();
 
   std::unique_ptr<PasswordForm> password_form(new PasswordForm());
-  UnownedPasswordFormElementsAndFieldSetsToFormData(
-      synthetic_form.fieldsets, synthetic_form.control_elements, nullptr,
-      frame.document(), field_value_and_properties_map, form_util::EXTRACT_NONE,
-      &password_form->form_data, nullptr /* FormFieldData */);
+  if (!UnownedPasswordFormElementsAndFieldSetsToFormData(
+          synthetic_form.fieldsets, synthetic_form.control_elements, nullptr,
+          frame.document(), field_value_and_properties_map,
+          form_util::EXTRACT_NONE, &password_form->form_data,
+          nullptr /* FormFieldData */))
+    return std::unique_ptr<PasswordForm>();
   if (!GetPasswordForm(synthetic_form, password_form.get(),
                        field_value_and_properties_map, form_predictions))
     return std::unique_ptr<PasswordForm>();

diff --git a/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc b/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc
index ead2796..3a3ac4b 100644
--- a/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc
+++ b/components/autofill/content/renderer/password_form_conversion_utils_browsertest.cc

@@ -1470,4 +1470,13 @@
   EXPECT_FALSE(password_form->does_look_like_signup_form);
 }
 
+TEST_F(MAYBE_PasswordFormConversionUtilsTest, TooManyFieldsToParseForm) {
+  PasswordFormBuilder builder(kTestFormActionURL);
+  for (size_t i = 0; i < form_util::kMaxParseableFields + 1; ++i)
+    builder.AddTextField("id", "value", "autocomplete");
+  std::unique_ptr<PasswordForm> password_form =
+      LoadHTMLAndConvertForm(builder.ProduceHTML(), nullptr, false);
+  EXPECT_FALSE(password_form);
+}
+
 }  // namespace autofill

diff --git a/components/autofill/content/renderer/renderer_save_password_progress_logger.cc b/components/autofill/content/renderer/renderer_save_password_progress_logger.cc
index bd71dbc..361552614 100644
--- a/components/autofill/content/renderer/renderer_save_password_progress_logger.cc
+++ b/components/autofill/content/renderer/renderer_save_password_progress_logger.cc

@@ -25,8 +25,8 @@
 void RendererSavePasswordProgressLogger::LogElementName(
     StringID label,
     const blink::WebFormControlElement& element) {
-  LogValue(label, base::StringValue(
-                      ScrubElementID((element.nameForAutofill().utf16()))));
+  LogValue(label,
+           base::Value(ScrubElementID((element.nameForAutofill().utf16()))));
 }
 
 }  // namespace autofill

diff --git a/components/autofill/core/common/save_password_progress_logger.cc b/components/autofill/core/common/save_password_progress_logger.cc
index 0955bd0..73be9b49 100644
--- a/components/autofill/core/common/save_password_progress_logger.cc
+++ b/components/autofill/core/common/save_password_progress_logger.cc

@@ -18,7 +18,6 @@
 using base::checked_cast;
 using base::Value;
 using base::DictionaryValue;
-using base::StringValue;
 
 namespace autofill {
 
@@ -94,7 +93,7 @@
 void SavePasswordProgressLogger::LogURL(
     SavePasswordProgressLogger::StringID label,
     const GURL& url) {
-  LogValue(label, StringValue(ScrubURL(url)));
+  LogValue(label, Value(ScrubURL(url)));
 }
 
 void SavePasswordProgressLogger::LogBoolean(
@@ -117,7 +116,7 @@
 
 void SavePasswordProgressLogger::LogMessage(
     SavePasswordProgressLogger::StringID message) {
-  LogValue(STRING_MESSAGE, StringValue(GetStringFromID(message)));
+  LogValue(STRING_MESSAGE, Value(GetStringFromID(message)));
 }
 
 // static

diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc
index 38a3784..abbb1cd 100644
--- a/components/bookmarks/browser/bookmark_codec.cc
+++ b/components/bookmarks/browser/bookmark_codec.cc

@@ -89,7 +89,7 @@
   // We are going to store the computed checksum. So set stored checksum to be
   // the same as computed checksum.
   stored_checksum_ = computed_checksum_;
-  main->Set(kChecksumKey, new base::StringValue(computed_checksum_));
+  main->Set(kChecksumKey, new base::Value(computed_checksum_));
   main->Set(kRootsKey, roots);
   return main;
 }

diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
index 427f2d3..c08d8335 100644
--- a/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
+++ b/components/bookmarks/browser/bookmark_expanded_state_tracker.cc

@@ -107,7 +107,7 @@
   base::ListValue values;
   for (Nodes::const_iterator i = nodes.begin(); i != nodes.end(); ++i) {
     values.Set(values.GetSize(),
-               new base::StringValue(base::Int64ToString((*i)->id())));
+               new base::Value(base::Int64ToString((*i)->id())));
   }
 
   pref_service_->Set(prefs::kBookmarkEditorExpandedNodes, values);

diff --git a/components/browsing_data_strings.grdp b/components/browsing_data_strings.grdp
index 9de1c82c..744a4e6 100644
--- a/components/browsing_data_strings.grdp
+++ b/components/browsing_data_strings.grdp

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
-  
   <!-- Clear Browsing Data counters-->
   <message name="IDS_CLEAR_BROWSING_DATA_CALCULATING" desc="A text that is shown while the data volume is being counted.">
     Calculating...
@@ -66,6 +65,12 @@
   <message name="IDS_DEL_COOKIES_COUNTER" desc="A static message shown in the Clear Browsing Data dialog explaining to the user that deleting cookies and site data will result in the user being signed out of most websites.">
     This will sign you out of most websites.
   </message>
+  <message name="IDS_DEL_COOKIES_COUNTER_ADVANCED" desc="A counter showing the number of sites that use cookies.">
+    {COUNT, plural,
+      =0 {No cookies}
+      =1 {1 site uses cookies. }
+      other {# sites use cookies. }}
+  </message>
   <message name="IDS_DEL_DOWNLOADS_COUNTER" desc="A counter showing how many items of downloads history the user has.">
     {COUNT, plural,
      =0 {none}
@@ -90,4 +95,4 @@
   <message name="IDS_DEL_MEDIA_LICENSES_COUNTER_SITE_COMMENT" desc="A message shown in the Clear Browsing Data dialog explaining to the user that clearing media licenses will result in the user being unable to play some premium content from at least one specific web site">
      You may lose access to premium content from <ph name="SITE">$1<ex>youtube.com</ex></ph> and some other sites.
   </message>
-</grit-part>
\ No newline at end of file
+</grit-part>

diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc
index 5d4b87c9..4d765d8 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.cc

@@ -76,7 +76,7 @@
                         int64_t length,
                         base::ListValue* list_update) {
   int64_t value = GetInt64PrefValue(*list_update, index) + length;
-  list_update->Set(index, new base::StringValue(base::Int64ToString(value)));
+  list_update->Set(index, new base::Value(base::Int64ToString(value)));
 }
 
 // DailyContentLengthUpdate maintains a data saving pref. The pref is a list

diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc
index cadbcd3c..05ac2c9 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc

@@ -163,13 +163,13 @@
 
     for (size_t i = 0; i < kNumDaysInHistory; ++i) {
       original_daily_content_length_list->Set(
-          i, new base::StringValue(base::SizeTToString(i)));
+          i, new base::Value(base::SizeTToString(i)));
     }
 
     received_daily_content_length_list->Clear();
     for (size_t i = 0; i < kNumDaysInHistory / 2; ++i) {
       received_daily_content_length_list->Set(
-          i, new base::StringValue(base::SizeTToString(i)));
+          i, new base::Value(base::SizeTToString(i)));
     }
   }
 
@@ -178,8 +178,7 @@
     base::ListValue* update = compression_stats_->GetList(pref);
     update->Clear();
     for (size_t i = 0; i < kNumDaysInHistory; ++i) {
-      update->Insert(
-          0, base::MakeUnique<base::StringValue>(base::Int64ToString(0)));
+      update->Insert(0, base::MakeUnique<base::Value>(base::Int64ToString(0)));
     }
   }
 
@@ -544,8 +543,8 @@
 
 TEST_F(DataReductionProxyCompressionStatsTest, StatsRestoredOnOnRestart) {
   base::ListValue list_value;
-  list_value.Insert(
-      0, base::MakeUnique<base::StringValue>(base::Int64ToString(1234)));
+  list_value.Insert(0,
+                    base::MakeUnique<base::Value>(base::Int64ToString(1234)));
   pref_service()->Set(prefs::kDailyHttpOriginalContentLength, list_value);
 
   ResetCompressionStatsWithDelay(

diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs_unittest.cc
index beabdfb1..8567157 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs_unittest.cc

@@ -39,8 +39,7 @@
                       PrefService* pref_service) {
     ListPrefUpdate list(local_state_prefs(), pref_name);
     for (int64_t i = 0; i < 10L; ++i) {
-      list->Set(i, new base::StringValue(
-          base::Int64ToString(i + starting_value)));
+      list->Set(i, new base::Value(base::Int64ToString(i + starting_value)));
     }
   }
 

diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc
index 744a0f3b..0a54fbd5 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.cc

@@ -62,9 +62,9 @@
                                  prefs::kDailyHttpReceivedContentLength);
   for (int64_t i = 0; i < kNumDaysInHistory; i++) {
     original_update->Insert(
-        0, base::MakeUnique<base::StringValue>(base::Int64ToString(2 * i)));
+        0, base::MakeUnique<base::Value>(base::Int64ToString(2 * i)));
     received_update->Insert(
-        0, base::MakeUnique<base::StringValue>(base::Int64ToString(i)));
+        0, base::MakeUnique<base::Value>(base::Int64ToString(i)));
   }
   last_update_time_ = base::Time::Now().LocalMidnight();
   pref_service->SetInt64(prefs::kDailyHttpContentLengthLastUpdateDate,

diff --git a/components/dom_distiller/core/page_features_unittest.cc b/components/dom_distiller/core/page_features_unittest.cc
index 6d0bea3..0bfeb14 100644
--- a/components/dom_distiller/core/page_features_unittest.cc
+++ b/components/dom_distiller/core/page_features_unittest.cc

@@ -75,7 +75,7 @@
     std::string stringified_json;
     ASSERT_TRUE(base::JSONWriter::Write(*core_features, &stringified_json));
     std::unique_ptr<base::Value> stringified_value(
-        new base::StringValue(stringified_json));
+        new base::Value(stringified_json));
     std::vector<double> derived(
         CalculateDerivedFeaturesFromJSON(stringified_value.get()));
 

diff --git a/components/dom_distiller/core/viewer.cc b/components/dom_distiller/core/viewer.cc
index 524f50f..efc5c6a 100644
--- a/components/dom_distiller/core/viewer.cc
+++ b/components/dom_distiller/core/viewer.cc

@@ -150,11 +150,11 @@
 namespace viewer {
 
 const std::string GetShowFeedbackFormJs() {
-  base::StringValue question_val(
+  base::Value question_val(
       l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_QUALITY_QUESTION));
-  base::StringValue no_val(
+  base::Value no_val(
       l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_QUALITY_ANSWER_NO));
-  base::StringValue yes_val(
+  base::Value yes_val(
       l10n_util::GetStringUTF8(IDS_DOM_DISTILLER_QUALITY_ANSWER_YES));
 
   std::string question;
@@ -173,7 +173,7 @@
     const bool is_last_page) {
   std::string output(page_proto->html());
   EnsureNonEmptyContent(&output);
-  base::StringValue value(output);
+  base::Value value(output);
   base::JSONWriter::Write(value, &output);
   std::string page_update("addToPage(");
   page_update += output + ");";
@@ -187,7 +187,7 @@
       IDS_DOM_DISTILLER_VIEWER_FAILED_TO_FIND_ARTICLE_TITLE));
   std::string page_update(GetSetTitleJs(title));
 
-  base::StringValue value(l10n_util::GetStringUTF8(
+  base::Value value(l10n_util::GetStringUTF8(
       IDS_DOM_DISTILLER_VIEWER_FAILED_TO_FIND_ARTICLE_CONTENT));
   std::string output;
   base::JSONWriter::Write(value, &output);
@@ -201,14 +201,14 @@
 }
 
 const std::string GetSetTitleJs(std::string title) {
-  base::StringValue value(title);
+  base::Value value(title);
   std::string output;
   base::JSONWriter::Write(value, &output);
   return "setTitle(" + output + ");";
 }
 
 const std::string GetSetTextDirectionJs(const std::string& direction) {
-  base::StringValue value(direction);
+  base::Value value(direction);
   std::string output;
   base::JSONWriter::Write(value, &output);
   return "setTextDirection(" + output + ");";
@@ -240,7 +240,7 @@
 
   std::string output(unsafe_output_stream.str());
   EnsureNonEmptyContent(&output);
-  base::JSONWriter::Write(base::StringValue(output), &output);
+  base::JSONWriter::Write(base::Value(output), &output);
   std::string page_update("addToPage(");
   page_update += output + ");";
   return page_update + GetToggleLoadingIndicatorJs(true);

diff --git a/components/dom_distiller/ios/distiller_page_ios.mm b/components/dom_distiller/ios/distiller_page_ios.mm
index 4773be55..04bfd90 100644
--- a/components/dom_distiller/ios/distiller_page_ios.mm
+++ b/components/dom_distiller/ios/distiller_page_ios.mm

@@ -50,7 +50,7 @@
 
   CFTypeID result_type = CFGetTypeID(wk_result);
   if (result_type == CFStringGetTypeID()) {
-    result.reset(new base::StringValue(base::SysNSStringToUTF16(wk_result)));
+    result.reset(new base::Value(base::SysNSStringToUTF16(wk_result)));
     DCHECK(result->IsType(base::Value::Type::STRING));
   } else if (result_type == CFNumberGetTypeID()) {
     // Different implementation is here.

diff --git a/components/json_schema/json_schema_validator_unittest_base.cc b/components/json_schema/json_schema_validator_unittest_base.cc
index eb60ebb..1208c12 100644
--- a/components/json_schema/json_schema_validator_unittest_base.cc
+++ b/components/json_schema/json_schema_validator_unittest_base.cc

@@ -123,18 +123,16 @@
   schema->SetString(schema::kPattern, "foo+");
 
   ExpectValid(TEST_SOURCE,
-              std::unique_ptr<base::Value>(new base::StringValue("foo")).get(),
+              std::unique_ptr<base::Value>(new base::Value("foo")).get(),
               schema.get(), NULL);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("foooooo")).get(),
-      schema.get(), NULL);
-  ExpectNotValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("bar")).get(),
-      schema.get(), NULL, std::string(),
-      JSONSchemaValidator::FormatErrorMessage(
-          JSONSchemaValidator::kStringPattern, "foo+"));
+  ExpectValid(TEST_SOURCE,
+              std::unique_ptr<base::Value>(new base::Value("foooooo")).get(),
+              schema.get(), NULL);
+  ExpectNotValid(TEST_SOURCE,
+                 std::unique_ptr<base::Value>(new base::Value("bar")).get(),
+                 schema.get(), NULL, std::string(),
+                 JSONSchemaValidator::FormatErrorMessage(
+                     JSONSchemaValidator::kStringPattern, "foo+"));
 }
 
 void JSONSchemaValidatorTestBase::TestEnum() {
@@ -142,7 +140,7 @@
       LoadDictionary("enum_schema.json"));
 
   ExpectValid(TEST_SOURCE,
-              std::unique_ptr<base::Value>(new base::StringValue("foo")).get(),
+              std::unique_ptr<base::Value>(new base::Value("foo")).get(),
               schema.get(), NULL);
   ExpectValid(TEST_SOURCE,
               std::unique_ptr<base::Value>(new base::Value(42)).get(),
@@ -152,8 +150,7 @@
               schema.get(), NULL);
 
   ExpectNotValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("42")).get(),
+      TEST_SOURCE, std::unique_ptr<base::Value>(new base::Value("42")).get(),
       schema.get(), NULL, std::string(), JSONSchemaValidator::kInvalidEnum);
   ExpectNotValid(TEST_SOURCE, base::Value::CreateNullValue().get(),
                  schema.get(), NULL, std::string(),
@@ -175,8 +172,7 @@
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
 
   ExpectNotValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("foo")).get(),
+      TEST_SOURCE, std::unique_ptr<base::Value>(new base::Value("foo")).get(),
       schema.get(), NULL, std::string(), JSONSchemaValidator::kInvalidChoice);
   ExpectNotValid(
       TEST_SOURCE, std::unique_ptr<base::Value>(new base::ListValue()).get(),
@@ -413,7 +409,7 @@
   base::DictionaryValue* additional_properties = new base::DictionaryValue();
   additional_properties->SetString(schema::kType, schema::kAny);
   schema->Set(schema::kAdditionalProperties, additional_properties);
-  instance->Set(0, new base::StringValue("42"));
+  instance->Set(0, new base::Value("42"));
   instance->AppendString("anything");
   ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
   instance->Set(2, new base::ListValue());
@@ -497,22 +493,21 @@
   schema->SetInteger(schema::kMaxLength, 10);
 
   ExpectValid(TEST_SOURCE,
-              std::unique_ptr<base::Value>(new base::StringValue("x")).get(),
+              std::unique_ptr<base::Value>(new base::Value("x")).get(),
               schema.get(), NULL);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("xxxxxxxxxx")).get(),
-      schema.get(), NULL);
+  ExpectValid(TEST_SOURCE,
+              std::unique_ptr<base::Value>(new base::Value("xxxxxxxxxx")).get(),
+              schema.get(), NULL);
 
   ExpectNotValid(
       TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue(std::string())).get(),
+      std::unique_ptr<base::Value>(new base::Value(std::string())).get(),
       schema.get(), NULL, std::string(),
       JSONSchemaValidator::FormatErrorMessage(
           JSONSchemaValidator::kStringMinLength, "1"));
   ExpectNotValid(
       TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("xxxxxxxxxxx")).get(),
+      std::unique_ptr<base::Value>(new base::Value("xxxxxxxxxxx")).get(),
       schema.get(), NULL, std::string(),
       JSONSchemaValidator::FormatErrorMessage(
           JSONSchemaValidator::kStringMaxLength, "10"));
@@ -597,10 +592,9 @@
                     new base::Value(pow(-2.0, DBL_MANT_DIG) * 2))
                     .get()));
 
-  EXPECT_EQ(
-      std::string(schema::kString),
-      JSONSchemaValidator::GetJSONSchemaType(
-          std::unique_ptr<base::Value>(new base::StringValue("foo")).get()));
+  EXPECT_EQ(std::string(schema::kString),
+            JSONSchemaValidator::GetJSONSchemaType(
+                std::unique_ptr<base::Value>(new base::Value("foo")).get()));
   EXPECT_EQ(std::string(schema::kArray),
             JSONSchemaValidator::GetJSONSchemaType(
                 std::unique_ptr<base::Value>(new base::ListValue()).get()));
@@ -628,10 +622,9 @@
               schema.get(), NULL);
 
   schema->SetString(schema::kType, schema::kString);
-  ExpectValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("foobar")).get(),
-      schema.get(), NULL);
+  ExpectValid(TEST_SOURCE,
+              std::unique_ptr<base::Value>(new base::Value("foobar")).get(),
+              schema.get(), NULL);
 
   schema->SetString(schema::kType, schema::kNumber);
   ExpectValid(TEST_SOURCE,
@@ -712,8 +705,7 @@
 
   schema->SetString(schema::kType, schema::kNumber);
   ExpectNotValid(
-      TEST_SOURCE,
-      std::unique_ptr<base::Value>(new base::StringValue("42")).get(),
+      TEST_SOURCE, std::unique_ptr<base::Value>(new base::Value("42")).get(),
       schema.get(), NULL, std::string(),
       JSONSchemaValidator::FormatErrorMessage(
           JSONSchemaValidator::kInvalidType, schema::kNumber, schema::kString));

diff --git a/components/login/base_screen_handler_utils.cc b/components/login/base_screen_handler_utils.cc
index 89c2cf40..fe1851b 100644
--- a/components/login/base_screen_handler_utils.cc
+++ b/components/login/base_screen_handler_utils.cc

@@ -84,16 +84,16 @@
   return base::Value(v);
 }
 
-base::StringValue MakeValue(const std::string& v) {
-  return base::StringValue(v);
+base::Value MakeValue(const std::string& v) {
+  return base::Value(v);
 }
 
-base::StringValue MakeValue(const base::string16& v) {
-  return base::StringValue(v);
+base::Value MakeValue(const base::string16& v) {
+  return base::Value(v);
 }
 
-base::StringValue MakeValue(const AccountId& v) {
-  return base::StringValue(v.Serialize());
+base::Value MakeValue(const AccountId& v) {
+  return base::Value(v.Serialize());
 }
 
 ParsedValueContainer<AccountId>::ParsedValueContainer() {

diff --git a/components/login/base_screen_handler_utils.h b/components/login/base_screen_handler_utils.h
index e6a6e64..fbb74d35 100644
--- a/components/login/base_screen_handler_utils.h
+++ b/components/login/base_screen_handler_utils.h

@@ -56,9 +56,9 @@
 base::Value LOGIN_EXPORT MakeValue(bool v);
 base::Value LOGIN_EXPORT MakeValue(int v);
 base::Value LOGIN_EXPORT MakeValue(double v);
-base::StringValue LOGIN_EXPORT MakeValue(const std::string& v);
-base::StringValue LOGIN_EXPORT MakeValue(const base::string16& v);
-base::StringValue LOGIN_EXPORT MakeValue(const AccountId& v);
+base::Value LOGIN_EXPORT MakeValue(const std::string& v);
+base::Value LOGIN_EXPORT MakeValue(const base::string16& v);
+base::Value LOGIN_EXPORT MakeValue(const AccountId& v);
 
 template <typename T>
 inline const T& MakeValue(const T& v) {

diff --git a/components/login/screens/screen_context.cc b/components/login/screens/screen_context.cc
index 4021855..5e170b6 100644
--- a/components/login/screens/screen_context.cc
+++ b/components/login/screens/screen_context.cc

@@ -44,11 +44,11 @@
 }
 
 bool ScreenContext::SetString(const KeyType& key, const std::string& value) {
-  return Set(key, new base::StringValue(value));
+  return Set(key, new base::Value(value));
 }
 
 bool ScreenContext::SetString(const KeyType& key, const base::string16& value) {
-  return Set(key, new base::StringValue(value));
+  return Set(key, new base::Value(value));
 }
 
 bool ScreenContext::SetStringList(const KeyType& key, const StringList& value) {

diff --git a/components/ntp_tiles/webui/popular_sites_internals_message_handler.cc b/components/ntp_tiles/webui/popular_sites_internals_message_handler.cc
index 29e69b93..7163b59 100644
--- a/components/ntp_tiles/webui/popular_sites_internals_message_handler.cc
+++ b/components/ntp_tiles/webui/popular_sites_internals_message_handler.cc

@@ -114,12 +114,12 @@
   std::string version =
       prefs->GetString(ntp_tiles::prefs::kPopularSitesOverrideVersion);
   web_ui_->CallJavascriptFunction(
-      "chrome.popular_sites_internals.receiveOverrides", base::StringValue(url),
-      base::StringValue(country), base::StringValue(version));
+      "chrome.popular_sites_internals.receiveOverrides", base::Value(url),
+      base::Value(country), base::Value(version));
 }
 
 void PopularSitesInternalsMessageHandler::SendDownloadResult(bool success) {
-  base::StringValue result(success ? "Success" : "Fail");
+  base::Value result(success ? "Success" : "Fail");
   web_ui_->CallJavascriptFunction(
       "chrome.popular_sites_internals.receiveDownloadResult", result);
 }
@@ -142,7 +142,7 @@
 
 void PopularSitesInternalsMessageHandler::SendJson(const std::string& json) {
   web_ui_->CallJavascriptFunction("chrome.popular_sites_internals.receiveJson",
-                                  base::StringValue(json));
+                                  base::Value(json));
 }
 
 void PopularSitesInternalsMessageHandler::OnPopularSitesAvailable(

diff --git a/components/ownership/owner_settings_service.cc b/components/ownership/owner_settings_service.cc
index 6fbd902..ca969d2 100644
--- a/components/ownership/owner_settings_service.cc
+++ b/components/ownership/owner_settings_service.cc

@@ -137,7 +137,7 @@
 bool OwnerSettingsService::SetString(const std::string& setting,
                                      const std::string& value) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  base::StringValue in_value(value);
+  base::Value in_value(value);
   return Set(setting, in_value);
 }
 

diff --git a/components/password_manager/core/browser/browser_save_password_progress_logger.cc b/components/password_manager/core/browser/browser_save_password_progress_logger.cc
index db8803d..e2523ec7 100644
--- a/components/password_manager/core/browser/browser_save_password_progress_logger.cc
+++ b/components/password_manager/core/browser/browser_save_password_progress_logger.cc

@@ -161,7 +161,7 @@
 
 void BrowserSavePasswordProgressLogger::LogString(StringID label,
                                                   const std::string& s) {
-  LogValue(label, base::StringValue(s));
+  LogValue(label, base::Value(s));
 }
 
 void BrowserSavePasswordProgressLogger::SendLog(const std::string& log) {

diff --git a/components/plugins/renderer/loadable_plugin_placeholder.cc b/components/plugins/renderer/loadable_plugin_placeholder.cc
index 8bffae8..355dc7d 100644
--- a/components/plugins/renderer/loadable_plugin_placeholder.cc
+++ b/components/plugins/renderer/loadable_plugin_placeholder.cc

@@ -338,7 +338,7 @@
 
   std::unique_ptr<content::V8ValueConverter> converter(
       content::V8ValueConverter::create());
-  base::StringValue value("placeholderReady");
+  base::Value value("placeholderReady");
   blink::WebSerializedScriptValue message_data =
       blink::WebSerializedScriptValue::serialize(converter->ToV8Value(
           &value, element.document().frame()->mainWorldScriptContext()));

diff --git a/components/policy/core/browser/android/policy_converter.cc b/components/policy/core/browser/android/policy_converter.cc
index ef46e598..9460fa2 100644
--- a/components/policy/core/browser/android/policy_converter.cc
+++ b/components/policy/core/browser/android/policy_converter.cc

@@ -74,7 +74,7 @@
                                       const JavaRef<jstring>& value) {
   SetPolicyValue(
       ConvertJavaStringToUTF8(env, policyKey),
-      base::MakeUnique<base::StringValue>(ConvertJavaStringToUTF8(env, value)));
+      base::MakeUnique<base::Value>(ConvertJavaStringToUTF8(env, value)));
 }
 
 void PolicyConverter::SetPolicyStringArray(JNIEnv* env,

diff --git a/components/policy/core/browser/android/policy_converter_unittest.cc b/components/policy/core/browser/android/policy_converter_unittest.cc
index 3f522420..01fb7df 100644
--- a/components/policy/core/browser/android/policy_converter_unittest.cc
+++ b/components/policy/core/browser/android/policy_converter_unittest.cc

@@ -15,7 +15,6 @@
 
 using base::DictionaryValue;
 using base::ListValue;
-using base::StringValue;
 using base::Value;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
@@ -99,7 +98,7 @@
   Schema null_schema = schema_.GetKnownProperty("null");
   ASSERT_TRUE(null_schema.valid());
 
-  EXPECT_EQ("null", Convert(new StringValue("foo"), null_schema));
+  EXPECT_EQ("null", Convert(new Value("foo"), null_schema));
 }
 
 TEST_F(PolicyConverterTest, ConvertToBoolValue) {
@@ -108,14 +107,14 @@
 
   EXPECT_EQ("true", Convert(new Value(true), bool_schema));
   EXPECT_EQ("false", Convert(new Value(false), bool_schema));
-  EXPECT_EQ("true", Convert(new StringValue("true"), bool_schema));
-  EXPECT_EQ("false", Convert(new StringValue("false"), bool_schema));
-  EXPECT_EQ("\"narf\"", Convert(new StringValue("narf"), bool_schema));
+  EXPECT_EQ("true", Convert(new Value("true"), bool_schema));
+  EXPECT_EQ("false", Convert(new Value("false"), bool_schema));
+  EXPECT_EQ("\"narf\"", Convert(new Value("narf"), bool_schema));
   EXPECT_EQ("false", Convert(new Value(0), bool_schema));
   EXPECT_EQ("true", Convert(new Value(1), bool_schema));
   EXPECT_EQ("true", Convert(new Value(42), bool_schema));
   EXPECT_EQ("true", Convert(new Value(-1), bool_schema));
-  EXPECT_EQ("\"1\"", Convert(new StringValue("1"), bool_schema));
+  EXPECT_EQ("\"1\"", Convert(new Value("1"), bool_schema));
   EXPECT_EQ("{}", Convert(new DictionaryValue(), bool_schema));
 }
 
@@ -124,9 +123,9 @@
   ASSERT_TRUE(int_schema.valid());
 
   EXPECT_EQ("23", Convert(new Value(23), int_schema));
-  EXPECT_EQ("42", Convert(new StringValue("42"), int_schema));
-  EXPECT_EQ("-1", Convert(new StringValue("-1"), int_schema));
-  EXPECT_EQ("\"poit\"", Convert(new StringValue("poit"), int_schema));
+  EXPECT_EQ("42", Convert(new Value("42"), int_schema));
+  EXPECT_EQ("-1", Convert(new Value("-1"), int_schema));
+  EXPECT_EQ("\"poit\"", Convert(new Value("poit"), int_schema));
   EXPECT_EQ("false", Convert(new Value(false), int_schema));
 }
 
@@ -136,8 +135,8 @@
 
   EXPECT_EQ("3", Convert(new Value(3), double_schema));
   EXPECT_EQ("3.14", Convert(new Value(3.14), double_schema));
-  EXPECT_EQ("2.71", Convert(new StringValue("2.71"), double_schema));
-  EXPECT_EQ("\"zort\"", Convert(new StringValue("zort"), double_schema));
+  EXPECT_EQ("2.71", Convert(new Value("2.71"), double_schema));
+  EXPECT_EQ("\"zort\"", Convert(new Value("zort"), double_schema));
   EXPECT_EQ("true", Convert(new Value(true), double_schema));
 }
 
@@ -145,7 +144,7 @@
   Schema string_schema = schema_.GetKnownProperty("string");
   ASSERT_TRUE(string_schema.valid());
 
-  EXPECT_EQ("\"troz\"", Convert(new StringValue("troz"), string_schema));
+  EXPECT_EQ("\"troz\"", Convert(new Value("troz"), string_schema));
   EXPECT_EQ("4711", Convert(new Value(4711), string_schema));
 }
 
@@ -158,8 +157,8 @@
   list->AppendString("bar");
   EXPECT_EQ("[\"foo\",\"bar\"]", Convert(list, list_schema));
   EXPECT_EQ("[\"baz\",\"blurp\"]",
-            Convert(new StringValue("[\"baz\", \"blurp\"]"), list_schema));
-  EXPECT_EQ("\"hurz\"", Convert(new StringValue("hurz"), list_schema));
+            Convert(new Value("[\"baz\", \"blurp\"]"), list_schema));
+  EXPECT_EQ("\"hurz\"", Convert(new Value("hurz"), list_schema));
   EXPECT_EQ("19", Convert(new Value(19), list_schema));
 }
 
@@ -180,8 +179,8 @@
   dict->SetInteger("thx", 1138);
   EXPECT_EQ("{\"thx\":1138}", Convert(dict, dict_schema));
   EXPECT_EQ("{\"moose\":true}",
-            Convert(new StringValue("{\"moose\": true}"), dict_schema));
-  EXPECT_EQ("\"fnord\"", Convert(new StringValue("fnord"), dict_schema));
+            Convert(new Value("{\"moose\": true}"), dict_schema));
+  EXPECT_EQ("\"fnord\"", Convert(new Value("fnord"), dict_schema));
   EXPECT_EQ("1729", Convert(new Value(1729), dict_schema));
 }
 

diff --git a/components/policy/core/browser/configuration_policy_handler_unittest.cc b/components/policy/core/browser/configuration_policy_handler_unittest.cc
index 629a5c24..5a07756 100644
--- a/components/policy/core/browser/configuration_policy_handler_unittest.cc
+++ b/components/policy/core/browser/configuration_policy_handler_unittest.cc

@@ -85,8 +85,8 @@
   EXPECT_FALSE(errors.GetErrors(kTestPolicy).empty());
 
   policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                 POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>("no list"), NULL);
+                 POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("no list"),
+                 NULL);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
@@ -175,8 +175,8 @@
   // Check that an entirely invalid value is rejected and yields an error
   // message.
   policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                 POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>("invalid"), nullptr);
+                 POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("invalid"),
+                 nullptr);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
@@ -231,8 +231,8 @@
   // Check that an entirely invalid value is rejected and yields an error
   // message.
   policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                 POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>("invalid"), nullptr);
+                 POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("invalid"),
+                 nullptr);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
@@ -386,8 +386,8 @@
   // Check that an entirely invalid value is rejected and yields an error
   // message.
   policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                 POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>("invalid"), nullptr);
+                 POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("invalid"),
+                 nullptr);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());
@@ -443,8 +443,8 @@
   // Check that an entirely invalid value is rejected and yields an error
   // message.
   policy_map.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                 POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>("invalid"), nullptr);
+                 POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("invalid"),
+                 nullptr);
   errors.Clear();
   EXPECT_FALSE(handler.CheckPolicySettings(policy_map, &errors));
   EXPECT_FALSE(errors.empty());

diff --git a/components/policy/core/browser/configuration_policy_pref_store_unittest.cc b/components/policy/core/browser/configuration_policy_pref_store_unittest.cc
index 13513e5..7092fa27 100644
--- a/components/policy/core/browser/configuration_policy_pref_store_unittest.cc
+++ b/components/policy/core/browser/configuration_policy_pref_store_unittest.cc

@@ -87,13 +87,12 @@
   PolicyMap policy;
   policy.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>("http://chromium.org"),
-             nullptr);
+             base::MakeUnique<base::Value>("http://chromium.org"), nullptr);
   UpdateProviderPolicy(policy);
   const base::Value* value = NULL;
   EXPECT_TRUE(store_->GetValue(kTestPref, &value));
   ASSERT_TRUE(value);
-  EXPECT_TRUE(base::StringValue("http://chromium.org").Equals(value));
+  EXPECT_TRUE(base::Value("http://chromium.org").Equals(value));
 }
 
 // Test cases for boolean-valued policy settings.
@@ -186,12 +185,11 @@
   PolicyMap policy;
   policy.Set(kTestPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>("http://www.chromium.org"),
-             nullptr);
+             base::MakeUnique<base::Value>("http://www.chromium.org"), nullptr);
   UpdateProviderPolicy(policy);
   observer_.VerifyAndResetChangedKey(kTestPref);
   EXPECT_TRUE(store_->GetValue(kTestPref, &value));
-  EXPECT_TRUE(base::StringValue("http://www.chromium.org").Equals(value));
+  EXPECT_TRUE(base::Value("http://www.chromium.org").Equals(value));
 
   UpdateProviderPolicy(policy);
   EXPECT_TRUE(observer_.changed_keys.empty());

diff --git a/components/policy/core/browser/proxy_policy_handler_unittest.cc b/components/policy/core/browser/proxy_policy_handler_unittest.cc
index 9f261da..6a70b7f 100644
--- a/components/policy/core/browser/proxy_policy_handler_unittest.cc
+++ b/components/policy/core/browser/proxy_policy_handler_unittest.cc

@@ -77,12 +77,12 @@
 TEST_F(ProxyPolicyHandlerTest, ManualOptions) {
   PolicyMap policy;
   policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
-                                      "http://chromium.org/override"),
+             POLICY_SOURCE_CLOUD,
+             base::MakeUnique<base::Value>("http://chromium.org/override"),
              nullptr);
   policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>("chromium.org"), nullptr);
+             POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("chromium.org"),
+             nullptr);
   policy.Set(
       key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
       POLICY_SOURCE_CLOUD,
@@ -106,12 +106,12 @@
           ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE),
       nullptr);
   policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
-                                      "http://chromium.org/override"),
+             POLICY_SOURCE_CLOUD,
+             base::MakeUnique<base::Value>("http://chromium.org/override"),
              nullptr);
   policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>("chromium.org"), nullptr);
+             POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("chromium.org"),
+             nullptr);
   UpdateProviderPolicy(policy);
 
   VerifyProxyPrefs("chromium.org",
@@ -149,8 +149,8 @@
 TEST_F(ProxyPolicyHandlerTest, NoProxyModeName) {
   PolicyMap policy;
   policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
-                                      ProxyPrefs::kDirectProxyModeName),
+             POLICY_SOURCE_CLOUD,
+             base::MakeUnique<base::Value>(ProxyPrefs::kDirectProxyModeName),
              nullptr);
   UpdateProviderPolicy(policy);
   VerifyProxyPrefs(
@@ -173,10 +173,11 @@
 
 TEST_F(ProxyPolicyHandlerTest, AutoDetectProxyModeName) {
   PolicyMap policy;
-  policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
-                                      ProxyPrefs::kAutoDetectProxyModeName),
-             nullptr);
+  policy.Set(
+      key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+      POLICY_SOURCE_CLOUD,
+      base::MakeUnique<base::Value>(ProxyPrefs::kAutoDetectProxyModeName),
+      nullptr);
   UpdateProviderPolicy(policy);
   VerifyProxyPrefs(std::string(),
                    std::string(),
@@ -188,11 +189,11 @@
   PolicyMap policy;
   policy.Set(key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>("http://short.org/proxy.pac"),
+             base::MakeUnique<base::Value>("http://short.org/proxy.pac"),
              nullptr);
   policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
-                                      ProxyPrefs::kPacScriptProxyModeName),
+             POLICY_SOURCE_CLOUD,
+             base::MakeUnique<base::Value>(ProxyPrefs::kPacScriptProxyModeName),
              nullptr);
   UpdateProviderPolicy(policy);
   VerifyProxyPrefs(std::string(),
@@ -204,8 +205,8 @@
 TEST_F(ProxyPolicyHandlerTest, PacScriptProxyModeInvalid) {
   PolicyMap policy;
   policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
-                                      ProxyPrefs::kPacScriptProxyModeName),
+             POLICY_SOURCE_CLOUD,
+             base::MakeUnique<base::Value>(ProxyPrefs::kPacScriptProxyModeName),
              NULL);
   UpdateProviderPolicy(policy);
   const base::Value* value = NULL;
@@ -218,16 +219,16 @@
   PolicyMap policy;
   policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD,
-             base::WrapUnique(new base::StringValue(std::string())), nullptr);
-  policy.Set(
-      key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-      POLICY_SOURCE_CLOUD,
-      base::WrapUnique(new base::StringValue("http://short.org/proxy.pac")),
-      nullptr);
-  policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::WrapUnique(new base::StringValue(
-                                      ProxyPrefs::kPacScriptProxyModeName)),
+             base::WrapUnique(new base::Value(std::string())), nullptr);
+  policy.Set(key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+             POLICY_SOURCE_CLOUD,
+             base::WrapUnique(new base::Value("http://short.org/proxy.pac")),
              nullptr);
+  policy.Set(
+      key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+      POLICY_SOURCE_CLOUD,
+      base::WrapUnique(new base::Value(ProxyPrefs::kPacScriptProxyModeName)),
+      nullptr);
   UpdateProviderPolicy(policy);
   VerifyProxyPrefs(std::string(),
                    "http://short.org/proxy.pac",
@@ -250,8 +251,8 @@
 TEST_F(ProxyPolicyHandlerTest, UseSystemProxyMode) {
   PolicyMap policy;
   policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
-                                      ProxyPrefs::kSystemProxyModeName),
+             POLICY_SOURCE_CLOUD,
+             base::MakeUnique<base::Value>(ProxyPrefs::kSystemProxyModeName),
              nullptr);
   UpdateProviderPolicy(policy);
   VerifyProxyPrefs(
@@ -266,10 +267,11 @@
       POLICY_SOURCE_CLOUD,
       base::MakeUnique<base::Value>(ProxyPolicyHandler::PROXY_SERVER_MODE),
       nullptr);
-  policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
-                                      ProxyPrefs::kAutoDetectProxyModeName),
-             nullptr);
+  policy.Set(
+      key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+      POLICY_SOURCE_CLOUD,
+      base::MakeUnique<base::Value>(ProxyPrefs::kAutoDetectProxyModeName),
+      nullptr);
   UpdateProviderPolicy(policy);
   VerifyProxyPrefs(std::string(),
                    std::string(),
@@ -282,15 +284,15 @@
   PolicyMap policy;
   policy.Set(key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
              POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>("http://short.org/proxy.pac"),
+             base::MakeUnique<base::Value>("http://short.org/proxy.pac"),
              nullptr);
   policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
-                                      "http://chromium.org/override"),
+             POLICY_SOURCE_CLOUD,
+             base::MakeUnique<base::Value>("http://chromium.org/override"),
              nullptr);
   policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>("chromium.org"), nullptr);
+             POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("chromium.org"),
+             nullptr);
   for (int i = 0; i < ProxyPolicyHandler::MODE_COUNT; ++i) {
     policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(i), nullptr);

diff --git a/components/policy/core/common/async_policy_provider_unittest.cc b/components/policy/core/common/async_policy_provider_unittest.cc
index 3972542..5365465 100644
--- a/components/policy/core/common/async_policy_provider_unittest.cc
+++ b/components/policy/core/common/async_policy_provider_unittest.cc

@@ -34,7 +34,7 @@
                const std::string& value) {
   bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .Set(name, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_PLATFORM, base::MakeUnique<base::StringValue>(value),
+           POLICY_SOURCE_PLATFORM, base::MakeUnique<base::Value>(value),
            nullptr);
 }
 

diff --git a/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc b/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
index 836b15c..ad47f9a 100644
--- a/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc

@@ -88,9 +88,9 @@
 
 void TestHarness::InstallStringPolicy(const std::string& policy_name,
                                       const std::string& policy_value) {
-  store_.policy_map_.Set(
-      policy_name, policy_level(), policy_scope(), POLICY_SOURCE_CLOUD,
-      base::MakeUnique<base::StringValue>(policy_value), nullptr);
+  store_.policy_map_.Set(policy_name, policy_level(), policy_scope(),
+                         POLICY_SOURCE_CLOUD,
+                         base::MakeUnique<base::Value>(policy_value), nullptr);
 }
 
 void TestHarness::InstallIntegerPolicy(const std::string& policy_name,
@@ -174,8 +174,8 @@
   void SetUp() override {
     // Set up a policy map for testing.
     policy_map_.Set("key", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                    POLICY_SOURCE_CLOUD,
-                    base::MakeUnique<base::StringValue>("value"), nullptr);
+                    POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("value"),
+                    nullptr);
     expected_bundle_.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
         .CopyFrom(policy_map_);
 

diff --git a/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc b/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc
index 987dae0..423d401 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc
+++ b/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc

@@ -128,12 +128,12 @@
 
     public_key_ = builder_.GetPublicSigningKeyAsString();
 
-    expected_policy_.Set(
-        "Name", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-        base::MakeUnique<base::StringValue>("disabled"), nullptr);
+    expected_policy_.Set("Name", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+                         POLICY_SOURCE_CLOUD,
+                         base::MakeUnique<base::Value>("disabled"), nullptr);
     expected_policy_.Set("Second", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
                          POLICY_SOURCE_CLOUD,
-                         base::MakeUnique<base::StringValue>("maybe"), nullptr);
+                         base::MakeUnique<base::Value>("maybe"), nullptr);
   }
 
   void SetUp() override {
@@ -596,8 +596,8 @@
   PolicyBundle expected_bundle;
   expected_bundle.Get(kTestExtensionNS)
       .Set("Name", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD,
-           base::MakeUnique<base::StringValue>("published"), nullptr);
+           POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("published"),
+           nullptr);
   EXPECT_TRUE(service_->policy().Equals(expected_bundle));
 }
 

diff --git a/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc b/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc
index 21ecc43..e891c3f 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc
+++ b/components/policy/core/common/cloud/component_cloud_policy_store_unittest.cc

@@ -88,11 +88,11 @@
 
     PolicyMap& policy = expected_bundle_.Get(kTestPolicyNS);
     policy.Set("Name", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD,
-               base::MakeUnique<base::StringValue>("disabled"), nullptr);
+               POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("disabled"),
+               nullptr);
     policy.Set("Second", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
-               POLICY_SOURCE_CLOUD,
-               base::MakeUnique<base::StringValue>("maybe"), nullptr);
+               POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("maybe"),
+               nullptr);
   }
 
   void SetUp() override {

diff --git a/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc b/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc
index e7a28e0..28fad2f 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc
+++ b/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc

@@ -106,10 +106,10 @@
 
   PolicyMap& policy = expected_bundle_.Get(kTestPolicyNS);
   policy.Set("Name", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD,
-             base::MakeUnique<base::StringValue>("disabled"), nullptr);
+             POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("disabled"),
+             nullptr);
   policy.Set("Second", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
-             POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("maybe"),
+             POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("maybe"),
              nullptr);
 }
 

diff --git a/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc b/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc
index aea3c44..b6964f2 100644
--- a/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc
+++ b/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc

@@ -36,8 +36,8 @@
   void SetUp() override {
     // Set up a policy map for testing.
     policy_map_.Set("key", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                    POLICY_SOURCE_CLOUD,
-                    base::MakeUnique<base::StringValue>("value"), nullptr);
+                    POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("value"),
+                    nullptr);
     expected_bundle_.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
         .CopyFrom(policy_map_);
   }

diff --git a/components/policy/core/common/configuration_policy_provider_test.cc b/components/policy/core/common/configuration_policy_provider_test.cc
index 93254d6..ad5c264 100644
--- a/components/policy/core/common/configuration_policy_provider_test.cc
+++ b/components/policy/core/common/configuration_policy_provider_test.cc

@@ -253,7 +253,7 @@
 
 TEST_P(ConfigurationPolicyProviderTest, StringValue) {
   const char kTestString[] = "string_value";
-  base::StringValue expected_value(kTestString);
+  base::Value expected_value(kTestString);
   CheckValue(test_keys::kKeyString,
              expected_value,
              base::Bind(&PolicyProviderTestHarness::InstallStringPolicy,
@@ -284,8 +284,8 @@
 
 TEST_P(ConfigurationPolicyProviderTest, StringListValue) {
   base::ListValue expected_value;
-  expected_value.Set(0U, new base::StringValue("first"));
-  expected_value.Set(1U, new base::StringValue("second"));
+  expected_value.Set(0U, new base::Value("first"));
+  expected_value.Set(1U, new base::Value("second"));
   CheckValue(test_keys::kKeyStringList,
              expected_value,
              base::Bind(&PolicyProviderTestHarness::InstallStringListPolicy,
@@ -302,8 +302,8 @@
   expected_value.SetString("string", "omg");
 
   base::ListValue* list = new base::ListValue();
-  list->Set(0U, new base::StringValue("first"));
-  list->Set(1U, new base::StringValue("second"));
+  list->Set(0U, new base::Value("first"));
+  list->Set(1U, new base::Value("second"));
   expected_value.Set("array", list);
 
   base::DictionaryValue* dict = new base::DictionaryValue();
@@ -352,7 +352,7 @@
   bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .Set(test_keys::kKeyString, test_harness_->policy_level(),
            test_harness_->policy_scope(), test_harness_->policy_source(),
-           base::MakeUnique<base::StringValue>("value"), nullptr);
+           base::MakeUnique<base::Value>("value"), nullptr);
   EXPECT_TRUE(provider_->policies().Equals(bundle));
   provider_->RemoveObserver(&observer);
 }
@@ -393,7 +393,7 @@
   // help detecting memory leaks in the code paths that detect invalid input.
   policy_3rdparty.Set("invalid-domain.component", policy_dict.DeepCopy());
   policy_3rdparty.Set("extensions.cccccccccccccccccccccccccccccccc",
-                      new base::StringValue("invalid-value"));
+                      new base::Value("invalid-value"));
   test_harness_->Install3rdPartyPolicy(&policy_3rdparty);
 
   provider_->RefreshPolicies();

diff --git a/components/policy/core/common/generate_policy_source_unittest.cc b/components/policy/core/common/generate_policy_source_unittest.cc
index 2e2a91f..8ea85fd 100644
--- a/components/policy/core/common/generate_policy_source_unittest.cc
+++ b/components/policy/core/common/generate_policy_source_unittest.cc

@@ -214,17 +214,17 @@
 
   const base::Value* multiprof_behavior =
       policy_map.GetValue(key::kChromeOsMultiProfileUserBehavior);
-  base::StringValue expected("primary-only");
+  base::Value expected("primary-only");
   EXPECT_TRUE(expected.Equals(multiprof_behavior));
 
   // If policy already configured, it's not changed to enterprise defaults.
   policy_map.Set(key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY,
                  POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>("test_value"), nullptr);
+                 base::MakeUnique<base::Value>("test_value"), nullptr);
   SetEnterpriseUsersDefaults(&policy_map);
   multiprof_behavior =
       policy_map.GetValue(key::kChromeOsMultiProfileUserBehavior);
-  expected = base::StringValue("test_value");
+  expected = base::Value("test_value");
   EXPECT_TRUE(expected.Equals(multiprof_behavior));
 }
 #endif

diff --git a/components/policy/core/common/mac_util.cc b/components/policy/core/common/mac_util.cc
index dd06e1e..04167e00 100644
--- a/components/policy/core/common/mac_util.cc
+++ b/components/policy/core/common/mac_util.cc

@@ -71,7 +71,7 @@
 
   if (CFStringRef string = CFCast<CFStringRef>(property)) {
     return std::unique_ptr<base::Value>(
-        new base::StringValue(base::SysCFStringRefToUTF8(string)));
+        new base::Value(base::SysCFStringRefToUTF8(string)));
   }
 
   if (CFDictionaryRef dict = CFCast<CFDictionaryRef>(property)) {

diff --git a/components/policy/core/common/policy_bundle_unittest.cc b/components/policy/core/common/policy_bundle_unittest.cc
index e15abc3..91938437 100644
--- a/components/policy/core/common/policy_bundle_unittest.cc
+++ b/components/policy/core/common/policy_bundle_unittest.cc

@@ -34,7 +34,7 @@
   policy->Set("mandatory-user", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
               POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(123), nullptr);
   policy->Set("mandatory-machine", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-              POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("omg"),
+              POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("omg"),
               nullptr);
   policy->Set("recommended-user", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
               POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(true),

diff --git a/components/policy/core/common/policy_loader_ios_unittest.mm b/components/policy/core/common/policy_loader_ios_unittest.mm
index ef52acc..3f599f2 100644
--- a/components/policy/core/common/policy_loader_ios_unittest.mm
+++ b/components/policy/core/common/policy_loader_ios_unittest.mm

@@ -256,11 +256,9 @@
   PolicyMap& expectedMap =
       expected.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, ""));
   expectedMap.Set("shared", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-                  POLICY_SOURCE_PLATFORM, new base::StringValue("right"),
-                  nullptr);
+                  POLICY_SOURCE_PLATFORM, new base::Value("right"), nullptr);
   expectedMap.Set("key2", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-                  POLICY_SOURCE_PLATFORM, new base::StringValue("value2"),
-                  nullptr);
+                  POLICY_SOURCE_PLATFORM, new base::Value("value2"), nullptr);
 
   scoped_refptr<base::TestSimpleTaskRunner> taskRunner =
       new base::TestSimpleTaskRunner();

diff --git a/components/policy/core/common/policy_loader_mac_unittest.cc b/components/policy/core/common/policy_loader_mac_unittest.cc
index 7f3c14f..a9d636f 100644
--- a/components/policy/core/common/policy_loader_mac_unittest.cc
+++ b/components/policy/core/common/policy_loader_mac_unittest.cc

@@ -199,7 +199,7 @@
   expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .Set(test_keys::kKeyString, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
            POLICY_SOURCE_PLATFORM,
-           base::MakeUnique<base::StringValue>("string value"), nullptr);
+           base::MakeUnique<base::Value>("string value"), nullptr);
   EXPECT_TRUE(provider_->policies().Equals(expected_bundle));
 }
 

diff --git a/components/policy/core/common/policy_loader_win_unittest.cc b/components/policy/core/common/policy_loader_win_unittest.cc
index 1e06bd8..df67893 100644
--- a/components/policy/core/common/policy_loader_win_unittest.cc
+++ b/components/policy/core/common/policy_loader_win_unittest.cc

@@ -812,7 +812,7 @@
   PolicyBundle expected;
   expected.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .Set(test_keys::kKeyString, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-           POLICY_SOURCE_PLATFORM, base::MakeUnique<base::StringValue>("hklm"),
+           POLICY_SOURCE_PLATFORM, base::MakeUnique<base::Value>("hklm"),
            nullptr);
   EXPECT_TRUE(Matches(expected));
 }
@@ -865,17 +865,17 @@
   PolicyMap& expected_policy = expected.Get(ns);
   expected_policy.Set(
       "a", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, POLICY_SOURCE_PLATFORM,
-      base::MakeUnique<base::StringValue>(kMachineMandatory), nullptr);
-  expected_policy.Set(
-      "b", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_PLATFORM,
-      base::MakeUnique<base::StringValue>(kUserMandatory), nullptr);
+      base::MakeUnique<base::Value>(kMachineMandatory), nullptr);
+  expected_policy.Set("b", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+                      POLICY_SOURCE_PLATFORM,
+                      base::MakeUnique<base::Value>(kUserMandatory), nullptr);
   expected_policy.Set("c", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
                       POLICY_SOURCE_PLATFORM,
-                      base::MakeUnique<base::StringValue>(kMachineRecommended),
+                      base::MakeUnique<base::Value>(kMachineRecommended),
                       nullptr);
-  expected_policy.Set(
-      "d", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, POLICY_SOURCE_PLATFORM,
-      base::MakeUnique<base::StringValue>(kUserRecommended), nullptr);
+  expected_policy.Set("d", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
+                      POLICY_SOURCE_PLATFORM,
+                      base::MakeUnique<base::Value>(kUserRecommended), nullptr);
   EXPECT_TRUE(Matches(expected));
 }
 

diff --git a/components/policy/core/common/policy_map_unittest.cc b/components/policy/core/common/policy_map_unittest.cc
index 638fa4e..5c49dfdc 100644
--- a/components/policy/core/common/policy_map_unittest.cc
+++ b/components/policy/core/common/policy_map_unittest.cc

@@ -59,11 +59,11 @@
 
 TEST_F(PolicyMapTest, SetAndGet) {
   PolicyMap map;
-  SetPolicy(&map, kTestPolicyName1, base::MakeUnique<base::StringValue>("aaa"));
-  base::StringValue expected("aaa");
+  SetPolicy(&map, kTestPolicyName1, base::MakeUnique<base::Value>("aaa"));
+  base::Value expected("aaa");
   EXPECT_TRUE(expected.Equals(map.GetValue(kTestPolicyName1)));
-  SetPolicy(&map, kTestPolicyName1, base::MakeUnique<base::StringValue>("bbb"));
-  base::StringValue expected_b("bbb");
+  SetPolicy(&map, kTestPolicyName1, base::MakeUnique<base::Value>("bbb"));
+  base::Value expected_b("bbb");
   EXPECT_TRUE(expected_b.Equals(map.GetValue(kTestPolicyName1)));
   SetPolicy(&map, kTestPolicyName1, CreateExternalDataFetcher("dummy"));
   EXPECT_FALSE(map.GetValue(kTestPolicyName1));
@@ -88,13 +88,13 @@
 
 TEST_F(PolicyMapTest, Equals) {
   PolicyMap a;
-  SetPolicy(&a, kTestPolicyName1, base::MakeUnique<base::StringValue>("aaa"));
+  SetPolicy(&a, kTestPolicyName1, base::MakeUnique<base::Value>("aaa"));
   PolicyMap a2;
-  SetPolicy(&a2, kTestPolicyName1, base::MakeUnique<base::StringValue>("aaa"));
+  SetPolicy(&a2, kTestPolicyName1, base::MakeUnique<base::Value>("aaa"));
   PolicyMap b;
-  SetPolicy(&b, kTestPolicyName1, base::MakeUnique<base::StringValue>("bbb"));
+  SetPolicy(&b, kTestPolicyName1, base::MakeUnique<base::Value>("bbb"));
   PolicyMap c;
-  SetPolicy(&c, kTestPolicyName1, base::MakeUnique<base::StringValue>("aaa"));
+  SetPolicy(&c, kTestPolicyName1, base::MakeUnique<base::Value>("aaa"));
   SetPolicy(&c, kTestPolicyName2, base::MakeUnique<base::Value>(true));
   PolicyMap d;
   SetPolicy(&d, kTestPolicyName1, CreateExternalDataFetcher("ddd"));
@@ -136,20 +136,20 @@
 
 TEST_F(PolicyMapTest, Swap) {
   PolicyMap a;
-  SetPolicy(&a, kTestPolicyName1, base::MakeUnique<base::StringValue>("aaa"));
+  SetPolicy(&a, kTestPolicyName1, base::MakeUnique<base::Value>("aaa"));
   SetPolicy(&a, kTestPolicyName2, CreateExternalDataFetcher("dummy"));
   PolicyMap b;
-  SetPolicy(&b, kTestPolicyName1, base::MakeUnique<base::StringValue>("bbb"));
+  SetPolicy(&b, kTestPolicyName1, base::MakeUnique<base::Value>("bbb"));
   SetPolicy(&b, kTestPolicyName3, base::MakeUnique<base::Value>(true));
 
   a.Swap(&b);
-  base::StringValue expected("bbb");
+  base::Value expected("bbb");
   EXPECT_TRUE(expected.Equals(a.GetValue(kTestPolicyName1)));
   base::Value expected_bool(true);
   EXPECT_TRUE(expected_bool.Equals(a.GetValue(kTestPolicyName3)));
   EXPECT_FALSE(a.GetValue(kTestPolicyName2));
   EXPECT_FALSE(a.Get(kTestPolicyName2));
-  base::StringValue expected_a("aaa");
+  base::Value expected_a("aaa");
   EXPECT_TRUE(expected_a.Equals(b.GetValue(kTestPolicyName1)));
   EXPECT_FALSE(b.GetValue(kTestPolicyName3));
   EXPECT_FALSE(a.GetValue(kTestPolicyName2));
@@ -169,7 +169,7 @@
 TEST_F(PolicyMapTest, MergeFrom) {
   PolicyMap a;
   a.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-        POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("google.com"),
+        POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("google.com"),
         nullptr);
   a.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(true), nullptr);
@@ -179,16 +179,16 @@
   a.Set(kTestPolicyName4, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
         POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(false), nullptr);
   a.Set(kTestPolicyName5, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
-        POLICY_SOURCE_CLOUD,
-        base::MakeUnique<base::StringValue>("google.com/q={x}"), nullptr);
+        POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("google.com/q={x}"),
+        nullptr);
   a.Set(kTestPolicyName7, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
         POLICY_SOURCE_ENTERPRISE_DEFAULT, base::MakeUnique<base::Value>(false),
         nullptr);
 
   PolicyMap b;
   b.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        POLICY_SOURCE_CLOUD,
-        base::MakeUnique<base::StringValue>("chromium.org"), nullptr);
+        POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("chromium.org"),
+        nullptr);
   b.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(false), nullptr);
   b.Set(kTestPolicyName3, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
@@ -198,8 +198,8 @@
         POLICY_SOURCE_PUBLIC_SESSION_OVERRIDE,
         base::MakeUnique<base::Value>(true), nullptr);
   b.Set(kTestPolicyName5, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        POLICY_SOURCE_PLATFORM,
-        base::MakeUnique<base::StringValue>(std::string()), nullptr);
+        POLICY_SOURCE_PLATFORM, base::MakeUnique<base::Value>(std::string()),
+        nullptr);
   b.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
         POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(true), nullptr);
   b.Set(kTestPolicyName7, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
@@ -211,8 +211,8 @@
   PolicyMap c;
   // POLICY_SCOPE_MACHINE over POLICY_SCOPE_USER.
   c.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        POLICY_SOURCE_CLOUD,
-        base::MakeUnique<base::StringValue>("chromium.org"), nullptr);
+        POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("chromium.org"),
+        nullptr);
   // |a| has precedence over |b|.
   c.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(true), nullptr);
@@ -225,8 +225,8 @@
         base::MakeUnique<base::Value>(true), nullptr);
   // POLICY_LEVEL_MANDATORY over POLICY_LEVEL_RECOMMENDED.
   c.Set(kTestPolicyName5, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-        POLICY_SOURCE_PLATFORM,
-        base::MakeUnique<base::StringValue>(std::string()), nullptr);
+        POLICY_SOURCE_PLATFORM, base::MakeUnique<base::Value>(std::string()),
+        nullptr);
   // Merge new ones.
   c.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
         POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(true), nullptr);
@@ -241,7 +241,7 @@
 TEST_F(PolicyMapTest, GetDifferingKeys) {
   PolicyMap a;
   a.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-        POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("google.com"),
+        POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("google.com"),
         nullptr);
   a.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         POLICY_SOURCE_CLOUD, nullptr, CreateExternalDataFetcher("dummy"));
@@ -252,14 +252,14 @@
   a.Set(kTestPolicyName5, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
         POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(false), nullptr);
   a.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
-        POLICY_SOURCE_CLOUD,
-        base::MakeUnique<base::StringValue>("google.com/q={x}"), nullptr);
+        POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("google.com/q={x}"),
+        nullptr);
   a.Set(kTestPolicyName7, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
         POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(true), nullptr);
 
   PolicyMap b;
   b.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-        POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("google.com"),
+        POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("google.com"),
         nullptr);
   b.Set(kTestPolicyName2, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
         POLICY_SOURCE_CLOUD, nullptr, CreateExternalDataFetcher("dummy"));
@@ -270,8 +270,8 @@
   b.Set(kTestPolicyName5, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
         POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(false), nullptr);
   b.Set(kTestPolicyName6, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
-        POLICY_SOURCE_CLOUD,
-        base::MakeUnique<base::StringValue>("google.com/q={x}"), nullptr);
+        POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("google.com/q={x}"),
+        nullptr);
   b.Set(kTestPolicyName8, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
         POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(true), nullptr);
 
@@ -315,7 +315,7 @@
   PolicyMap expected;
   expected.Set("TestPolicy1", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                POLICY_SOURCE_PLATFORM,
-               base::MakeUnique<base::StringValue>("google.com"), nullptr);
+               base::MakeUnique<base::Value>("google.com"), nullptr);
   expected.Set("TestPolicy2", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                POLICY_SOURCE_PLATFORM, base::MakeUnique<base::Value>(true),
                nullptr);
@@ -332,7 +332,7 @@
 TEST_F(PolicyMapTest, EraseNonmatching) {
   PolicyMap a;
   a.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-        POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("google.com"),
+        POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("google.com"),
         nullptr);
   a.Set(kTestPolicyName2, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_MACHINE,
         POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(true), nullptr);
@@ -341,7 +341,7 @@
 
   PolicyMap b;
   b.Set(kTestPolicyName1, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-        POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("google.com"),
+        POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("google.com"),
         nullptr);
   EXPECT_TRUE(a.Equals(b));
 }

diff --git a/components/policy/core/common/policy_service_impl_unittest.cc b/components/policy/core/common/policy_service_impl_unittest.cc
index a6b0e978..db9e321 100644
--- a/components/policy/core/common/policy_service_impl_unittest.cc
+++ b/components/policy/core/common/policy_service_impl_unittest.cc

@@ -56,16 +56,16 @@
       &bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()));
   policy_map->Set(kSameLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                   POLICY_SOURCE_ENTERPRISE_DEFAULT,
-                  base::MakeUnique<base::StringValue>(value), nullptr);
+                  base::MakeUnique<base::Value>(value), nullptr);
   policy_map->Set(kDiffLevelPolicy, level, scope, POLICY_SOURCE_PLATFORM,
-                  base::MakeUnique<base::StringValue>(value), nullptr);
+                  base::MakeUnique<base::Value>(value), nullptr);
   policy_map =
       &bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension));
   policy_map->Set(kSameLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                   POLICY_SOURCE_ENTERPRISE_DEFAULT,
-                  base::MakeUnique<base::StringValue>(value), nullptr);
+                  base::MakeUnique<base::Value>(value), nullptr);
   policy_map->Set(kDiffLevelPolicy, level, scope, POLICY_SOURCE_PLATFORM,
-                  base::MakeUnique<base::StringValue>(value), nullptr);
+                  base::MakeUnique<base::Value>(value), nullptr);
 }
 
 // Observer class that changes the policy in the passed provider when the
@@ -267,8 +267,8 @@
   PolicyMap policy_map;
   policy_map.CopyFrom(previous_policy_map);
   policy_map.Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                 POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>("value"), nullptr);
+                 POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("value"),
+                 nullptr);
 
   std::unique_ptr<PolicyBundle> bundle(new PolicyBundle());
   // The initial setup includes a policy for chrome that is now changing.
@@ -308,7 +308,7 @@
       .CopyFrom(policy_map);
   policy_map.Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                  POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>("another value"), nullptr);
+                 base::MakeUnique<base::Value>("another value"), nullptr);
   bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension1))
       .CopyFrom(policy_map);
   bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kExtension2))
@@ -536,12 +536,12 @@
   // precedence, on every namespace.
   expected.Set(kSameLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                POLICY_SOURCE_ENTERPRISE_DEFAULT,
-               base::MakeUnique<base::StringValue>("bundle0"), nullptr);
+               base::MakeUnique<base::Value>("bundle0"), nullptr);
   // For policies with different levels and scopes, the highest priority
   // level/scope combination takes precedence, on every namespace.
   expected.Set(kDiffLevelPolicy, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE,
-               POLICY_SOURCE_PLATFORM,
-               base::MakeUnique<base::StringValue>("bundle2"), nullptr);
+               POLICY_SOURCE_PLATFORM, base::MakeUnique<base::Value>("bundle2"),
+               nullptr);
   EXPECT_TRUE(policy_service_->GetPolicies(
       PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())).Equals(expected));
   EXPECT_TRUE(policy_service_->GetPolicies(
@@ -670,10 +670,10 @@
   // policy available.
   policy_map.Set(key::kProxyMode, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
                  POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>("pac_script"), nullptr);
+                 base::MakeUnique<base::Value>("pac_script"), nullptr);
   policy_map.Set(key::kProxyPacUrl, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
-                 POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
-                                          "http://example.com/wpad.dat"),
+                 POLICY_SOURCE_CLOUD,
+                 base::MakeUnique<base::Value>("http://example.com/wpad.dat"),
                  nullptr);
 
   // Add a value to a non-Chrome namespace.

diff --git a/components/policy/core/common/preg_parser.cc b/components/policy/core/common/preg_parser.cc
index 0d78b70..8126199 100644
--- a/components/policy/core/common/preg_parser.cc
+++ b/components/policy/core/common/preg_parser.cc

@@ -148,7 +148,7 @@
   switch (type) {
     case REG_SZ:
     case REG_EXPAND_SZ:
-      value->reset(new base::StringValue(DecodePRegStringValue(data)));
+      value->reset(new base::Value(DecodePRegStringValue(data)));
       return true;
     case REG_DWORD_LITTLE_ENDIAN:
     case REG_DWORD_BIG_ENDIAN:

diff --git a/components/policy/core/common/preg_parser_unittest.cc b/components/policy/core/common/preg_parser_unittest.cc
index e29c9c4..757ac70e 100644
--- a/components/policy/core/common/preg_parser_unittest.cc
+++ b/components/policy/core/common/preg_parser_unittest.cc

@@ -66,8 +66,7 @@
 void SetString(RegistryDict* dict,
                const std::string& name,
                const std::string&  value) {
-  dict->SetValue(name,
-                 base::WrapUnique<base::Value>(new base::StringValue(value)));
+  dict->SetValue(name, base::WrapUnique<base::Value>(new base::Value(value)));
 }
 
 TEST(PRegParserTest, TestParseFile) {

diff --git a/components/policy/core/common/proxy_policy_provider_unittest.cc b/components/policy/core/common/proxy_policy_provider_unittest.cc
index 254074d..1b57eb5 100644
--- a/components/policy/core/common/proxy_policy_provider_unittest.cc
+++ b/components/policy/core/common/proxy_policy_provider_unittest.cc

@@ -55,7 +55,7 @@
   PolicyBundle bundle;
   bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("value"),
+           POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("value"),
            nullptr);
   mock_provider_.UpdatePolicy(CopyBundle(bundle));
 
@@ -67,8 +67,8 @@
   EXPECT_CALL(observer_, OnUpdatePolicy(&proxy_provider_));
   bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
       .Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD,
-           base::MakeUnique<base::StringValue>("new value"), nullptr);
+           POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("new value"),
+           nullptr);
   mock_provider_.UpdatePolicy(CopyBundle(bundle));
   Mock::VerifyAndClearExpectations(&observer_);
   EXPECT_TRUE(bundle.Equals(proxy_provider_.policies()));

diff --git a/components/policy/core/common/registry_dict.cc b/components/policy/core/common/registry_dict.cc
index 86e6824..29c9df7 100644
--- a/components/policy/core/common/registry_dict.cc
+++ b/components/policy/core/common/registry_dict.cc

@@ -260,8 +260,8 @@
     switch (it.Type()) {
       case REG_SZ:
       case REG_EXPAND_SZ:
-        SetValue(name, std::unique_ptr<base::Value>(new base::StringValue(
-                           base::UTF16ToUTF8(it.Value()))));
+        SetValue(name, std::unique_ptr<base::Value>(
+                           new base::Value(base::UTF16ToUTF8(it.Value()))));
         continue;
       case REG_DWORD_LITTLE_ENDIAN:
       case REG_DWORD_BIG_ENDIAN:

diff --git a/components/policy/core/common/registry_dict_unittest.cc b/components/policy/core/common/registry_dict_unittest.cc
index b26349db..e415d55 100644
--- a/components/policy/core/common/registry_dict_unittest.cc
+++ b/components/policy/core/common/registry_dict_unittest.cc

@@ -19,7 +19,7 @@
   RegistryDict test_dict;
 
   base::Value int_value(42);
-  base::StringValue string_value("fortytwo");
+  base::Value string_value("fortytwo");
 
   test_dict.SetValue("one", int_value.CreateDeepCopy());
   EXPECT_EQ(1u, test_dict.values().size());
@@ -47,7 +47,7 @@
   RegistryDict test_dict;
 
   base::Value int_value(42);
-  base::StringValue string_value("fortytwo");
+  base::Value string_value("fortytwo");
 
   test_dict.SetValue("One", int_value.CreateDeepCopy());
   EXPECT_EQ(1u, test_dict.values().size());
@@ -70,7 +70,7 @@
   RegistryDict test_dict;
 
   base::Value int_value(42);
-  base::StringValue string_value("fortytwo");
+  base::Value string_value("fortytwo");
 
   std::unique_ptr<RegistryDict> subdict(new RegistryDict());
   subdict->SetValue("one", int_value.CreateDeepCopy());
@@ -134,7 +134,7 @@
   RegistryDict dict_b;
 
   base::Value int_value(42);
-  base::StringValue string_value("fortytwo");
+  base::Value string_value("fortytwo");
 
   dict_a.SetValue("one", int_value.CreateDeepCopy());
   std::unique_ptr<RegistryDict> subdict(new RegistryDict());
@@ -167,7 +167,7 @@
   RegistryDict dict_b;
 
   base::Value int_value(42);
-  base::StringValue string_value("fortytwo");
+  base::Value string_value("fortytwo");
 
   dict_a.SetValue("one", int_value.CreateDeepCopy());
   dict_a.SetKey("two", base::MakeUnique<RegistryDict>());
@@ -189,9 +189,9 @@
   RegistryDict test_dict;
 
   base::Value int_value(42);
-  base::StringValue string_value("fortytwo");
-  base::StringValue string_zero("0");
-  base::StringValue string_dict("{ \"key\": [ \"value\" ] }");
+  base::Value string_value("fortytwo");
+  base::Value string_zero("0");
+  base::Value string_dict("{ \"key\": [ \"value\" ] }");
 
   test_dict.SetValue("one", int_value.CreateDeepCopy());
   std::unique_ptr<RegistryDict> subdict(new RegistryDict());
@@ -244,7 +244,7 @@
   expected.Set("string-to-double", new base::Value(0.0));
   expected.Set("string-to-int", new base::Value(static_cast<int>(0)));
   expected_list.reset(new base::ListValue());
-  expected_list->Append(base::MakeUnique<base::StringValue>("value"));
+  expected_list->Append(base::MakeUnique<base::Value>("value"));
   expected_subdict.reset(new base::DictionaryValue());
   expected_subdict->Set("key", std::move(expected_list));
   expected.Set("string-to-dict", std::move(expected_subdict));
@@ -256,10 +256,10 @@
   RegistryDict test_dict;
 
   std::unique_ptr<RegistryDict> list(new RegistryDict());
-  list->SetValue("1", base::StringValue("1").CreateDeepCopy());
-  list->SetValue("2", base::StringValue("2").CreateDeepCopy());
-  list->SetValue("THREE", base::StringValue("3").CreateDeepCopy());
-  list->SetValue("4", base::StringValue("4").CreateDeepCopy());
+  list->SetValue("1", base::Value("1").CreateDeepCopy());
+  list->SetValue("2", base::Value("2").CreateDeepCopy());
+  list->SetValue("THREE", base::Value("3").CreateDeepCopy());
+  list->SetValue("4", base::Value("4").CreateDeepCopy());
   test_dict.SetKey("dict-to-list", std::move(list));
 
   std::string error;
@@ -280,9 +280,9 @@
 
   base::DictionaryValue expected;
   std::unique_ptr<base::ListValue> expected_list(new base::ListValue());
-  expected_list->Append(base::StringValue("1").CreateDeepCopy());
-  expected_list->Append(base::StringValue("2").CreateDeepCopy());
-  expected_list->Append(base::StringValue("4").CreateDeepCopy());
+  expected_list->Append(base::Value("1").CreateDeepCopy());
+  expected_list->Append(base::Value("2").CreateDeepCopy());
+  expected_list->Append(base::Value("4").CreateDeepCopy());
   expected.Set("dict-to-list", std::move(expected_list));
 
   EXPECT_TRUE(base::Value::Equals(actual.get(), &expected));
@@ -293,7 +293,7 @@
   RegistryDict test_dict;
 
   base::Value int_value(42);
-  base::StringValue string_value("fortytwo");
+  base::Value string_value("fortytwo");
 
   test_dict.SetValue("one", int_value.CreateDeepCopy());
   std::unique_ptr<RegistryDict> subdict(new RegistryDict());

diff --git a/components/policy/core/common/schema_map_unittest.cc b/components/policy/core/common/schema_map_unittest.cc
index 2d44a482..5913ee1 100644
--- a/components/policy/core/common/schema_map_unittest.cc
+++ b/components/policy/core/common/schema_map_unittest.cc

@@ -142,15 +142,14 @@
   PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, "");
   expected_bundle.Get(chrome_ns).Set(
       "ChromePolicy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-      POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("value"),
-      nullptr);
+      POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("value"), nullptr);
   bundle.CopyFrom(expected_bundle);
 
   // Unknown components are filtered out.
   PolicyNamespace another_extension_ns(POLICY_DOMAIN_EXTENSIONS, "xyz");
   bundle.Get(another_extension_ns)
       .Set("AnotherExtensionPolicy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("value"),
+           POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("value"),
            nullptr);
   schema_map->FilterBundle(&bundle);
   EXPECT_TRUE(bundle.Equals(expected_bundle));
@@ -176,14 +175,13 @@
   map.Set("object", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
           POLICY_SOURCE_CLOUD, dict.CreateDeepCopy(), nullptr);
   map.Set("string", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-          POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("value"),
-          nullptr);
+          POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("value"), nullptr);
 
   bundle.MergeFrom(expected_bundle);
   bundle.Get(extension_ns)
       .Set("Unexpected", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD,
-           base::MakeUnique<base::StringValue>("to-be-removed"), nullptr);
+           POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("to-be-removed"),
+           nullptr);
 
   schema_map->FilterBundle(&bundle);
   EXPECT_TRUE(bundle.Equals(expected_bundle));
@@ -239,15 +237,14 @@
   PolicyNamespace extension_ns(POLICY_DOMAIN_EXTENSIONS, "with-schema");
   bundle.Get(extension_ns)
       .Set("String", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("value 1"),
+           POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("value 1"),
            nullptr);
 
   // The Chrome namespace isn't filtered.
   PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, "");
   bundle.Get(chrome_ns).Set("ChromePolicy", POLICY_LEVEL_MANDATORY,
                             POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-                            base::MakeUnique<base::StringValue>("value 3"),
-                            nullptr);
+                            base::MakeUnique<base::Value>("value 3"), nullptr);
 
   PolicyBundle expected_bundle;
   expected_bundle.MergeFrom(bundle);
@@ -256,20 +253,20 @@
   PolicyNamespace without_schema_ns(POLICY_DOMAIN_EXTENSIONS, "without-schema");
   bundle.Get(without_schema_ns)
       .Set("Schemaless", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("value 2"),
+           POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("value 2"),
            nullptr);
 
   // Unknown policies of known components with a schema are removed.
   bundle.Get(extension_ns)
       .Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("value 4"),
+           POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("value 4"),
            nullptr);
 
   // Unknown components are removed.
   PolicyNamespace unknown_ns(POLICY_DOMAIN_EXTENSIONS, "unknown");
   bundle.Get(unknown_ns)
       .Set("Surprise", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>("value 5"),
+           POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("value 5"),
            nullptr);
 
   schema_map->FilterBundle(&bundle);

diff --git a/components/policy/core/common/schema_registry_tracking_policy_provider_unittest.cc b/components/policy/core/common/schema_registry_tracking_policy_provider_unittest.cc
index 5513e8a..fd6668d 100644
--- a/components/policy/core/common/schema_registry_tracking_policy_provider_unittest.cc
+++ b/components/policy/core/common/schema_registry_tracking_policy_provider_unittest.cc

@@ -85,17 +85,17 @@
 TEST_F(SchemaRegistryTrackingPolicyProviderTest, PassOnChromePolicy) {
   PolicyBundle bundle;
   const PolicyNamespace chrome_ns(POLICY_DOMAIN_CHROME, "");
-  bundle.Get(chrome_ns).Set(
-      "policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-      base::MakeUnique<base::StringValue>("visible"), nullptr);
+  bundle.Get(chrome_ns).Set("policy", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+                            POLICY_SOURCE_CLOUD,
+                            base::MakeUnique<base::Value>("visible"), nullptr);
 
   EXPECT_CALL(observer_, OnUpdatePolicy(&schema_registry_tracking_provider_));
   std::unique_ptr<PolicyBundle> delegate_bundle(new PolicyBundle);
   delegate_bundle->CopyFrom(bundle);
   delegate_bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, "xyz"))
       .Set("foo", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-           POLICY_SOURCE_CLOUD,
-           base::MakeUnique<base::StringValue>("not visible"), nullptr);
+           POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("not visible"),
+           nullptr);
   mock_provider_.UpdatePolicy(std::move(delegate_bundle));
   Mock::VerifyAndClearExpectations(&observer_);
 
@@ -122,8 +122,8 @@
 TEST_F(SchemaRegistryTrackingPolicyProviderTest, SchemaReadyWithComponents) {
   PolicyMap policy_map;
   policy_map.Set("foo", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                 POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>("omg"), nullptr);
+                 POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("omg"),
+                 nullptr);
   std::unique_ptr<PolicyBundle> bundle(new PolicyBundle);
   bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, "")).CopyFrom(policy_map);
   bundle->Get(PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, "xyz"))
@@ -171,8 +171,8 @@
 
   PolicyMap policy_map;
   policy_map.Set("foo", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
-                 POLICY_SOURCE_CLOUD,
-                 base::MakeUnique<base::StringValue>("omg"), nullptr);
+                 POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>("omg"),
+                 nullptr);
   // Chrome policy updates are visible even if the components aren't ready.
   EXPECT_CALL(observer_, OnUpdatePolicy(&schema_registry_tracking_provider_));
   mock_provider_.UpdateChromePolicy(policy_map);
@@ -209,9 +209,9 @@
 
   // Serve policy for |ns|.
   PolicyBundle platform_policy;
-  platform_policy.Get(ns).Set(
-      "foo", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-      base::MakeUnique<base::StringValue>("omg"), nullptr);
+  platform_policy.Get(ns).Set("foo", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+                              POLICY_SOURCE_CLOUD,
+                              base::MakeUnique<base::Value>("omg"), nullptr);
   std::unique_ptr<PolicyBundle> copy(new PolicyBundle);
   copy->CopyFrom(platform_policy);
   EXPECT_CALL(observer_, OnUpdatePolicy(_));

diff --git a/components/policy/core/common/schema_unittest.cc b/components/policy/core/common/schema_unittest.cc
index d63c12dc..dd8c0caf 100644
--- a/components/policy/core/common/schema_unittest.cc
+++ b/components/policy/core/common/schema_unittest.cc

@@ -858,16 +858,13 @@
     Schema subschema = schema.GetProperty("StringWithPattern");
     ASSERT_TRUE(subschema.valid());
 
-    TestSchemaValidation(
-        subschema, base::StringValue("foobar"), SCHEMA_STRICT, false);
-    TestSchemaValidation(
-        subschema, base::StringValue("foo"), SCHEMA_STRICT, true);
-    TestSchemaValidation(
-        subschema, base::StringValue("fo"), SCHEMA_STRICT, false);
-    TestSchemaValidation(
-        subschema, base::StringValue("fooo"), SCHEMA_STRICT, true);
-    TestSchemaValidation(
-        subschema, base::StringValue("^foo+$"), SCHEMA_STRICT, false);
+    TestSchemaValidation(subschema, base::Value("foobar"), SCHEMA_STRICT,
+                         false);
+    TestSchemaValidation(subschema, base::Value("foo"), SCHEMA_STRICT, true);
+    TestSchemaValidation(subschema, base::Value("fo"), SCHEMA_STRICT, false);
+    TestSchemaValidation(subschema, base::Value("fooo"), SCHEMA_STRICT, true);
+    TestSchemaValidation(subschema, base::Value("^foo+$"), SCHEMA_STRICT,
+                         false);
   }
 
   // Tests on ObjectWithPatternProperties.

diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py
index 62ed74b..88cf22a 100755
--- a/components/policy/tools/generate_policy_source.py
+++ b/components/policy/tools/generate_policy_source.py

@@ -687,7 +687,7 @@
     return [], 'base::MakeUnique<base::Value>(%s)' %\
                     json.dumps(value)
   elif type(value) == str:
-    return [], 'base::MakeUnique<base::StringValue>("%s")' % value
+    return [], 'base::MakeUnique<base::Value>("%s")' % value
   elif type(value) == list:
     setup = ['auto default_value = base::MakeUnique<base::ListValue>();']
     for entry in value:
@@ -1174,7 +1174,7 @@
   elif type == 'Type::INTEGER':
     return 'DecodeIntegerValue(%s)' % arg
   elif type == 'Type::STRING':
-    return 'new base::StringValue(%s)' % arg
+    return 'new base::Value(%s)' % arg
   elif type == 'Type::LIST':
     return 'DecodeStringList(%s)' % arg
   elif type == 'Type::DICTIONARY' or type == 'TYPE_EXTERNAL':

diff --git a/components/policy/tools/generate_policy_source_test.py b/components/policy/tools/generate_policy_source_test.py
index 9de1bbb..0a42616 100755
--- a/components/policy/tools/generate_policy_source_test.py
+++ b/components/policy/tools/generate_policy_source_test.py

@@ -26,7 +26,7 @@
     # Strings
     stmts, expr = generate_policy_source._GenerateDefaultValue('foo')
     self.assertListEqual([], stmts)
-    self.assertEqual('base::MakeUnique<base::StringValue>("foo")', expr)
+    self.assertEqual('base::MakeUnique<base::Value>("foo")', expr)
 
     # Empty list
     stmts, expr = generate_policy_source._GenerateDefaultValue([])
@@ -39,7 +39,7 @@
     self.assertListEqual([
         'auto default_value = base::MakeUnique<base::ListValue>();',
         'default_value->Append(base::MakeUnique<base::Value>(1));',
-        'default_value->Append(base::MakeUnique<base::StringValue>("2"));'
+        'default_value->Append(base::MakeUnique<base::Value>("2"));'
       ], stmts)
     self.assertEqual('std::move(default_value)', expr)
 

diff --git a/components/prefs/command_line_pref_store.cc b/components/prefs/command_line_pref_store.cc
index 49278c1..ddaac31e 100644
--- a/components/prefs/command_line_pref_store.cc
+++ b/components/prefs/command_line_pref_store.cc

@@ -22,9 +22,8 @@
   for (size_t i = 0; i < size; ++i) {
     if (command_line_->HasSwitch(string_switch[i].switch_name)) {
       SetValue(string_switch[i].preference_path,
-               base::MakeUnique<base::StringValue>(
-                   command_line_->GetSwitchValueASCII(
-                       string_switch[i].switch_name)),
+               base::MakeUnique<base::Value>(command_line_->GetSwitchValueASCII(
+                   string_switch[i].switch_name)),
                WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
     }
   }
@@ -35,12 +34,11 @@
     size_t size) {
   for (size_t i = 0; i < size; ++i) {
     if (command_line_->HasSwitch(path_switch[i].switch_name)) {
-      SetValue(
-          path_switch[i].preference_path,
-          base::MakeUnique<base::StringValue>(
-              command_line_->GetSwitchValuePath(path_switch[i].switch_name)
-                  .value()),
-          WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+      SetValue(path_switch[i].preference_path,
+               base::MakeUnique<base::Value>(
+                   command_line_->GetSwitchValuePath(path_switch[i].switch_name)
+                       .value()),
+               WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
     }
   }
 }

diff --git a/components/prefs/default_pref_store_unittest.cc b/components/prefs/default_pref_store_unittest.cc
index af6a074..20bbba3 100644
--- a/components/prefs/default_pref_store_unittest.cc
+++ b/components/prefs/default_pref_store_unittest.cc

@@ -6,7 +6,6 @@
 #include "components/prefs/default_pref_store.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using base::StringValue;
 using base::Value;
 
 namespace {
@@ -54,17 +53,17 @@
 
   // Setting a default value shouldn't send a change notification.
   pref_store->SetDefaultValue(kPrefKey,
-                              std::unique_ptr<Value>(new StringValue("foo")));
+                              std::unique_ptr<Value>(new Value("foo")));
   EXPECT_EQ(0, observer.change_count());
 
   // Replacing the default value should send a change notification...
-  pref_store->ReplaceDefaultValue(
-      kPrefKey, std::unique_ptr<Value>(new StringValue("bar")));
+  pref_store->ReplaceDefaultValue(kPrefKey,
+                                  std::unique_ptr<Value>(new Value("bar")));
   EXPECT_EQ(1, observer.change_count());
 
   // But only if the value actually changed.
-  pref_store->ReplaceDefaultValue(
-      kPrefKey, std::unique_ptr<Value>(new StringValue("bar")));
+  pref_store->ReplaceDefaultValue(kPrefKey,
+                                  std::unique_ptr<Value>(new Value("bar")));
   EXPECT_EQ(1, observer.change_count());
 }
 

diff --git a/components/prefs/json_pref_store_unittest.cc b/components/prefs/json_pref_store_unittest.cc
index f404d2a..0164ad6 100644
--- a/components/prefs/json_pref_store_unittest.cc
+++ b/components/prefs/json_pref_store_unittest.cc

@@ -229,7 +229,7 @@
   base::FilePath some_path(FILE_PATH_LITERAL("/usr/sbin/"));
 
   pref_store->SetValue(kSomeDirectory,
-                       base::MakeUnique<StringValue>(some_path.value()),
+                       base::MakeUnique<Value>(some_path.value()),
                        WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   EXPECT_TRUE(pref_store->GetValue(kSomeDirectory, &actual));
   EXPECT_TRUE(actual->GetAsString(&path));
@@ -257,9 +257,10 @@
   EXPECT_TRUE(actual->GetAsInteger(&integer));
   EXPECT_EQ(10, integer);
 
-  pref_store->SetValue(kLongIntPref, base::MakeUnique<StringValue>(
-                                         base::Int64ToString(214748364842LL)),
-                       WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
+  pref_store->SetValue(
+      kLongIntPref,
+      base::MakeUnique<Value>(base::Int64ToString(214748364842LL)),
+      WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   EXPECT_TRUE(pref_store->GetValue(kLongIntPref, &actual));
   EXPECT_TRUE(actual->GetAsString(&string_value));
   int64_t value;
@@ -872,7 +873,7 @@
 
   // Set a normal pref and check that it gets scheduled to be written.
   ASSERT_FALSE(file_writer->HasPendingWrite());
-  pref_store->SetValue("normal", base::MakeUnique<base::StringValue>("normal"),
+  pref_store->SetValue("normal", base::MakeUnique<base::Value>("normal"),
                        WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   ASSERT_TRUE(file_writer->HasPendingWrite());
   file_writer->DoScheduledWrite();
@@ -881,15 +882,14 @@
 
   // Set a lossy pref and check that it is not scheduled to be written.
   // SetValue/RemoveValue.
-  pref_store->SetValue("lossy", base::MakeUnique<base::StringValue>("lossy"),
+  pref_store->SetValue("lossy", base::MakeUnique<base::Value>("lossy"),
                        WriteablePrefStore::LOSSY_PREF_WRITE_FLAG);
   ASSERT_FALSE(file_writer->HasPendingWrite());
   pref_store->RemoveValue("lossy", WriteablePrefStore::LOSSY_PREF_WRITE_FLAG);
   ASSERT_FALSE(file_writer->HasPendingWrite());
 
   // SetValueSilently/RemoveValueSilently.
-  pref_store->SetValueSilently("lossy",
-                               base::MakeUnique<base::StringValue>("lossy"),
+  pref_store->SetValueSilently("lossy", base::MakeUnique<base::Value>("lossy"),
                                WriteablePrefStore::LOSSY_PREF_WRITE_FLAG);
   ASSERT_FALSE(file_writer->HasPendingWrite());
   pref_store->RemoveValueSilently("lossy",
@@ -897,7 +897,7 @@
   ASSERT_FALSE(file_writer->HasPendingWrite());
 
   // ReportValueChanged.
-  pref_store->SetValue("lossy", base::MakeUnique<base::StringValue>("lossy"),
+  pref_store->SetValue("lossy", base::MakeUnique<base::Value>("lossy"),
                        WriteablePrefStore::LOSSY_PREF_WRITE_FLAG);
   ASSERT_FALSE(file_writer->HasPendingWrite());
   pref_store->ReportValueChanged("lossy",
@@ -918,12 +918,12 @@
 
   // Set a lossy pref and check that it is not scheduled to be written.
   ASSERT_FALSE(file_writer->HasPendingWrite());
-  pref_store->SetValue("lossy", base::MakeUnique<base::StringValue>("lossy"),
+  pref_store->SetValue("lossy", base::MakeUnique<base::Value>("lossy"),
                        WriteablePrefStore::LOSSY_PREF_WRITE_FLAG);
   ASSERT_FALSE(file_writer->HasPendingWrite());
 
   // Set a normal pref and check that it is scheduled to be written.
-  pref_store->SetValue("normal", base::MakeUnique<base::StringValue>("normal"),
+  pref_store->SetValue("normal", base::MakeUnique<base::Value>("normal"),
                        WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   ASSERT_TRUE(file_writer->HasPendingWrite());
 
@@ -940,12 +940,12 @@
 
   // Set a normal pref and check that it is scheduled to be written.
   ASSERT_FALSE(file_writer->HasPendingWrite());
-  pref_store->SetValue("normal", base::MakeUnique<base::StringValue>("normal"),
+  pref_store->SetValue("normal", base::MakeUnique<base::Value>("normal"),
                        WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   ASSERT_TRUE(file_writer->HasPendingWrite());
 
   // Set a lossy pref and check that the write is still scheduled.
-  pref_store->SetValue("lossy", base::MakeUnique<base::StringValue>("lossy"),
+  pref_store->SetValue("lossy", base::MakeUnique<base::Value>("lossy"),
                        WriteablePrefStore::LOSSY_PREF_WRITE_FLAG);
   ASSERT_TRUE(file_writer->HasPendingWrite());
 
@@ -961,7 +961,7 @@
   ImportantFileWriter* file_writer = GetImportantFileWriter(pref_store.get());
 
   // Set a lossy pref and check that it is not scheduled to be written.
-  pref_store->SetValue("lossy", base::MakeUnique<base::StringValue>("lossy"),
+  pref_store->SetValue("lossy", base::MakeUnique<base::Value>("lossy"),
                        WriteablePrefStore::LOSSY_PREF_WRITE_FLAG);
   ASSERT_FALSE(file_writer->HasPendingWrite());
 
@@ -1125,7 +1125,7 @@
 
   EXPECT_EQ(NOT_CALLED,
             write_callback_observer_.GetAndResetPostWriteObservationState());
-  pref_store->SetValue("normal", base::MakeUnique<base::StringValue>("normal"),
+  pref_store->SetValue("normal", base::MakeUnique<base::Value>("normal"),
                        WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   file_writer->DoScheduledWrite();
 

diff --git a/components/prefs/pref_change_registrar_unittest.cc b/components/prefs/pref_change_registrar_unittest.cc
index 68b62cd..cecaca8 100644
--- a/components/prefs/pref_change_registrar_unittest.cc
+++ b/components/prefs/pref_change_registrar_unittest.cc

@@ -157,8 +157,7 @@
 TEST_F(ObserveSetOfPreferencesTest, IsManaged) {
   std::unique_ptr<PrefChangeRegistrar> pref_set(CreatePrefChangeRegistrar());
   EXPECT_FALSE(pref_set->IsManaged());
-  pref_service_->SetManagedPref(kHomePage,
-                                new StringValue("http://crbug.com"));
+  pref_service_->SetManagedPref(kHomePage, new Value("http://crbug.com"));
   EXPECT_TRUE(pref_set->IsManaged());
   pref_service_->SetManagedPref(kHomePageIsNewTabPage, new Value(true));
   EXPECT_TRUE(pref_set->IsManaged());
@@ -181,7 +180,7 @@
   pref_set.Add(kHomePageIsNewTabPage, callback);
 
   EXPECT_CALL(*this, OnPreferenceChanged(kHomePage));
-  pref_service_->SetUserPref(kHomePage, new StringValue("http://crbug.com"));
+  pref_service_->SetUserPref(kHomePage, new Value("http://crbug.com"));
   Mock::VerifyAndClearExpectations(this);
 
   EXPECT_CALL(*this, OnPreferenceChanged(kHomePageIsNewTabPage));
@@ -189,7 +188,7 @@
   Mock::VerifyAndClearExpectations(this);
 
   EXPECT_CALL(*this, OnPreferenceChanged(_)).Times(0);
-  pref_service_->SetUserPref(kApplicationLocale, new StringValue("en_US.utf8"));
+  pref_service_->SetUserPref(kApplicationLocale, new Value("en_US.utf8"));
   Mock::VerifyAndClearExpectations(this);
 }
 

diff --git a/components/prefs/pref_registry_simple.cc b/components/prefs/pref_registry_simple.cc
index ef15ce01..efd8cf2f 100644
--- a/components/prefs/pref_registry_simple.cc
+++ b/components/prefs/pref_registry_simple.cc

@@ -34,14 +34,14 @@
 
 void PrefRegistrySimple::RegisterStringPref(const std::string& path,
                                             const std::string& default_value) {
-  RegisterPrefAndNotify(path, new base::StringValue(default_value),
+  RegisterPrefAndNotify(path, new base::Value(default_value),
                         NO_REGISTRATION_FLAGS);
 }
 
 void PrefRegistrySimple::RegisterFilePathPref(
     const std::string& path,
     const base::FilePath& default_value) {
-  RegisterPrefAndNotify(path, new base::StringValue(default_value.value()),
+  RegisterPrefAndNotify(path, new base::Value(default_value.value()),
                         NO_REGISTRATION_FLAGS);
 }
 
@@ -67,16 +67,16 @@
 
 void PrefRegistrySimple::RegisterInt64Pref(const std::string& path,
                                            int64_t default_value) {
-  RegisterPrefAndNotify(
-      path, new base::StringValue(base::Int64ToString(default_value)),
-      NO_REGISTRATION_FLAGS);
+  RegisterPrefAndNotify(path,
+                        new base::Value(base::Int64ToString(default_value)),
+                        NO_REGISTRATION_FLAGS);
 }
 
 void PrefRegistrySimple::RegisterUint64Pref(const std::string& path,
                                             uint64_t default_value) {
-  RegisterPrefAndNotify(
-      path, new base::StringValue(base::Uint64ToString(default_value)),
-      NO_REGISTRATION_FLAGS);
+  RegisterPrefAndNotify(path,
+                        new base::Value(base::Uint64ToString(default_value)),
+                        NO_REGISTRATION_FLAGS);
 }
 
 void PrefRegistrySimple::RegisterBooleanPref(const std::string& path,
@@ -100,15 +100,14 @@
 void PrefRegistrySimple::RegisterStringPref(const std::string& path,
                                             const std::string& default_value,
                                             uint32_t flags) {
-  RegisterPrefAndNotify(path, new base::StringValue(default_value), flags);
+  RegisterPrefAndNotify(path, new base::Value(default_value), flags);
 }
 
 void PrefRegistrySimple::RegisterFilePathPref(
     const std::string& path,
     const base::FilePath& default_value,
     uint32_t flags) {
-  RegisterPrefAndNotify(path, new base::StringValue(default_value.value()),
-                        flags);
+  RegisterPrefAndNotify(path, new base::Value(default_value.value()), flags);
 }
 
 void PrefRegistrySimple::RegisterListPref(const std::string& path,
@@ -138,14 +137,14 @@
                                            int64_t default_value,
                                            uint32_t flags) {
   RegisterPrefAndNotify(
-      path, new base::StringValue(base::Int64ToString(default_value)), flags);
+      path, new base::Value(base::Int64ToString(default_value)), flags);
 }
 
 void PrefRegistrySimple::RegisterUint64Pref(const std::string& path,
                                             uint64_t default_value,
                                             uint32_t flags) {
   RegisterPrefAndNotify(
-      path, new base::StringValue(base::Uint64ToString(default_value)), flags);
+      path, new base::Value(base::Uint64ToString(default_value)), flags);
 }
 
 void PrefRegistrySimple::OnPrefRegistered(const std::string& path,

diff --git a/components/prefs/pref_service.cc b/components/prefs/pref_service.cc
index b42529b..89033a2 100644
--- a/components/prefs/pref_service.cc
+++ b/components/prefs/pref_service.cc

@@ -401,7 +401,7 @@
 }
 
 void PrefService::SetString(const std::string& path, const std::string& value) {
-  SetUserPrefValue(path, new base::StringValue(value));
+  SetUserPrefValue(path, new base::Value(value));
 }
 
 void PrefService::SetFilePath(const std::string& path,
@@ -410,7 +410,7 @@
 }
 
 void PrefService::SetInt64(const std::string& path, int64_t value) {
-  SetUserPrefValue(path, new base::StringValue(base::Int64ToString(value)));
+  SetUserPrefValue(path, new base::Value(base::Int64ToString(value)));
 }
 
 int64_t PrefService::GetInt64(const std::string& path) const {
@@ -431,7 +431,7 @@
 }
 
 void PrefService::SetUint64(const std::string& path, uint64_t value) {
-  SetUserPrefValue(path, new base::StringValue(base::Uint64ToString(value)));
+  SetUserPrefValue(path, new base::Value(base::Uint64ToString(value)));
 }
 
 uint64_t PrefService::GetUint64(const std::string& path) const {

diff --git a/components/prefs/pref_service_unittest.cc b/components/prefs/pref_service_unittest.cc
index 8c97e5e..55d3ccc 100644
--- a/components/prefs/pref_service_unittest.cc
+++ b/components/prefs/pref_service_unittest.cc

@@ -38,7 +38,7 @@
   registrar.Add(pref_name, obs.GetCallback());
 
   // This should fire the checks in MockPrefChangeCallback::OnPreferenceChanged.
-  const base::StringValue expected_value(new_pref_value);
+  const base::Value expected_value(new_pref_value);
   obs.Expect(pref_name, &expected_value);
   prefs.SetString(pref_name, new_pref_value);
   Mock::VerifyAndClearExpectations(&obs);
@@ -50,7 +50,7 @@
   Mock::VerifyAndClearExpectations(&obs);
 
   // Clearing the pref should cause the pref to fire.
-  const base::StringValue expected_default_value((std::string()));
+  const base::Value expected_default_value((std::string()));
   obs.Expect(pref_name, &expected_default_value);
   prefs.ClearPref(pref_name);
   Mock::VerifyAndClearExpectations(&obs);
@@ -83,12 +83,11 @@
   const char pref_name[] = "homepage";
 
   TestingPrefServiceSimple prefs;
-  prefs.SetUserPref(pref_name,
-                    new base::StringValue("http://www.cnn.com"));
+  prefs.SetUserPref(pref_name, new base::Value("http://www.cnn.com"));
   prefs.registry()->RegisterStringPref(pref_name, std::string());
 
   const char new_pref_value[] = "http://www.google.com/";
-  const base::StringValue expected_new_pref_value(new_pref_value);
+  const base::Value expected_new_pref_value(new_pref_value);
   MockPrefChangeCallback obs(&prefs);
   PrefChangeRegistrar registrar;
   registrar.Init(&prefs);
@@ -104,7 +103,7 @@
 
   // Now try adding a second pref observer.
   const char new_pref_value2[] = "http://www.youtube.com/";
-  const base::StringValue expected_new_pref_value2(new_pref_value2);
+  const base::Value expected_new_pref_value2(new_pref_value2);
   MockPrefChangeCallback obs2(&prefs);
   obs.Expect(pref_name, &expected_new_pref_value2);
   obs2.Expect(pref_name, &expected_new_pref_value2);
@@ -115,7 +114,7 @@
   Mock::VerifyAndClearExpectations(&obs2);
 
   // Set a recommended value.
-  const base::StringValue recommended_pref_value("http://www.gmail.com/");
+  const base::Value recommended_pref_value("http://www.gmail.com/");
   obs.Expect(pref_name, &expected_new_pref_value2);
   obs2.Expect(pref_name, &expected_new_pref_value2);
   // This should fire the checks in obs and obs2 but with an unchanged value
@@ -142,8 +141,7 @@
   prefs.registry()->RegisterIntegerPref(kPrefName, kTestValue);
 
   // Check falling back to a recommended value.
-  prefs.SetUserPref(kPrefName,
-                    new base::StringValue("not an integer"));
+  prefs.SetUserPref(kPrefName, new base::Value("not an integer"));
   const PrefService::Preference* pref = prefs.FindPreference(kPrefName);
   ASSERT_TRUE(pref);
   const base::Value* value = pref->GetValue();
@@ -354,7 +352,7 @@
 
 TEST_F(PrefServiceSetValueTest, SetStringValue) {
   const char default_string[] = "default";
-  const base::StringValue default_value(default_string);
+  const base::Value default_value(default_string);
   prefs_.registry()->RegisterStringPref(kName, default_string);
 
   PrefChangeRegistrar registrar;
@@ -370,7 +368,7 @@
   prefs_.Set(kName, default_value);
   Mock::VerifyAndClearExpectations(&observer_);
 
-  base::StringValue new_value(kValue);
+  base::Value new_value(kValue);
   observer_.Expect(kName, &new_value);
   prefs_.Set(kName, new_value);
   Mock::VerifyAndClearExpectations(&observer_);

diff --git a/components/prefs/pref_value_map.cc b/components/prefs/pref_value_map.cc
index a0352670..1d120a8 100644
--- a/components/prefs/pref_value_map.cc
+++ b/components/prefs/pref_value_map.cc

@@ -103,7 +103,7 @@
 
 void PrefValueMap::SetString(const std::string& key,
                              const std::string& value) {
-  SetValue(key, base::MakeUnique<base::StringValue>(value));
+  SetValue(key, base::MakeUnique<base::Value>(value));
 }
 
 bool PrefValueMap::GetInteger(const std::string& key, int* value) const {

diff --git a/components/prefs/pref_value_map_unittest.cc b/components/prefs/pref_value_map_unittest.cc
index f6912da..0ad8cd1 100644
--- a/components/prefs/pref_value_map_unittest.cc
+++ b/components/prefs/pref_value_map_unittest.cc

@@ -17,12 +17,12 @@
   EXPECT_FALSE(map.GetValue("key", &result));
   EXPECT_FALSE(result);
 
-  EXPECT_TRUE(map.SetValue("key", base::MakeUnique<StringValue>("test")));
-  EXPECT_FALSE(map.SetValue("key", base::MakeUnique<StringValue>("test")));
-  EXPECT_TRUE(map.SetValue("key", base::MakeUnique<StringValue>("hi mom!")));
+  EXPECT_TRUE(map.SetValue("key", base::MakeUnique<Value>("test")));
+  EXPECT_FALSE(map.SetValue("key", base::MakeUnique<Value>("test")));
+  EXPECT_TRUE(map.SetValue("key", base::MakeUnique<Value>("hi mom!")));
 
   EXPECT_TRUE(map.GetValue("key", &result));
-  EXPECT_TRUE(StringValue("hi mom!").Equals(result));
+  EXPECT_TRUE(Value("hi mom!").Equals(result));
 }
 
 TEST(PrefValueMapTest, GetAndSetIntegerValue) {
@@ -53,7 +53,7 @@
   PrefValueMap map;
   EXPECT_FALSE(map.RemoveValue("key"));
 
-  EXPECT_TRUE(map.SetValue("key", base::MakeUnique<StringValue>("test")));
+  EXPECT_TRUE(map.SetValue("key", base::MakeUnique<Value>("test")));
   EXPECT_TRUE(map.GetValue("key", NULL));
 
   EXPECT_TRUE(map.RemoveValue("key"));
@@ -64,7 +64,7 @@
 
 TEST(PrefValueMapTest, Clear) {
   PrefValueMap map;
-  EXPECT_TRUE(map.SetValue("key", base::MakeUnique<StringValue>("test")));
+  EXPECT_TRUE(map.SetValue("key", base::MakeUnique<Value>("test")));
   EXPECT_TRUE(map.GetValue("key", NULL));
 
   map.Clear();
@@ -74,9 +74,9 @@
 
 TEST(PrefValueMapTest, GetDifferingKeys) {
   PrefValueMap reference;
-  EXPECT_TRUE(reference.SetValue("b", base::MakeUnique<StringValue>("test")));
-  EXPECT_TRUE(reference.SetValue("c", base::MakeUnique<StringValue>("test")));
-  EXPECT_TRUE(reference.SetValue("e", base::MakeUnique<StringValue>("test")));
+  EXPECT_TRUE(reference.SetValue("b", base::MakeUnique<Value>("test")));
+  EXPECT_TRUE(reference.SetValue("c", base::MakeUnique<Value>("test")));
+  EXPECT_TRUE(reference.SetValue("e", base::MakeUnique<Value>("test")));
 
   PrefValueMap check;
   std::vector<std::string> differing_paths;
@@ -88,9 +88,9 @@
   expected_differing_paths.push_back("e");
   EXPECT_EQ(expected_differing_paths, differing_paths);
 
-  EXPECT_TRUE(check.SetValue("a", base::MakeUnique<StringValue>("test")));
-  EXPECT_TRUE(check.SetValue("c", base::MakeUnique<StringValue>("test")));
-  EXPECT_TRUE(check.SetValue("d", base::MakeUnique<StringValue>("test")));
+  EXPECT_TRUE(check.SetValue("a", base::MakeUnique<Value>("test")));
+  EXPECT_TRUE(check.SetValue("c", base::MakeUnique<Value>("test")));
+  EXPECT_TRUE(check.SetValue("d", base::MakeUnique<Value>("test")));
 
   reference.GetDifferingKeys(&check, &differing_paths);
   expected_differing_paths.clear();
@@ -103,14 +103,14 @@
 
 TEST(PrefValueMapTest, SwapTwoMaps) {
   PrefValueMap first_map;
-  EXPECT_TRUE(first_map.SetValue("a", base::MakeUnique<StringValue>("test")));
-  EXPECT_TRUE(first_map.SetValue("b", base::MakeUnique<StringValue>("test")));
-  EXPECT_TRUE(first_map.SetValue("c", base::MakeUnique<StringValue>("test")));
+  EXPECT_TRUE(first_map.SetValue("a", base::MakeUnique<Value>("test")));
+  EXPECT_TRUE(first_map.SetValue("b", base::MakeUnique<Value>("test")));
+  EXPECT_TRUE(first_map.SetValue("c", base::MakeUnique<Value>("test")));
 
   PrefValueMap second_map;
-  EXPECT_TRUE(second_map.SetValue("d", base::MakeUnique<StringValue>("test")));
-  EXPECT_TRUE(second_map.SetValue("e", base::MakeUnique<StringValue>("test")));
-  EXPECT_TRUE(second_map.SetValue("f", base::MakeUnique<StringValue>("test")));
+  EXPECT_TRUE(second_map.SetValue("d", base::MakeUnique<Value>("test")));
+  EXPECT_TRUE(second_map.SetValue("e", base::MakeUnique<Value>("test")));
+  EXPECT_TRUE(second_map.SetValue("f", base::MakeUnique<Value>("test")));
 
   first_map.Swap(&second_map);
 

diff --git a/components/prefs/testing_pref_store.cc b/components/prefs/testing_pref_store.cc
index 8f6f209..e9b04c8 100644
--- a/components/prefs/testing_pref_store.cc
+++ b/components/prefs/testing_pref_store.cc

@@ -124,8 +124,7 @@
 
 void TestingPrefStore::SetString(const std::string& key,
                                  const std::string& value) {
-  SetValue(key, base::MakeUnique<base::StringValue>(value),
-           DEFAULT_PREF_WRITE_FLAGS);
+  SetValue(key, base::MakeUnique<base::Value>(value), DEFAULT_PREF_WRITE_FLAGS);
 }
 
 void TestingPrefStore::SetInteger(const std::string& key, int value) {

diff --git a/components/printing/renderer/print_web_view_helper.cc b/components/printing/renderer/print_web_view_helper.cc
index eaa294d9..f31074f2 100644
--- a/components/printing/renderer/print_web_view_helper.cc
+++ b/components/printing/renderer/print_web_view_helper.cc

@@ -591,7 +591,7 @@
   web_view->setMainFrame(frame);
   blink::WebFrameWidget::create(nullptr, web_view, frame);
 
-  base::StringValue html(ResourceBundle::GetSharedInstance().GetLocalizedString(
+  base::Value html(ResourceBundle::GetSharedInstance().GetLocalizedString(
       IDR_PRINT_PREVIEW_PAGE));
   // Load page with script to avoid async operations.
   ExecuteScript(frame, kPageLoadScriptFormat, html);

diff --git a/components/proximity_auth/webui/proximity_auth_webui_handler.cc b/components/proximity_auth/webui/proximity_auth_webui_handler.cc
index 834d8af..943a485d 100644
--- a/components/proximity_auth/webui/proximity_auth_webui_handler.cc
+++ b/components/proximity_auth/webui/proximity_auth_webui_handler.cc

@@ -368,7 +368,7 @@
 void ProximityAuthWebUIHandler::OnCryptAuthClientError(
     const std::string& error_message) {
   PA_LOG(WARNING) << "CryptAuth request failed: " << error_message;
-  base::StringValue error_string(error_message);
+  base::Value error_string(error_message);
   web_ui()->CallJavascriptFunctionUnsafe("CryptAuthInterface.onError",
                                          error_string);
 }

diff --git a/components/search_engines/default_search_policy_handler_unittest.cc b/components/search_engines/default_search_policy_handler_unittest.cc
index 02b9dcd..a8c86e13 100644
--- a/components/search_engines/default_search_policy_handler_unittest.cc
+++ b/components/search_engines/default_search_policy_handler_unittest.cc

@@ -84,19 +84,19 @@
               base::MakeUnique<base::Value>(true), nullptr);
   policy->Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::MakeUnique<base::StringValue>(kSearchURL), nullptr);
+              base::MakeUnique<base::Value>(kSearchURL), nullptr);
   policy->Set(key::kDefaultSearchProviderName, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::MakeUnique<base::StringValue>(kName), nullptr);
+              base::MakeUnique<base::Value>(kName), nullptr);
   policy->Set(key::kDefaultSearchProviderKeyword, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::MakeUnique<base::StringValue>(kKeyword), nullptr);
+              base::MakeUnique<base::Value>(kKeyword), nullptr);
   policy->Set(key::kDefaultSearchProviderSuggestURL, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::MakeUnique<base::StringValue>(kSuggestURL), nullptr);
+              base::MakeUnique<base::Value>(kSuggestURL), nullptr);
   policy->Set(key::kDefaultSearchProviderIconURL, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::MakeUnique<base::StringValue>(kIconURL), nullptr);
+              base::MakeUnique<base::Value>(kIconURL), nullptr);
   policy->Set(key::kDefaultSearchProviderEncodings, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
               base::WrapUnique(encodings), nullptr);
@@ -105,16 +105,16 @@
               default_alternate_urls_.CreateDeepCopy(), nullptr);
   policy->Set(key::kDefaultSearchProviderSearchTermsReplacementKey,
               POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::MakeUnique<base::StringValue>(kReplacementKey), nullptr);
+              base::MakeUnique<base::Value>(kReplacementKey), nullptr);
   policy->Set(key::kDefaultSearchProviderImageURL, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::MakeUnique<base::StringValue>(kImageURL), nullptr);
+              base::MakeUnique<base::Value>(kImageURL), nullptr);
   policy->Set(key::kDefaultSearchProviderImageURLPostParams,
               POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::MakeUnique<base::StringValue>(kImageParams), nullptr);
+              base::MakeUnique<base::Value>(kImageParams), nullptr);
   policy->Set(key::kDefaultSearchProviderNewTabURL, POLICY_LEVEL_MANDATORY,
               POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-              base::MakeUnique<base::StringValue>(kNewTabURL), nullptr);
+              base::MakeUnique<base::Value>(kNewTabURL), nullptr);
 }
 
 // Checks that if the default search policy is missing, that no elements of the
@@ -138,7 +138,7 @@
   const char bad_search_url[] = "http://test.com/noSearchTerms";
   policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             base::WrapUnique(new base::StringValue(bad_search_url)), nullptr);
+             base::WrapUnique(new base::Value(bad_search_url)), nullptr);
   UpdateProviderPolicy(policy);
 
   const base::Value* temp = nullptr;
@@ -285,7 +285,7 @@
              base::WrapUnique(new base::Value(true)), nullptr);
   policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             base::WrapUnique(new base::StringValue(kSearchURL)), nullptr);
+             base::WrapUnique(new base::Value(kSearchURL)), nullptr);
   UpdateProviderPolicy(policy);
 
   const base::Value* temp = NULL;
@@ -344,7 +344,7 @@
              base::WrapUnique(new base::Value(true)), nullptr);
   policy.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY,
              POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
-             base::WrapUnique(new base::StringValue(kFileSearchURL)), nullptr);
+             base::WrapUnique(new base::Value(kFileSearchURL)), nullptr);
   UpdateProviderPolicy(policy);
 
   const base::Value* temp = NULL;

diff --git a/components/ssl_config/ssl_config_service_manager_pref.cc b/components/ssl_config/ssl_config_service_manager_pref.cc
index ee63047..4ab20fb 100644
--- a/components/ssl_config/ssl_config_service_manager_pref.cc
+++ b/components/ssl_config/ssl_config_service_manager_pref.cc

@@ -197,7 +197,7 @@
   if (base::FeatureList::IsEnabled(kTLS13Feature)) {
     local_state->SetDefaultPrefValue(
         ssl_config::prefs::kSSLVersionMax,
-        new base::StringValue(switches::kSSLVersionTLSv13));
+        new base::Value(switches::kSSLVersionTLSv13));
   }
 
   PrefChangeRegistrar::NamedChangeCallback local_state_callback =

diff --git a/components/ssl_config/ssl_config_service_manager_pref_unittest.cc b/components/ssl_config/ssl_config_service_manager_pref_unittest.cc
index 12edb50..87988a1 100644
--- a/components/ssl_config/ssl_config_service_manager_pref_unittest.cc
+++ b/components/ssl_config/ssl_config_service_manager_pref_unittest.cc

@@ -163,7 +163,7 @@
 
   TestingPrefServiceSimple local_state;
   local_state.SetUserPref(ssl_config::prefs::kSSLVersionMin,
-                          new base::StringValue("ssl3"));
+                          new base::Value("ssl3"));
   SSLConfigServiceManager::RegisterPrefs(local_state.registry());
 
   std::unique_ptr<SSLConfigServiceManager> config_manager(
@@ -185,7 +185,7 @@
 
   TestingPrefServiceSimple local_state;
   local_state.SetUserPref(ssl_config::prefs::kSSLVersionMax,
-                          new base::StringValue("tls1.3"));
+                          new base::Value("tls1.3"));
   SSLConfigServiceManager::RegisterPrefs(local_state.registry());
 
   std::unique_ptr<SSLConfigServiceManager> config_manager(
@@ -206,7 +206,7 @@
 
   TestingPrefServiceSimple local_state;
   local_state.SetUserPref(ssl_config::prefs::kSSLVersionMax,
-                          new base::StringValue("tls1.1"));
+                          new base::Value("tls1.1"));
   SSLConfigServiceManager::RegisterPrefs(local_state.registry());
 
   std::unique_ptr<SSLConfigServiceManager> config_manager(
@@ -252,7 +252,7 @@
 
   TestingPrefServiceSimple local_state;
   local_state.SetUserPref(ssl_config::prefs::kSSLVersionMax,
-                          new base::StringValue("tls1.2"));
+                          new base::Value("tls1.2"));
   SSLConfigServiceManager::RegisterPrefs(local_state.registry());
 
   std::unique_ptr<SSLConfigServiceManager> config_manager(

diff --git a/components/sync/base/model_type.h b/components/sync/base/model_type.h
index c2840f1..34419ee 100644
--- a/components/sync/base/model_type.h
+++ b/components/sync/base/model_type.h

@@ -17,7 +17,6 @@
 namespace base {
 class ListValue;
 class Value;
-using StringValue = Value;
 }
 
 namespace sync_pb {
@@ -286,7 +285,7 @@
 // Handles all model types, and not just real ones.
 //
 // Caller takes ownership of returned value.
-base::StringValue* ModelTypeToValue(ModelType model_type);
+base::Value* ModelTypeToValue(ModelType model_type);
 
 // Converts a Value into a ModelType - complement to ModelTypeToValue().
 ModelType ModelTypeFromValue(const base::Value& value);

diff --git a/components/sync/engine_impl/js_mutation_event_observer.cc b/components/sync/engine_impl/js_mutation_event_observer.cc
index a4af4da..2554b1aa 100644
--- a/components/sync/engine_impl/js_mutation_event_observer.cc
+++ b/components/sync/engine_impl/js_mutation_event_observer.cc

@@ -64,7 +64,7 @@
     changes_value = changes_list;
   } else {
     changes_value =
-        new base::StringValue(base::SizeTToString(changes_size) + " changes");
+        new base::Value(base::SizeTToString(changes_size) + " changes");
   }
   details.Set("changes", changes_value);
   HandleJsEvent(FROM_HERE, "onChangesApplied", JsEventDetails(&details));

diff --git a/components/sync/protocol/proto_value_conversions.cc b/components/sync/protocol/proto_value_conversions.cc
index 89c9983..9f3d5d4e 100644
--- a/components/sync/protocol/proto_value_conversions.cc
+++ b/components/sync/protocol/proto_value_conversions.cc

@@ -84,9 +84,9 @@
 //    ToValue() doesn't have to return base::DictionaryValue though. It might
 //    be more appropriate to serialize GreenProto into a string instead:
 //
-//    std::unique_ptr<base::StringValue> ToValue(
+//    std::unique_ptr<base::Value> ToValue(
 //        const sync_pb::GreenProto& proto) const {
-//      return base::MakeUnique<base::StringValue>(proto.content());
+//      return base::MakeUnique<base::Value>(proto.content());
 //    }
 //
 class ToValueVisitor {
@@ -218,7 +218,7 @@
   std::unique_ptr<base::Value> ToValue(
       const sync_pb::UniquePosition& proto) const {
     UniquePosition pos = UniquePosition::FromProto(proto);
-    return base::MakeUnique<base::StringValue>(pos.ToDebugString());
+    return base::MakeUnique<base::Value>(pos.ToDebugString());
   }
 
  private:
@@ -233,29 +233,29 @@
   static std::unique_ptr<base::Value> BytesToValue(const std::string& bytes) {
     std::string bytes_base64;
     base::Base64Encode(bytes, &bytes_base64);
-    return base::MakeUnique<base::StringValue>(bytes_base64);
+    return base::MakeUnique<base::Value>(bytes_base64);
   }
 
   template <class E>
   static std::unique_ptr<base::Value> EnumToValue(E value) {
-    return base::MakeUnique<base::StringValue>(ProtoEnumToString(value));
+    return base::MakeUnique<base::Value>(ProtoEnumToString(value));
   }
 
   std::unique_ptr<base::Value> ToValue(const std::string& value) const {
-    return base::MakeUnique<base::StringValue>(value);
+    return base::MakeUnique<base::Value>(value);
   }
 
   std::unique_ptr<base::Value> ToValue(int64_t value) const {
-    return base::MakeUnique<base::StringValue>(base::Int64ToString(value));
+    return base::MakeUnique<base::Value>(base::Int64ToString(value));
   }
   std::unique_ptr<base::Value> ToValue(uint64_t value) const {
-    return base::MakeUnique<base::StringValue>(base::Int64ToString(value));
+    return base::MakeUnique<base::Value>(base::Int64ToString(value));
   }
   std::unique_ptr<base::Value> ToValue(uint32_t value) const {
-    return base::MakeUnique<base::StringValue>(base::Int64ToString(value));
+    return base::MakeUnique<base::Value>(base::Int64ToString(value));
   }
   std::unique_ptr<base::Value> ToValue(int32_t value) const {
-    return base::MakeUnique<base::StringValue>(base::Int64ToString(value));
+    return base::MakeUnique<base::Value>(base::Int64ToString(value));
   }
 
   std::unique_ptr<base::Value> ToValue(bool value) const {

diff --git a/components/sync/syncable/entry_kernel.cc b/components/sync/syncable/entry_kernel.cc
index 20cb7b4..591ef92 100644
--- a/components/sync/syncable/entry_kernel.cc
+++ b/components/sync/syncable/entry_kernel.cc

@@ -121,15 +121,15 @@
 
 // Helper functions for SetFieldValues().
 
-base::StringValue* Int64ToValue(int64_t i) {
-  return new base::StringValue(base::Int64ToString(i));
+base::Value* Int64ToValue(int64_t i) {
+  return new base::Value(base::Int64ToString(i));
 }
 
-base::StringValue* TimeToValue(const base::Time& t) {
-  return new base::StringValue(GetTimeDebugString(t));
+base::Value* TimeToValue(const base::Time& t) {
+  return new base::Value(GetTimeDebugString(t));
 }
 
-base::StringValue* IdToValue(const Id& id) {
+base::Value* IdToValue(const Id& id) {
   return id.ToValue();
 }
 
@@ -137,17 +137,16 @@
   return new base::Value(bool_val);
 }
 
-base::StringValue* StringToValue(const std::string& str) {
-  return new base::StringValue(str);
+base::Value* StringToValue(const std::string& str) {
+  return new base::Value(str);
 }
 
-base::StringValue* UniquePositionToValue(const UniquePosition& pos) {
-  return new base::StringValue(pos.ToDebugString());
+base::Value* UniquePositionToValue(const UniquePosition& pos) {
+  return new base::Value(pos.ToDebugString());
 }
 
-base::StringValue* AttachmentMetadataToValue(
-    const sync_pb::AttachmentMetadata& a) {
-  return new base::StringValue(a.SerializeAsString());
+base::Value* AttachmentMetadataToValue(const sync_pb::AttachmentMetadata& a) {
+  return new base::Value(a.SerializeAsString());
 }
 
 }  // namespace

diff --git a/components/sync/syncable/model_type.cc b/components/sync/syncable/model_type.cc
index 9c404a5..b222cd6 100644
--- a/components/sync/syncable/model_type.cc
+++ b/components/sync/syncable/model_type.cc

@@ -553,16 +553,16 @@
   return 0;
 }
 
-base::StringValue* ModelTypeToValue(ModelType model_type) {
+base::Value* ModelTypeToValue(ModelType model_type) {
   if (model_type >= FIRST_REAL_MODEL_TYPE) {
-    return new base::StringValue(ModelTypeToString(model_type));
+    return new base::Value(ModelTypeToString(model_type));
   } else if (model_type == TOP_LEVEL_FOLDER) {
-    return new base::StringValue("Top-level folder");
+    return new base::Value("Top-level folder");
   } else if (model_type == UNSPECIFIED) {
-    return new base::StringValue("Unspecified");
+    return new base::Value("Unspecified");
   }
   NOTREACHED();
-  return new base::StringValue(std::string());
+  return new base::Value(std::string());
 }
 
 ModelType ModelTypeFromValue(const base::Value& value) {

diff --git a/components/sync/syncable/model_type_unittest.cc b/components/sync/syncable/model_type_unittest.cc
index 1b2d974..701f4d3 100644
--- a/components/sync/syncable/model_type_unittest.cc
+++ b/components/sync/syncable/model_type_unittest.cc

@@ -31,7 +31,7 @@
 TEST_F(ModelTypeTest, ModelTypeFromValue) {
   for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) {
     ModelType model_type = ModelTypeFromInt(i);
-    std::unique_ptr<base::StringValue> value(ModelTypeToValue(model_type));
+    std::unique_ptr<base::Value> value(ModelTypeToValue(model_type));
     EXPECT_EQ(model_type, ModelTypeFromValue(*value));
   }
 }

diff --git a/components/sync/syncable/syncable_id.cc b/components/sync/syncable/syncable_id.cc
index 420ad38..24d8dfd 100644
--- a/components/sync/syncable/syncable_id.cc
+++ b/components/sync/syncable/syncable_id.cc

@@ -18,8 +18,8 @@
   return out;
 }
 
-base::StringValue* Id::ToValue() const {
-  return new base::StringValue(s_);
+base::Value* Id::ToValue() const {
+  return new base::Value(s_);
 }
 
 string Id::GetServerId() const {

diff --git a/components/sync/syncable/syncable_id.h b/components/sync/syncable/syncable_id.h
index df74680..100244b 100644
--- a/components/sync/syncable/syncable_id.h
+++ b/components/sync/syncable/syncable_id.h

@@ -16,7 +16,6 @@
 
 namespace base {
 class Value;
-using StringValue = Value;
 }  // namespace base
 
 namespace sql {
@@ -72,7 +71,7 @@
 
   // Dumps the ID as a value and returns it.  Transfers ownership of
   // the StringValue to the caller.
-  base::StringValue* ToValue() const;
+  base::Value* ToValue() const;
 
   // Three functions are used to work with our proto buffers.
   std::string GetServerId() const;

diff --git a/components/sync/syncable/write_transaction_info.cc b/components/sync/syncable/write_transaction_info.cc
index 9a156e86..0c4ac29 100644
--- a/components/sync/syncable/write_transaction_info.cc
+++ b/components/sync/syncable/write_transaction_info.cc

@@ -41,7 +41,7 @@
   if (mutations_size <= max_mutations_size) {
     mutations_value = EntryKernelMutationMapToValue(mutations.Get());
   } else {
-    mutations_value = base::MakeUnique<base::StringValue>(
+    mutations_value = base::MakeUnique<base::Value>(
         base::SizeTToString(mutations_size) + " mutations");
   }
   dict->Set("mutations", std::move(mutations_value));

diff --git a/components/sync/test/fake_server/fake_server_verifier.cc b/components/sync/test/fake_server/fake_server_verifier.cc
index b2497ea..daccde2 100644
--- a/components/sync/test/fake_server/fake_server_verifier.cc
+++ b/components/sync/test/fake_server/fake_server_verifier.cc

@@ -104,7 +104,7 @@
   base::ListValue* entity_list = nullptr;
   size_t actual_count = 0;
   if (entities->GetList(model_type_string, &entity_list)) {
-    base::StringValue name_value(name);
+    base::Value name_value(name);
     for (const auto& entity : *entity_list) {
       if (name_value.Equals(entity.get()))
         actual_count++;

diff --git a/components/sync_preferences/pref_model_associator_unittest.cc b/components/sync_preferences/pref_model_associator_unittest.cc
index eac90d7f..f189891 100644
--- a/components/sync_preferences/pref_model_associator_unittest.cc
+++ b/components/sync_preferences/pref_model_associator_unittest.cc

@@ -117,8 +117,7 @@
   pref_service_->SetString(kStringPrefName, local_url0_);
   const PrefService::Preference* pref =
       pref_service_->FindPreference(kStringPrefName);
-  std::unique_ptr<base::Value> server_value(
-      new base::StringValue(server_url0_));
+  std::unique_ptr<base::Value> server_value(new base::Value(server_url0_));
   std::unique_ptr<base::Value> merged_value(pref_sync_service_->MergePreference(
       pref->name(), *pref->GetValue(), *server_value));
   EXPECT_TRUE(merged_value->Equals(server_value.get()));

diff --git a/components/sync_preferences/pref_service_syncable_unittest.cc b/components/sync_preferences/pref_service_syncable_unittest.cc
index 4123ebe..f449888 100644
--- a/components/sync_preferences/pref_service_syncable_unittest.cc
+++ b/components/sync_preferences/pref_service_syncable_unittest.cc

@@ -273,13 +273,13 @@
 
   syncer::SyncDataList in;
   syncer::SyncChangeList out;
-  AddToRemoteDataList(kStringPrefName, base::StringValue(kExampleUrl1), &in);
+  AddToRemoteDataList(kStringPrefName, base::Value(kExampleUrl1), &in);
   base::ListValue urls_to_restore;
   urls_to_restore.AppendString(kExampleUrl1);
   urls_to_restore.AppendString(kExampleUrl2);
   AddToRemoteDataList(kListPrefName, urls_to_restore, &in);
   AddToRemoteDataList(kDefaultCharsetPrefName,
-                      base::StringValue(kNonDefaultCharsetValue), &in);
+                      base::Value(kNonDefaultCharsetValue), &in);
   InitWithSyncDataTakeOutput(in, &out);
 
   ASSERT_FALSE(FindValue(kStringPrefName, out).get());
@@ -316,7 +316,7 @@
   InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out);
   out.clear();
 
-  base::StringValue expected(kExampleUrl0);
+  base::Value expected(kExampleUrl0);
   GetPrefs()->Set(kStringPrefName, expected);
 
   std::unique_ptr<base::Value> actual(FindValue(kStringPrefName, out));
@@ -330,7 +330,7 @@
   InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out);
   out.clear();
 
-  base::StringValue expected(kExampleUrl1);
+  base::Value expected(kExampleUrl1);
   GetPrefs()->Set(kStringPrefName, expected);
 
   std::unique_ptr<base::Value> actual(FindValue(kStringPrefName, out));
@@ -342,7 +342,7 @@
   GetPrefs()->SetString(kStringPrefName, kExampleUrl0);
   InitWithNoSyncData();
 
-  base::StringValue expected(kExampleUrl1);
+  base::Value expected(kExampleUrl1);
   syncer::SyncChangeList list;
   list.push_back(MakeRemoteChange(1, kStringPrefName, expected,
                                   SyncChange::ACTION_UPDATE));
@@ -355,7 +355,7 @@
 TEST_F(PrefServiceSyncableTest, UpdatedSyncNodeActionAdd) {
   InitWithNoSyncData();
 
-  base::StringValue expected(kExampleUrl0);
+  base::Value expected(kExampleUrl0);
   syncer::SyncChangeList list;
   list.push_back(
       MakeRemoteChange(1, kStringPrefName, expected, SyncChange::ACTION_ADD));
@@ -370,7 +370,7 @@
 TEST_F(PrefServiceSyncableTest, UpdatedSyncNodeUnknownPreference) {
   InitWithNoSyncData();
   syncer::SyncChangeList list;
-  base::StringValue expected(kExampleUrl0);
+  base::Value expected(kExampleUrl0);
   list.push_back(MakeRemoteChange(1, "unknown preference", expected,
                                   SyncChange::ACTION_UPDATE));
   pref_sync_service_->ProcessSyncChanges(FROM_HERE, list);
@@ -380,7 +380,7 @@
 
 TEST_F(PrefServiceSyncableTest, ManagedPreferences) {
   // Make the homepage preference managed.
-  base::StringValue managed_value("http://example.com");
+  base::Value managed_value("http://example.com");
   prefs_.SetManagedPref(kStringPrefName, managed_value.DeepCopy());
 
   syncer::SyncChangeList out;
@@ -388,13 +388,13 @@
   out.clear();
 
   // Changing the homepage preference should not sync anything.
-  base::StringValue user_value("http://chromium..com");
+  base::Value user_value("http://chromium..com");
   prefs_.SetUserPref(kStringPrefName, user_value.DeepCopy());
   EXPECT_TRUE(out.empty());
 
   // An incoming sync transaction should change the user value, not the managed
   // value.
-  base::StringValue sync_value("http://crbug.com");
+  base::Value sync_value("http://crbug.com");
   syncer::SyncChangeList list;
   list.push_back(MakeRemoteChange(1, kStringPrefName, sync_value,
                                   SyncChange::ACTION_UPDATE));
@@ -451,14 +451,14 @@
   syncer::SyncChangeList out;
   InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out);
   out.clear();
-  base::StringValue initial_value("http://example.com/initial");
+  base::Value initial_value("http://example.com/initial");
   GetPrefs()->Set(kStringPrefName, initial_value);
   std::unique_ptr<base::Value> actual(FindValue(kStringPrefName, out));
   ASSERT_TRUE(actual.get());
   EXPECT_TRUE(initial_value.Equals(actual.get()));
 
   // Switch kHomePage to managed and set a different value.
-  base::StringValue managed_value("http://example.com/managed");
+  base::Value managed_value("http://example.com/managed");
   GetTestingPrefService()->SetManagedPref(kStringPrefName,
                                           managed_value.DeepCopy());
 
@@ -477,18 +477,18 @@
   InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out);
   out.clear();
 
-  base::StringValue initial_value("http://example.com/initial");
+  base::Value initial_value("http://example.com/initial");
   GetPrefs()->Set(kStringPrefName, initial_value);
   std::unique_ptr<base::Value> actual(FindValue(kStringPrefName, out));
   EXPECT_TRUE(initial_value.Equals(actual.get()));
 
   // Switch kHomePage to managed and set a different value.
-  base::StringValue managed_value("http://example.com/managed");
+  base::Value managed_value("http://example.com/managed");
   GetTestingPrefService()->SetManagedPref(kStringPrefName,
                                           managed_value.DeepCopy());
 
   // Change the sync value.
-  base::StringValue sync_value("http://example.com/sync");
+  base::Value sync_value("http://example.com/sync");
   syncer::SyncChangeList list;
   list.push_back(MakeRemoteChange(1, kStringPrefName, sync_value,
                                   SyncChange::ACTION_UPDATE));
@@ -516,7 +516,7 @@
   out.clear();
 
   // Switch kHomePage to managed and set a different value.
-  base::StringValue managed_value("http://example.com/managed");
+  base::Value managed_value("http://example.com/managed");
   GetTestingPrefService()->SetManagedPref(kStringPrefName,
                                           managed_value.DeepCopy());
   // The pref value should be the one dictated by policy.

diff --git a/components/sync_wifi/wifi_credential.cc b/components/sync_wifi/wifi_credential.cc
index a6a0e389ec..0337ee8 100644
--- a/components/sync_wifi/wifi_credential.cc
+++ b/components/sync_wifi/wifi_credential.cc

@@ -55,17 +55,17 @@
   std::unique_ptr<base::DictionaryValue> onc_properties(
       new base::DictionaryValue());
   onc_properties->Set(onc::toplevel_config::kType,
-                      new base::StringValue(onc::network_type::kWiFi));
+                      new base::Value(onc::network_type::kWiFi));
   // TODO(quiche): Switch to the HexSSID property, once ONC fully supports it.
   // crbug.com/432546.
   onc_properties->Set(onc::network_config::WifiProperty(onc::wifi::kSSID),
-                      new base::StringValue(ssid_utf8));
+                      new base::Value(ssid_utf8));
   onc_properties->Set(onc::network_config::WifiProperty(onc::wifi::kSecurity),
-                      new base::StringValue(onc_security));
+                      new base::Value(onc_security));
   if (WifiSecurityClassSupportsPassphrases(security_class())) {
     onc_properties->Set(
         onc::network_config::WifiProperty(onc::wifi::kPassphrase),
-        new base::StringValue(passphrase()));
+        new base::Value(passphrase()));
   }
   return onc_properties;
 }

diff --git a/components/translate/core/browser/translate_prefs.cc b/components/translate/core/browser/translate_prefs.cc
index 31955ad..a61cb1e 100644
--- a/components/translate/core/browser/translate_prefs.cc
+++ b/components/translate/core/browser/translate_prefs.cc

@@ -568,7 +568,7 @@
     NOTREACHED() << "Unregistered translate blacklist pref";
     return;
   }
-  base::StringValue string_value(value);
+  base::Value string_value(value);
   blacklist->Remove(string_value, NULL);
 }
 

diff --git a/components/user_manager/user_manager_base.cc b/components/user_manager/user_manager_base.cc
index 054949f..f0f17d2 100644
--- a/components/user_manager/user_manager_base.cc
+++ b/components/user_manager/user_manager_base.cc

@@ -301,7 +301,7 @@
     // Special case, removing partially-constructed supervised user or
     // boostrapping user during user list loading.
     ListPrefUpdate users_update(GetLocalState(), kRegularUsers);
-    users_update->Remove(base::StringValue(account_id.GetUserEmail()), nullptr);
+    users_update->Remove(base::Value(account_id.GetUserEmail()), nullptr);
     OnUserRemoved(account_id);
   } else {
     NOTREACHED() << "Users are not loaded yet.";
@@ -401,7 +401,7 @@
       DictionaryPrefUpdate display_name_update(GetLocalState(),
                                                kUserDisplayName);
       display_name_update->SetWithoutPathExpansion(
-          account_id.GetUserEmail(), new base::StringValue(display_name));
+          account_id.GetUserEmail(), new base::Value(display_name));
     }
   }
 }
@@ -430,8 +430,8 @@
     return;
 
   DictionaryPrefUpdate display_email_update(GetLocalState(), kUserDisplayEmail);
-  display_email_update->SetWithoutPathExpansion(
-      account_id.GetUserEmail(), new base::StringValue(display_email));
+  display_email_update->SetWithoutPathExpansion(account_id.GetUserEmail(),
+                                                new base::Value(display_email));
 }
 
 std::string UserManagerBase::GetUserDisplayEmail(
@@ -473,8 +473,8 @@
     user->set_given_name(given_name);
     if (!IsUserNonCryptohomeDataEphemeral(account_id)) {
       DictionaryPrefUpdate given_name_update(GetLocalState(), kUserGivenName);
-      given_name_update->SetWithoutPathExpansion(
-          account_id.GetUserEmail(), new base::StringValue(given_name));
+      given_name_update->SetWithoutPathExpansion(account_id.GetUserEmail(),
+                                                 new base::Value(given_name));
     }
   }
 
@@ -867,8 +867,8 @@
 void UserManagerBase::AddUserRecord(User* user) {
   // Add the user to the front of the user list.
   ListPrefUpdate prefs_users_update(GetLocalState(), kRegularUsers);
-  prefs_users_update->Insert(0, base::MakeUnique<base::StringValue>(
-                                    user->GetAccountId().GetUserEmail()));
+  prefs_users_update->Insert(
+      0, base::MakeUnique<base::Value>(user->GetAccountId().GetUserEmail()));
   users_.insert(users_.begin(), user);
 }
 

diff --git a/components/user_prefs/tracked/pref_hash_calculator_unittest.cc b/components/user_prefs/tracked/pref_hash_calculator_unittest.cc
index 11e38f1d..f7eeb22e 100644
--- a/components/user_prefs/tracked/pref_hash_calculator_unittest.cc
+++ b/components/user_prefs/tracked/pref_hash_calculator_unittest.cc

@@ -14,8 +14,8 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(PrefHashCalculatorTest, TestCurrentAlgorithm) {
-  base::StringValue string_value_1("string value 1");
-  base::StringValue string_value_2("string value 2");
+  base::Value string_value_1("string value 1");
+  base::Value string_value_2("string value 2");
   base::DictionaryValue dictionary_value_1;
   dictionary_value_1.SetInteger("int value", 1);
   dictionary_value_1.Set("nested empty map", new base::DictionaryValue);
@@ -81,7 +81,7 @@
   std::unique_ptr<base::Value> int_value(new base::Value(1234567890));
   std::unique_ptr<base::Value> double_value(new base::Value(123.0987654321));
   std::unique_ptr<base::Value> string_value(
-      new base::StringValue("testing with special chars:\n<>{}:^^@#$\\/"));
+      new base::Value("testing with special chars:\n<>{}:^^@#$\\/"));
 
   // For legacy reasons, we have to support pruning of empty lists/dictionaries
   // and nested empty ists/dicts in the hash generation algorithm.
@@ -97,10 +97,10 @@
   // A dictionary with an empty dictionary, an empty list, and nested empty
   // dictionaries/lists in it.
   std::unique_ptr<base::DictionaryValue> dict_value(new base::DictionaryValue);
-  dict_value->Set("a", new base::StringValue("foo"));
+  dict_value->Set("a", new base::Value("foo"));
   dict_value->Set("d", new base::ListValue);
   dict_value->Set("b", new base::DictionaryValue);
-  dict_value->Set("c", new base::StringValue("baz"));
+  dict_value->Set("c", new base::Value("baz"));
   dict_value->Set("e", nested_empty_dict.release());
   dict_value->Set("f", nested_empty_list.release());
 
@@ -186,8 +186,7 @@
   static const char kLegacyDeviceId[] = "test_device_id1";
 
   // As in PrefHashCalculatorTest.CatchHashChanges.
-  const base::StringValue string_value(
-      "testing with special chars:\n<>{}:^^@#$\\/");
+  const base::Value string_value("testing with special chars:\n<>{}:^^@#$\\/");
   static const char kExpectedValue[] =
       "05ACCBD3B05C45C36CD06190F63EC577112311929D8380E26E5F13182EB68318";
 

diff --git a/components/user_prefs/tracked/pref_hash_filter.cc b/components/user_prefs/tracked/pref_hash_filter.cc
index 6ae59af..8d9269e 100644
--- a/components/user_prefs/tracked/pref_hash_filter.cc
+++ b/components/user_prefs/tracked/pref_hash_filter.cc

@@ -249,7 +249,7 @@
 
   if (did_reset) {
     pref_store_contents->Set(user_prefs::kPreferenceResetTime,
-                             new base::StringValue(base::Int64ToString(
+                             new base::Value(base::Int64ToString(
                                  base::Time::Now().ToInternalValue())));
     FilterUpdate(user_prefs::kPreferenceResetTime);
 
@@ -302,7 +302,7 @@
             changed_path, inner_it.key(), mac);
       }
     } else {
-      const base::StringValue* value_as_string;
+      const base::Value* value_as_string;
       bool is_string = it.value().GetAsString(&value_as_string);
       DCHECK(is_string);
 

diff --git a/components/user_prefs/tracked/pref_hash_filter_unittest.cc b/components/user_prefs/tracked/pref_hash_filter_unittest.cc
index 42ea4f5..7670407 100644
--- a/components/user_prefs/tracked/pref_hash_filter_unittest.cc
+++ b/components/user_prefs/tracked/pref_hash_filter_unittest.cc

@@ -463,7 +463,7 @@
 std::string MockHashStoreContents::GetStoredMac(const std::string& path) const {
   const base::Value* out_value;
   if (dictionary_.GetWithoutPathExpansion(path, &out_value)) {
-    const base::StringValue* value_as_string;
+    const base::Value* value_as_string;
     EXPECT_TRUE(out_value->GetAsString(&value_as_string));
 
     return value_as_string->GetString();
@@ -481,7 +481,7 @@
     EXPECT_TRUE(out_value->GetAsDictionary(&value_as_dict));
 
     if (value_as_dict->GetWithoutPathExpansion(split_path, &out_value)) {
-      const base::StringValue* value_as_string;
+      const base::Value* value_as_string;
       EXPECT_TRUE(out_value->GetAsString(&value_as_string));
 
       return value_as_string->GetString();
@@ -703,7 +703,7 @@
 TEST_P(PrefHashFilterTest, FilterTrackedPrefUpdate) {
   base::DictionaryValue root_dict;
   // Ownership of |string_value| is transfered to |root_dict|.
-  base::Value* string_value = new base::StringValue("string value");
+  base::Value* string_value = new base::Value("string value");
   root_dict.Set(kAtomicPref, string_value);
 
   // No path should be stored on FilterUpdate.
@@ -784,7 +784,7 @@
 
 TEST_P(PrefHashFilterTest, FilterUntrackedPrefUpdate) {
   base::DictionaryValue root_dict;
-  root_dict.Set("untracked", new base::StringValue("some value"));
+  root_dict.Set("untracked", new base::Value("some value"));
   pref_hash_filter_->FilterUpdate("untracked");
 
   // No paths should be stored on FilterUpdate.
@@ -896,7 +896,7 @@
 
 TEST_P(PrefHashFilterTest, InitialValueUnknown) {
   // Ownership of these values is transfered to |pref_store_contents_|.
-  base::StringValue* string_value = new base::StringValue("string value");
+  base::Value* string_value = new base::Value("string value");
   pref_store_contents_->Set(kAtomicPref, string_value);
 
   base::DictionaryValue* dict_value = new base::DictionaryValue;
@@ -963,7 +963,7 @@
 
 TEST_P(PrefHashFilterTest, InitialValueTrustedUnknown) {
   // Ownership of this value is transfered to |pref_store_contents_|.
-  base::Value* string_value = new base::StringValue("test");
+  base::Value* string_value = new base::Value("test");
   pref_store_contents_->Set(kAtomicPref, string_value);
 
   base::DictionaryValue* dict_value = new base::DictionaryValue;
@@ -1130,7 +1130,7 @@
 
 TEST_P(PrefHashFilterTest, InitialValueUnchangedLegacyId) {
   // Ownership of these values is transfered to |pref_store_contents_|.
-  base::StringValue* string_value = new base::StringValue("string value");
+  base::Value* string_value = new base::Value("string value");
   pref_store_contents_->Set(kAtomicPref, string_value);
 
   base::DictionaryValue* dict_value = new base::DictionaryValue;

diff --git a/components/user_prefs/tracked/pref_hash_store_impl.cc b/components/user_prefs/tracked/pref_hash_store_impl.cc
index bb920ca..6487822 100644
--- a/components/user_prefs/tracked/pref_hash_store_impl.cc
+++ b/components/user_prefs/tracked/pref_hash_store_impl.cc

@@ -271,7 +271,7 @@
 
     for (base::DictionaryValue::Iterator it(*split_macs); !it.IsAtEnd();
          it.Advance()) {
-      const base::StringValue* value_as_string;
+      const base::Value* value_as_string;
       bool is_string = it.value().GetAsString(&value_as_string);
       DCHECK(is_string);
 

diff --git a/components/user_prefs/tracked/pref_hash_store_impl_unittest.cc b/components/user_prefs/tracked/pref_hash_store_impl_unittest.cc
index f5d92182..3abbf91 100644
--- a/components/user_prefs/tracked/pref_hash_store_impl_unittest.cc
+++ b/components/user_prefs/tracked/pref_hash_store_impl_unittest.cc

@@ -31,8 +31,8 @@
 };
 
 TEST_F(PrefHashStoreImplTest, ComputeMac) {
-  base::StringValue string_1("string1");
-  base::StringValue string_2("string2");
+  base::Value string_1("string1");
+  base::Value string_2("string2");
   PrefHashStoreImpl pref_hash_store(std::string(32, 0), "device_id", true);
 
   std::string computed_mac_1 = pref_hash_store.ComputeMac("path1", &string_1);
@@ -49,8 +49,8 @@
 
 TEST_F(PrefHashStoreImplTest, ComputeSplitMacs) {
   base::DictionaryValue dict;
-  dict.Set("a", new base::StringValue("string1"));
-  dict.Set("b", new base::StringValue("string2"));
+  dict.Set("a", new base::Value("string1"));
+  dict.Set("b", new base::Value("string2"));
   PrefHashStoreImpl pref_hash_store(std::string(32, 0), "device_id", true);
 
   std::unique_ptr<base::DictionaryValue> computed_macs =
@@ -63,15 +63,15 @@
 
   EXPECT_EQ(2U, computed_macs->size());
 
-  base::StringValue string_1("string1");
-  base::StringValue string_2("string2");
+  base::Value string_1("string1");
+  base::Value string_2("string2");
   EXPECT_EQ(pref_hash_store.ComputeMac("foo.bar.a", &string_1), mac_1);
   EXPECT_EQ(pref_hash_store.ComputeMac("foo.bar.b", &string_2), mac_2);
 }
 
 TEST_F(PrefHashStoreImplTest, AtomicHashStoreAndCheck) {
-  base::StringValue string_1("string1");
-  base::StringValue string_2("string2");
+  base::Value string_1("string1");
+  base::Value string_2("string2");
 
   {
     // 32 NULL bytes is the seed that was used to generate the legacy hash.
@@ -97,10 +97,10 @@
               transaction->CheckValue("path1", &string_2));
 
     base::DictionaryValue dict;
-    dict.Set("a", new base::StringValue("foo"));
-    dict.Set("d", new base::StringValue("bad"));
-    dict.Set("b", new base::StringValue("bar"));
-    dict.Set("c", new base::StringValue("baz"));
+    dict.Set("a", new base::Value("foo"));
+    dict.Set("d", new base::Value("bad"));
+    dict.Set("b", new base::Value("bar"));
+    dict.Set("c", new base::Value("baz"));
 
     transaction->StoreHash("path1", &dict);
     EXPECT_EQ(PrefHashStoreTransaction::UNCHANGED,
@@ -142,8 +142,8 @@
 }
 
 TEST_F(PrefHashStoreImplTest, ImportExportOperations) {
-  base::StringValue string_1("string1");
-  base::StringValue string_2("string2");
+  base::Value string_1("string1");
+  base::Value string_2("string2");
 
   // Initial state: no super MAC.
   {
@@ -290,8 +290,8 @@
 }
 
 TEST_F(PrefHashStoreImplTest, SuperMACDisabled) {
-  base::StringValue string_1("string1");
-  base::StringValue string_2("string2");
+  base::Value string_1("string1");
+  base::Value string_2("string2");
 
   {
     // Pass |use_super_mac| => false.
@@ -317,14 +317,14 @@
 
 TEST_F(PrefHashStoreImplTest, SplitHashStoreAndCheck) {
   base::DictionaryValue dict;
-  dict.Set("a", new base::StringValue("to be replaced"));
-  dict.Set("b", new base::StringValue("same"));
-  dict.Set("o", new base::StringValue("old"));
+  dict.Set("a", new base::Value("to be replaced"));
+  dict.Set("b", new base::Value("same"));
+  dict.Set("o", new base::Value("old"));
 
   base::DictionaryValue modified_dict;
-  modified_dict.Set("a", new base::StringValue("replaced"));
-  modified_dict.Set("b", new base::StringValue("same"));
-  modified_dict.Set("c", new base::StringValue("new"));
+  modified_dict.Set("a", new base::Value("replaced"));
+  modified_dict.Set("b", new base::Value("same"));
+  modified_dict.Set("c", new base::Value("new"));
 
   base::DictionaryValue empty_dict;
 
@@ -436,7 +436,7 @@
 
     // Store hashes for a random dict to be overwritten below.
     base::DictionaryValue initial_dict;
-    initial_dict.Set("a", new base::StringValue("foo"));
+    initial_dict.Set("a", new base::Value("foo"));
     transaction->StoreSplitHash("path1", &initial_dict);
 
     // Verify stored empty dictionary matches NULL and empty dictionary back.
@@ -471,8 +471,8 @@
         pref_hash_store2.BeginTransaction(GetHashStoreContents()));
 
     base::DictionaryValue tested_dict;
-    tested_dict.Set("a", new base::StringValue("foo"));
-    tested_dict.Set("b", new base::StringValue("bar"));
+    tested_dict.Set("a", new base::Value("foo"));
+    tested_dict.Set("b", new base::Value("bar"));
     EXPECT_EQ(
         PrefHashStoreTransaction::TRUSTED_UNKNOWN_VALUE,
         transaction->CheckSplitValue("new_path", &tested_dict, &invalid_keys));
@@ -487,13 +487,13 @@
 // turned into split preferences specifically because the atomic hash isn't
 // considered useful.
 TEST_F(PrefHashStoreImplTest, TrustedUnknownSplitValueFromExistingAtomic) {
-  base::StringValue string("string1");
+  base::Value string("string1");
 
   base::DictionaryValue dict;
-  dict.Set("a", new base::StringValue("foo"));
-  dict.Set("d", new base::StringValue("bad"));
-  dict.Set("b", new base::StringValue("bar"));
-  dict.Set("c", new base::StringValue("baz"));
+  dict.Set("a", new base::Value("foo"));
+  dict.Set("d", new base::Value("bad"));
+  dict.Set("b", new base::Value("bar"));
+  dict.Set("c", new base::Value("baz"));
 
   {
     PrefHashStoreImpl pref_hash_store(std::string(32, 0), "device_id", true);

diff --git a/components/user_prefs/tracked/segregated_pref_store_unittest.cc b/components/user_prefs/tracked/segregated_pref_store_unittest.cc
index a4b40b15..49199bc 100644
--- a/components/user_prefs/tracked/segregated_pref_store_unittest.cc
+++ b/components/user_prefs/tracked/segregated_pref_store_unittest.cc

@@ -106,10 +106,10 @@
 
   // Properly stores new values.
   segregated_store_->SetValue(kSelectedPref,
-                              base::MakeUnique<base::StringValue>(kValue1),
+                              base::MakeUnique<base::Value>(kValue1),
                               WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   segregated_store_->SetValue(kUnselectedPref,
-                              base::MakeUnique<base::StringValue>(kValue2),
+                              base::MakeUnique<base::Value>(kValue2),
                               WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
 
   ASSERT_TRUE(selected_store_->GetValue(kSelectedPref, NULL));
@@ -131,10 +131,10 @@
 
 TEST_F(SegregatedPrefStoreTest, ReadValues) {
   selected_store_->SetValue(kSelectedPref,
-                            base::MakeUnique<base::StringValue>(kValue1),
+                            base::MakeUnique<base::Value>(kValue1),
                             WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   default_store_->SetValue(kUnselectedPref,
-                           base::MakeUnique<base::StringValue>(kValue2),
+                           base::MakeUnique<base::Value>(kValue2),
                            WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
 
   // Works properly with values that are already there.
@@ -159,11 +159,11 @@
   EXPECT_TRUE(observer_.initialization_success);
   EXPECT_TRUE(observer_.changed_keys.empty());
   segregated_store_->SetValue(kSelectedPref,
-                              base::MakeUnique<base::StringValue>(kValue1),
+                              base::MakeUnique<base::Value>(kValue1),
                               WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   observer_.VerifyAndResetChangedKey(kSelectedPref);
   segregated_store_->SetValue(kUnselectedPref,
-                              base::MakeUnique<base::StringValue>(kValue2),
+                              base::MakeUnique<base::Value>(kValue2),
                               WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   observer_.VerifyAndResetChangedKey(kUnselectedPref);
 }
@@ -281,13 +281,12 @@
   // To check merge behavior, create selected and default stores so each has a
   // key the other doesn't have and they have one key in common.
   selected_store_->SetValue(kSelectedPref,
-                            base::MakeUnique<base::StringValue>(kValue1),
+                            base::MakeUnique<base::Value>(kValue1),
                             WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
   default_store_->SetValue(kUnselectedPref,
-                           base::MakeUnique<base::StringValue>(kValue2),
+                           base::MakeUnique<base::Value>(kValue2),
                            WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
-  selected_store_->SetValue(kSharedPref,
-                            base::MakeUnique<base::StringValue>(kValue1),
+  selected_store_->SetValue(kSharedPref, base::MakeUnique<base::Value>(kValue1),
                             WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
 
   auto values = segregated_store_->GetValues();

diff --git a/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc b/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc
index b113754..213d431 100644
--- a/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc
+++ b/components/user_prefs/tracked/tracked_preferences_migration_unittest.cc

@@ -163,7 +163,7 @@
     }
     DCHECK(store);
 
-    base::StringValue string_value(value);
+    base::Value string_value(value);
     DictionaryHashStoreContents contents(store);
     pref_hash_store->BeginTransaction(&contents)->StoreHash(key, &string_value);
   }

diff --git a/content/browser/accessibility/accessibility_tree_formatter_mac.mm b/content/browser/accessibility/accessibility_tree_formatter_mac.mm
index a844a94..1d67d2d 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_mac.mm
+++ b/content/browser/accessibility/accessibility_tree_formatter_mac.mm

@@ -92,7 +92,7 @@
   return list;
 }
 
-std::unique_ptr<base::StringValue> StringForBrowserAccessibility(
+std::unique_ptr<base::Value> StringForBrowserAccessibility(
     BrowserAccessibilityCocoa* obj) {
   NSMutableArray* tokens = [[NSMutableArray alloc] init];
 
@@ -122,8 +122,8 @@
   }
 
   NSString* result = [tokens componentsJoinedByString:@" "];
-  return std::unique_ptr<base::StringValue>(
-      new base::StringValue(SysNSStringToUTF16(result)));
+  return std::unique_ptr<base::Value>(
+      new base::Value(SysNSStringToUTF16(result)));
 }
 
 std::unique_ptr<base::Value> PopulateObject(id value) {
@@ -138,7 +138,7 @@
         StringForBrowserAccessibility((BrowserAccessibilityCocoa*)value));
   }
 
-  return std::unique_ptr<base::Value>(new base::StringValue(
+  return std::unique_ptr<base::Value>(new base::Value(
       SysNSStringToUTF16([NSString stringWithFormat:@"%@", value])));
 }
 

diff --git a/content/browser/accessibility/accessibility_ui.cc b/content/browser/accessibility/accessibility_ui.cc
index 7c806268..1f37792 100644
--- a/content/browser/accessibility/accessibility_ui.cc
+++ b/content/browser/accessibility/accessibility_ui.cc

@@ -309,7 +309,7 @@
     std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
     result->SetInteger(kProcessIdField, process_id);
     result->SetInteger(kRouteIdField, route_id);
-    result->Set("error", new base::StringValue("Renderer no longer exists."));
+    result->Set("error", new base::Value("Renderer no longer exists."));
     web_ui()->CallJavascriptFunctionUnsafe("accessibility.showTree",
                                            *(result.get()));
     return;
@@ -338,8 +338,7 @@
   formatter->FormatAccessibilityTree(ax_mgr->GetRoot(),
                                      &accessibility_contents_utf16);
   result->Set("tree",
-              new base::StringValue(
-                  base::UTF16ToUTF8(accessibility_contents_utf16)));
+              new base::Value(base::UTF16ToUTF8(accessibility_contents_utf16)));
   web_ui()->CallJavascriptFunctionUnsafe("accessibility.showTree",
                                          *(result.get()));
 }

diff --git a/content/browser/appcache/appcache_internals_ui.cc b/content/browser/appcache/appcache_internals_ui.cc
index 28f33e71..e9ad038 100644
--- a/content/browser/appcache/appcache_internals_ui.cc
+++ b/content/browser/appcache/appcache_internals_ui.cc

@@ -422,7 +422,7 @@
     incognito_path_prefix = "Incognito ";
   web_ui()->CallJavascriptFunctionUnsafe(
       kFunctionOnAllAppCacheInfoReady,
-      base::StringValue(incognito_path_prefix + partition_path.AsUTF8Unsafe()),
+      base::Value(incognito_path_prefix + partition_path.AsUTF8Unsafe()),
       *GetListValueFromAppCacheInfoCollection(collection.get()));
 }
 
@@ -432,8 +432,8 @@
     bool deleted) {
   web_ui()->CallJavascriptFunctionUnsafe(
       kFunctionOnAppCacheInfoDeleted,
-      base::StringValue(partition_path.AsUTF8Unsafe()),
-      base::StringValue(manifest_url), base::Value(deleted));
+      base::Value(partition_path.AsUTF8Unsafe()), base::Value(manifest_url),
+      base::Value(deleted));
 }
 
 void AppCacheInternalsUI::OnAppCacheDetailsReady(
@@ -442,13 +442,13 @@
     std::unique_ptr<AppCacheResourceInfoVector> resource_info_vector) {
   if (resource_info_vector) {
     web_ui()->CallJavascriptFunctionUnsafe(
-        kFunctionOnAppCacheDetailsReady, base::StringValue(manifest_url),
-        base::StringValue(partition_path.AsUTF8Unsafe()),
+        kFunctionOnAppCacheDetailsReady, base::Value(manifest_url),
+        base::Value(partition_path.AsUTF8Unsafe()),
         *GetListValueForAppCacheResourceInfoVector(resource_info_vector.get()));
   } else {
     web_ui()->CallJavascriptFunctionUnsafe(
-        kFunctionOnAppCacheDetailsReady, base::StringValue(manifest_url),
-        base::StringValue(partition_path.AsUTF8Unsafe()));
+        kFunctionOnAppCacheDetailsReady, base::Value(manifest_url),
+        base::Value(partition_path.AsUTF8Unsafe()));
   }
 }
 
@@ -487,7 +487,7 @@
   web_ui()->CallJavascriptFunctionUnsafe(
       kFunctionOnFileDetailsReady,
       *GetDictionaryValueForResponseEnquiry(response_enquiry),
-      base::StringValue(headers), base::StringValue(hex_dump));
+      base::Value(headers), base::Value(hex_dump));
 }
 
 void AppCacheInternalsUI::OnFileDetailsFailed(

diff --git a/content/browser/devtools/devtools_http_handler.cc b/content/browser/devtools/devtools_http_handler.cc
index 58c0c46..22dbbadd 100644
--- a/content/browser/devtools/devtools_http_handler.cc
+++ b/content/browser/devtools/devtools_http_handler.cc

@@ -774,7 +774,7 @@
         *value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json_value);
   }
   std::string json_message;
-  base::JSONWriter::Write(base::StringValue(message), &json_message);
+  base::JSONWriter::Write(base::Value(message), &json_message);
 
   net::HttpServerResponseInfo response(status_code);
   response.SetBody(json_value + message, "application/json; charset=UTF-8");

diff --git a/content/browser/devtools/protocol_string.cc b/content/browser/devtools/protocol_string.cc
index 452949a2..994e478 100644
--- a/content/browser/devtools/protocol_string.cc
+++ b/content/browser/devtools/protocol_string.cc

@@ -93,7 +93,7 @@
   if (value->type() == protocol::Value::TypeString) {
     std::string inner;
     value->asString(&inner);
-    return base::WrapUnique(new base::StringValue(inner));
+    return base::WrapUnique(new base::Value(inner));
   }
   if (value->type() == protocol::Value::TypeArray) {
     protocol::ListValue* list = protocol::ListValue::cast(value);

diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
index e5d64bff..478d1f0 100644
--- a/content/browser/devtools/render_frame_devtools_agent_host.cc
+++ b/content/browser/devtools/render_frame_devtools_agent_host.cc

@@ -657,8 +657,8 @@
       }
       if (session())
         protocol::TargetHandler::FromSession(session())->UpdateServiceWorkers();
-    } else if (pending_ &&
-               pending_->host() == navigation_handle->GetRenderFrameHost()) {
+    } else if (pending_ && pending_->host()->GetFrameTreeNodeId() ==
+                               navigation_handle->GetFrameTreeNodeId()) {
       DiscardPending();
     }
     DCHECK(CheckConsistency());

diff --git a/content/browser/indexed_db/indexed_db_internals_ui.cc b/content/browser/indexed_db/indexed_db_internals_ui.cc
index f2811c5..d09cc57 100644
--- a/content/browser/indexed_db/indexed_db_internals_ui.cc
+++ b/content/browser/indexed_db/indexed_db_internals_ui.cc

@@ -126,7 +126,7 @@
     const base::FilePath& path) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   web_ui()->CallJavascriptFunctionUnsafe("indexeddb.onOriginsReady", *origins,
-                                         base::StringValue(path.value()));
+                                         base::Value(path.value()));
 }
 
 static void FindContext(const base::FilePath& partition_path,
@@ -270,8 +270,8 @@
                                          const Origin& origin,
                                          size_t connection_count) {
   web_ui()->CallJavascriptFunctionUnsafe(
-      "indexeddb.onForcedClose", base::StringValue(partition_path.value()),
-      base::StringValue(origin.Serialize()),
+      "indexeddb.onForcedClose", base::Value(partition_path.value()),
+      base::Value(origin.Serialize()),
       base::Value(static_cast<double>(connection_count)));
 }
 
@@ -358,9 +358,8 @@
 
   item->AddObserver(new FileDeleter(temp_path));
   web_ui()->CallJavascriptFunctionUnsafe(
-      "indexeddb.onOriginDownloadReady",
-      base::StringValue(partition_path.value()),
-      base::StringValue(origin.Serialize()),
+      "indexeddb.onOriginDownloadReady", base::Value(partition_path.value()),
+      base::Value(origin.Serialize()),
       base::Value(static_cast<double>(connection_count)));
 }
 

diff --git a/content/browser/renderer_host/pepper/pepper_socket_utils.cc b/content/browser/renderer_host/pepper/pepper_socket_utils.cc
index 822bc565..bf2a4c7fc 100644
--- a/content/browser/renderer_host/pepper/pepper_socket_utils.cc
+++ b/content/browser/renderer_host/pepper/pepper_socket_utils.cc

@@ -80,36 +80,36 @@
                           ppapi::PPB_X509Certificate_Fields* fields) {
   const net::CertPrincipal& issuer = cert.issuer();
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_COMMON_NAME,
-                   base::MakeUnique<base::StringValue>(issuer.common_name));
+                   base::MakeUnique<base::Value>(issuer.common_name));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_LOCALITY_NAME,
-                   base::MakeUnique<base::StringValue>(issuer.locality_name));
+                   base::MakeUnique<base::Value>(issuer.locality_name));
   fields->SetField(
       PP_X509CERTIFICATE_PRIVATE_ISSUER_STATE_OR_PROVINCE_NAME,
-      base::MakeUnique<base::StringValue>(issuer.state_or_province_name));
+      base::MakeUnique<base::Value>(issuer.state_or_province_name));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_COUNTRY_NAME,
-                   base::MakeUnique<base::StringValue>(issuer.country_name));
+                   base::MakeUnique<base::Value>(issuer.country_name));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_ORGANIZATION_NAME,
-                   base::MakeUnique<base::StringValue>(
+                   base::MakeUnique<base::Value>(
                        base::JoinString(issuer.organization_names, "\n")));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_ISSUER_ORGANIZATION_UNIT_NAME,
-                   base::MakeUnique<base::StringValue>(
+                   base::MakeUnique<base::Value>(
                        base::JoinString(issuer.organization_unit_names, "\n")));
 
   const net::CertPrincipal& subject = cert.subject();
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_COMMON_NAME,
-                   base::MakeUnique<base::StringValue>(subject.common_name));
+                   base::MakeUnique<base::Value>(subject.common_name));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_LOCALITY_NAME,
-                   base::MakeUnique<base::StringValue>(subject.locality_name));
+                   base::MakeUnique<base::Value>(subject.locality_name));
   fields->SetField(
       PP_X509CERTIFICATE_PRIVATE_SUBJECT_STATE_OR_PROVINCE_NAME,
-      base::MakeUnique<base::StringValue>(subject.state_or_province_name));
+      base::MakeUnique<base::Value>(subject.state_or_province_name));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_COUNTRY_NAME,
-                   base::MakeUnique<base::StringValue>(subject.country_name));
+                   base::MakeUnique<base::Value>(subject.country_name));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_NAME,
-                   base::MakeUnique<base::StringValue>(
+                   base::MakeUnique<base::Value>(
                        base::JoinString(subject.organization_names, "\n")));
   fields->SetField(PP_X509CERTIFICATE_PRIVATE_SUBJECT_ORGANIZATION_UNIT_NAME,
-                   base::MakeUnique<base::StringValue>(base::JoinString(
+                   base::MakeUnique<base::Value>(base::JoinString(
                        subject.organization_unit_names, "\n")));
 
   const std::string& serial_number = cert.serial_number();

diff --git a/content/browser/service_worker/service_worker_internals_ui.cc b/content/browser/service_worker/service_worker_internals_ui.cc
index a0665f4..5dd7a48a0 100644
--- a/content/browser/service_worker/service_worker_internals_ui.cc
+++ b/content/browser/service_worker/service_worker_internals_ui.cc

@@ -36,7 +36,6 @@
 
 using base::DictionaryValue;
 using base::ListValue;
-using base::StringValue;
 using base::Value;
 using base::WeakPtr;
 
@@ -262,7 +261,7 @@
   args.push_back(GetVersionListValue(live_versions));
   args.push_back(GetRegistrationListValue(stored_registrations));
   args.push_back(base::MakeUnique<Value>(partition_id));
-  args.push_back(base::MakeUnique<StringValue>(context_path.value()));
+  args.push_back(base::MakeUnique<Value>(context_path.value()));
   internals->web_ui()->CallJavascriptFunctionUnsafe(
       "serviceworker.onPartitionData", ConvertToRawPtrVector(args));
 }
@@ -281,14 +280,14 @@
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     web_ui_->CallJavascriptFunctionUnsafe(
         "serviceworker.onRunningStateChanged", Value(partition_id_),
-        StringValue(base::Int64ToString(version_id)));
+        Value(base::Int64ToString(version_id)));
   }
   void OnVersionStateChanged(int64_t version_id,
                              ServiceWorkerVersion::Status) override {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     web_ui_->CallJavascriptFunctionUnsafe(
         "serviceworker.onVersionStateChanged", Value(partition_id_),
-        StringValue(base::Int64ToString(version_id)));
+        Value(base::Int64ToString(version_id)));
   }
   void OnErrorReported(int64_t version_id,
                        int process_id,
@@ -297,8 +296,7 @@
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     std::vector<std::unique_ptr<const Value>> args;
     args.push_back(base::MakeUnique<Value>(partition_id_));
-    args.push_back(
-        base::MakeUnique<StringValue>(base::Int64ToString(version_id)));
+    args.push_back(base::MakeUnique<Value>(base::Int64ToString(version_id)));
     args.push_back(base::MakeUnique<Value>(process_id));
     args.push_back(base::MakeUnique<Value>(thread_id));
     auto value = base::MakeUnique<DictionaryValue>();
@@ -317,8 +315,7 @@
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     std::vector<std::unique_ptr<const Value>> args;
     args.push_back(base::MakeUnique<Value>(partition_id_));
-    args.push_back(
-        base::MakeUnique<StringValue>(base::Int64ToString(version_id)));
+    args.push_back(base::MakeUnique<Value>(base::Int64ToString(version_id)));
     args.push_back(base::MakeUnique<Value>(process_id));
     args.push_back(base::MakeUnique<Value>(thread_id));
     auto value = base::MakeUnique<DictionaryValue>();
@@ -335,12 +332,12 @@
                             const GURL& pattern) override {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     web_ui_->CallJavascriptFunctionUnsafe("serviceworker.onRegistrationStored",
-                                          StringValue(pattern.spec()));
+                                          Value(pattern.spec()));
   }
   void OnRegistrationDeleted(int64_t registration_id,
                              const GURL& pattern) override {
     web_ui_->CallJavascriptFunctionUnsafe("serviceworker.onRegistrationDeleted",
-                                          StringValue(pattern.spec()));
+                                          Value(pattern.spec()));
   }
   int partition_id() const { return partition_id_; }
 

diff --git a/content/browser/tracing/etw_tracing_agent_win.cc b/content/browser/tracing/etw_tracing_agent_win.cc
index 8d4cfa20..4392084 100644
--- a/content/browser/tracing/etw_tracing_agent_win.cc
+++ b/content/browser/tracing/etw_tracing_agent_win.cc

@@ -166,15 +166,12 @@
 
   // Add fields to the event.
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
-  value->Set("guid", new base::StringValue("ClockSync"));
-  value->Set("walltime", new base::StringValue(
-      base::StringPrintf("%08X%08X",
-                         walltime_in_us.HighPart,
-                         walltime_in_us.LowPart)));
-  value->Set("tick", new base::StringValue(
-      base::StringPrintf("%08X%08X",
-                         now_in_us.HighPart,
-                         now_in_us.LowPart)));
+  value->Set("guid", new base::Value("ClockSync"));
+  value->Set("walltime",
+             new base::Value(base::StringPrintf(
+                 "%08X%08X", walltime_in_us.HighPart, walltime_in_us.LowPart)));
+  value->Set("tick", new base::Value(base::StringPrintf(
+                         "%08X%08X", now_in_us.HighPart, now_in_us.LowPart)));
 
   // Append it to the events buffer.
   events_->Append(value.release());
@@ -188,10 +185,10 @@
   // Add header fields to the event.
   LARGE_INTEGER ts_us;
   ts_us.QuadPart = event->Header.TimeStamp.QuadPart / 10;
-  value->Set("ts", new base::StringValue(
-      base::StringPrintf("%08X%08X", ts_us.HighPart, ts_us.LowPart)));
+  value->Set("ts", new base::Value(base::StringPrintf(
+                       "%08X%08X", ts_us.HighPart, ts_us.LowPart)));
 
-  value->Set("guid", new base::StringValue(GuidToString(event->Header.Guid)));
+  value->Set("guid", new base::Value(GuidToString(event->Header.Guid)));
 
   value->Set("op", new Value(event->Header.Class.Type));
   value->Set("ver", new Value(event->Header.Class.Version));
@@ -204,7 +201,7 @@
                            event->MofLength);
   std::string payload;
   base::Base64Encode(buffer, &payload);
-  value->Set("payload", new base::StringValue(payload));
+  value->Set("payload", new base::Value(payload));
 
   // Append it to the events buffer.
   events_->Append(value.release());
@@ -228,7 +225,7 @@
     const StopAgentTracingCallback& callback) {
   // Add the header information to the stream.
   std::unique_ptr<base::DictionaryValue> header(new base::DictionaryValue());
-  header->Set("name", new base::StringValue("ETW"));
+  header->Set("name", new base::Value("ETW"));
 
   // Release and pass the events buffer.
   header->Set("content", events_.release());

diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc
index ca612ba23..56a4c05 100644
--- a/content/browser/tracing/tracing_ui.cc
+++ b/content/browser/tracing/tracing_ui.cc

@@ -247,7 +247,7 @@
   std::string file_contents_base64;
   if (!args || args->empty() || !args->GetString(0, &file_contents_base64)) {
     web_ui()->CallJavascriptFunctionUnsafe("onUploadError",
-                                           base::StringValue("Missing data"));
+                                           base::Value("Missing data"));
     return;
   }
 
@@ -263,7 +263,7 @@
   std::string file_contents;
   if (!args || args->empty() || !args->GetString(0, &file_contents)) {
     web_ui()->CallJavascriptFunctionUnsafe("onUploadError",
-                                           base::StringValue("Missing data"));
+                                           base::Value("Missing data"));
     return;
   }
 
@@ -273,14 +273,14 @@
 void TracingUI::DoUploadInternal(const std::string& file_contents,
                                  TraceUploader::UploadMode upload_mode) {
   if (!delegate_) {
-    web_ui()->CallJavascriptFunctionUnsafe(
-        "onUploadError", base::StringValue("Not implemented"));
+    web_ui()->CallJavascriptFunctionUnsafe("onUploadError",
+                                           base::Value("Not implemented"));
     return;
   }
 
   if (trace_uploader_) {
-    web_ui()->CallJavascriptFunctionUnsafe(
-        "onUploadError", base::StringValue("Upload in progress"));
+    web_ui()->CallJavascriptFunctionUnsafe("onUploadError",
+                                           base::Value("Upload in progress"));
     return;
   }
 
@@ -306,18 +306,18 @@
   int percent = (current / total) * 100;
   web_ui()->CallJavascriptFunctionUnsafe(
       "onUploadProgress", base::Value(percent),
-      base::StringValue(base::StringPrintf("%" PRId64, current)),
-      base::StringValue(base::StringPrintf("%" PRId64, total)));
+      base::Value(base::StringPrintf("%" PRId64, current)),
+      base::Value(base::StringPrintf("%" PRId64, total)));
 }
 
 void TracingUI::OnTraceUploadComplete(bool success,
                                       const std::string& feedback) {
   if (success) {
     web_ui()->CallJavascriptFunctionUnsafe("onUploadComplete",
-                                           base::StringValue(feedback));
+                                           base::Value(feedback));
   } else {
     web_ui()->CallJavascriptFunctionUnsafe("onUploadError",
-                                           base::StringValue(feedback));
+                                           base::Value(feedback));
   }
   trace_uploader_.reset();
 }

diff --git a/content/child/v8_value_converter_impl.cc b/content/child/v8_value_converter_impl.cc
index c57bd15..b445760f 100644
--- a/content/child/v8_value_converter_impl.cc
+++ b/content/child/v8_value_converter_impl.cc

@@ -386,8 +386,7 @@
 
   if (val->IsString()) {
     v8::String::Utf8Value utf8(val);
-    return base::MakeUnique<base::StringValue>(
-        std::string(*utf8, utf8.length()));
+    return base::MakeUnique<base::Value>(std::string(*utf8, utf8.length()));
   }
 
   if (val->IsUndefined()) {
@@ -413,7 +412,7 @@
     if (!reg_exp_allowed_)
       // JSON.stringify converts to an object.
       return FromV8Object(val.As<v8::Object>(), state, isolate);
-    return base::MakeUnique<base::StringValue>(*v8::String::Utf8Value(val));
+    return base::MakeUnique<base::Value>(*v8::String::Utf8Value(val));
   }
 
   // v8::Value doesn't have a ToArray() method for some reason.

diff --git a/content/child/v8_value_converter_impl_unittest.cc b/content/child/v8_value_converter_impl_unittest.cc
index 83bf27e..2997770e 100644
--- a/content/child/v8_value_converter_impl_unittest.cc
+++ b/content/child/v8_value_converter_impl_unittest.cc

@@ -418,7 +418,7 @@
 
   converter.SetRegExpAllowed(true);
   TestWeirdType(converter, regex, base::Value::Type::STRING,
-                std::unique_ptr<base::Value>(new base::StringValue("/./")));
+                std::unique_ptr<base::Value>(new base::Value("/./")));
 }
 
 TEST_F(V8ValueConverterImplTest, Prototype) {
@@ -1021,7 +1021,7 @@
 
  private:
   static std::unique_ptr<base::Value> NewReferenceValue() {
-    return base::MakeUnique<base::StringValue>("strategy");
+    return base::MakeUnique<base::Value>("strategy");
   }
   std::unique_ptr<base::Value> reference_value_;
 };

diff --git a/content/common/common_param_traits_unittest.cc b/content/common/common_param_traits_unittest.cc
index 4756e22b..c5acf22 100644
--- a/content/common/common_param_traits_unittest.cc
+++ b/content/common/common_param_traits_unittest.cc

@@ -83,7 +83,7 @@
 TEST(IPCMessageTest, ListValue) {
   base::ListValue input;
   input.Set(0, new base::Value(42.42));
-  input.Set(1, new base::StringValue("forty"));
+  input.Set(1, new base::Value("forty"));
   input.Set(2, base::Value::CreateNullValue());
 
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
@@ -109,13 +109,13 @@
   input.Set("int", new base::Value(42));
 
   std::unique_ptr<base::DictionaryValue> subdict(new base::DictionaryValue());
-  subdict->Set("str", new base::StringValue("forty two"));
+  subdict->Set("str", new base::Value("forty two"));
   subdict->Set("bool", new base::Value(false));
 
   std::unique_ptr<base::ListValue> sublist(new base::ListValue());
   sublist->Set(0, new base::Value(42.42));
-  sublist->Set(1, new base::StringValue("forty"));
-  sublist->Set(2, new base::StringValue("two"));
+  sublist->Set(1, new base::Value("forty"));
+  sublist->Set(2, new base::Value("two"));
   subdict->Set("list", sublist.release());
 
   input.Set("dict", subdict.release());

diff --git a/content/common/font_list_mac.mm b/content/common/font_list_mac.mm
index d4768ae..5eebf2c 100644
--- a/content/common/font_list_mac.mm
+++ b/content/common/font_list_mac.mm

@@ -34,8 +34,8 @@
     base::ListValue* font_item = new base::ListValue();
     base::string16 family = base::SysNSStringToUTF16(family_name);
     base::string16 loc_family = base::SysNSStringToUTF16(localized_family_name);
-    font_item->Append(new base::StringValue(family));
-    font_item->Append(new base::StringValue(loc_family));
+    font_item->Append(new base::Value(family));
+    font_item->Append(new base::Value(loc_family));
     font_list->Append(font_item);
   }
 

diff --git a/content/common/font_list_win.cc b/content/common/font_list_win.cc
index 8d00e0a..38402c5 100644
--- a/content/common/font_list_win.cc
+++ b/content/common/font_list_win.cc

@@ -46,8 +46,8 @@
   std::set<base::string16>::iterator iter;
   for (iter = font_names.begin(); iter != font_names.end(); ++iter) {
     base::ListValue* font_item = new base::ListValue();
-    font_item->Append(new base::StringValue(*iter));
-    font_item->Append(new base::StringValue(*iter));
+    font_item->Append(new base::Value(*iter));
+    font_item->Append(new base::Value(*iter));
     font_list->Append(font_item);
   }
   return font_list;

diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index a8cbf916c..9624cfb 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc

@@ -2241,7 +2241,7 @@
     V8ValueConverterImpl converter;
     converter.SetDateAllowed(true);
     converter.SetRegExpAllowed(true);
-    std::unique_ptr<base::Value> value(new base::StringValue(params.data));
+    std::unique_ptr<base::Value> value(new base::Value(params.data));
     v8::Local<v8::Value> result_value = converter.ToV8Value(value.get(),
                                                              context);
     serialized_script_value = WebSerializedScriptValue::serialize(result_value);

diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index d31f4685..53caa14 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn

@@ -369,7 +369,7 @@
   }
 
   if (is_linux) {
-    deps += [ "//third_party/freetype-android:freetype" ]
+    deps += [ "//third_party/freetype" ]
   }
 
   if (!enable_plugins) {

diff --git a/content/shell/browser/layout_test/layout_test_devtools_frontend.cc b/content/shell/browser/layout_test/layout_test_devtools_frontend.cc
index 917a8764..ac62b4a 100644
--- a/content/shell/browser/layout_test/layout_test_devtools_frontend.cc
+++ b/content/shell/browser/layout_test/layout_test_devtools_frontend.cc

@@ -102,7 +102,7 @@
   }
 
   std::string encoded_script;
-  base::JSONWriter::Write(base::StringValue(script), &encoded_script);
+  base::JSONWriter::Write(base::Value(script), &encoded_script);
   std::string source =
       base::StringPrintf("DevToolsAPI.evaluateForTestInFrontend(%d, %s);",
                          call_id,

diff --git a/content/shell/browser/shell_devtools_frontend.cc b/content/shell/browser/shell_devtools_frontend.cc
index 74ac05da..0bab673f 100644
--- a/content/shell/browser/shell_devtools_frontend.cc
+++ b/content/shell/browser/shell_devtools_frontend.cc

@@ -80,7 +80,7 @@
     return num_bytes;
 
   base::Value* id = new base::Value(stream_id_);
-  base::StringValue* chunkValue = new base::StringValue(chunk);
+  base::Value* chunkValue = new base::Value(chunk);
 
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,

diff --git a/content/shell/test_runner/tracked_dictionary.cc b/content/shell/test_runner/tracked_dictionary.cc
index eaeba5fe..87550a91 100644
--- a/content/shell/test_runner/tracked_dictionary.cc
+++ b/content/shell/test_runner/tracked_dictionary.cc

@@ -45,7 +45,7 @@
 
 void TrackedDictionary::SetString(const std::string& path,
                                   const std::string& new_value) {
-  Set(path, base::MakeUnique<base::StringValue>(new_value));
+  Set(path, base::MakeUnique<base::Value>(new_value));
 }
 
 }  // namespace test_runner

diff --git a/dbus/values_util.cc b/dbus/values_util.cc
index 58b2b9e..1e035c9 100644
--- a/dbus/values_util.cc
+++ b/dbus/values_util.cc

@@ -159,13 +159,13 @@
     case Message::STRING: {
       std::string value;
       if (reader->PopString(&value))
-        result = base::MakeUnique<base::StringValue>(value);
+        result = base::MakeUnique<base::Value>(value);
       break;
     }
     case Message::OBJECT_PATH: {
       ObjectPath value;
       if (reader->PopObjectPath(&value))
-        result = base::MakeUnique<base::StringValue>(value.value());
+        result = base::MakeUnique<base::Value>(value.value());
       break;
     }
     case Message::UNIX_FD: {

diff --git a/dbus/values_util_unittest.cc b/dbus/values_util_unittest.cc
index 38d94f8..13c496b 100644
--- a/dbus/values_util_unittest.cc
+++ b/dbus/values_util_unittest.cc

@@ -100,17 +100,17 @@
   // Pop a string.
   value = PopDataAsValue(&reader);
   ASSERT_TRUE(value.get() != NULL);
-  expected_value.reset(new base::StringValue(kStringValue));
+  expected_value.reset(new base::Value(kStringValue));
   EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop an empty string.
   value = PopDataAsValue(&reader);
   ASSERT_TRUE(value.get() != NULL);
-  expected_value.reset(new base::StringValue(kEmptyStringValue));
+  expected_value.reset(new base::Value(kEmptyStringValue));
   EXPECT_TRUE(value->Equals(expected_value.get()));
   // Pop an object path.
   value = PopDataAsValue(&reader);
   ASSERT_TRUE(value.get() != NULL);
-  expected_value.reset(new base::StringValue(kObjectPathValue.value()));
+  expected_value.reset(new base::Value(kObjectPathValue.value()));
   EXPECT_TRUE(value->Equals(expected_value.get()));
 }
 
@@ -148,7 +148,7 @@
   // Pop a string.
   value = PopDataAsValue(&reader);
   ASSERT_TRUE(value.get() != NULL);
-  expected_value.reset(new base::StringValue(kStringValue));
+  expected_value.reset(new base::Value(kStringValue));
   EXPECT_TRUE(value->Equals(expected_value.get()));
 }
 
@@ -391,7 +391,7 @@
   const base::Value kBoolValue(false);
   const base::Value kIntegerValue(42);
   const base::Value kDoubleValue(4.2);
-  const base::StringValue kStringValue("string");
+  const base::Value kStringValue("string");
 
   std::unique_ptr<Response> response(Response::CreateEmpty());
   MessageWriter writer(response.get());
@@ -420,7 +420,7 @@
   const base::Value kBoolValue(false);
   const base::Value kIntegerValue(42);
   const base::Value kDoubleValue(4.2);
-  const base::StringValue kStringValue("string");
+  const base::Value kStringValue("string");
 
   std::unique_ptr<Response> response(Response::CreateEmpty());
   MessageWriter writer(response.get());
@@ -449,7 +449,7 @@
   const base::Value kBoolValue(false);
   const base::Value kIntegerValue(42);
   const base::Value kDoubleValue(4.2);
-  const base::StringValue kStringValue("string");
+  const base::Value kStringValue("string");
 
   std::unique_ptr<Response> response(Response::CreateEmpty());
   MessageWriter writer(response.get());
@@ -478,7 +478,7 @@
   const base::Value kBoolValue(false);
   const base::Value kIntegerValue(42);
   const base::Value kDoubleValue(4.2);
-  const base::StringValue kStringValue("string");
+  const base::Value kStringValue("string");
 
   std::unique_ptr<Response> response(Response::CreateEmpty());
   MessageWriter writer(response.get());

diff --git a/device/bluetooth/bluez/bluetooth_service_attribute_value_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_service_attribute_value_bluez_unittest.cc
index d9d8d02..ba66a4b2 100644
--- a/device/bluetooth/bluez/bluetooth_service_attribute_value_bluez_unittest.cc
+++ b/device/bluetooth/bluez/bluetooth_service_attribute_value_bluez_unittest.cc

@@ -48,7 +48,7 @@
 
 TEST(BluetoothServiceAttributeBlueZTest, BasicValue) {
   BluetoothServiceAttributeValueBlueZ value1(
-      Type::UUID, 16, base::MakeUnique<base::StringValue>(kServiceUuid));
+      Type::UUID, 16, base::MakeUnique<base::Value>(kServiceUuid));
   BluetoothServiceAttributeValueBlueZ value2 = value1;
 
   CheckUuidValue(value2, kServiceUuid);
@@ -56,7 +56,7 @@
 
 TEST(BluetoothServiceAttributeBlueZTest, Sequence) {
   BluetoothServiceAttributeValueBlueZ value1(
-      Type::UUID, 16, base::MakeUnique<base::StringValue>(kServiceUuid));
+      Type::UUID, 16, base::MakeUnique<base::Value>(kServiceUuid));
   BluetoothServiceAttributeValueBlueZ value2(
       Type::INT, 4, base::MakeUnique<base::Value>(0x1337));
   BluetoothServiceAttributeValueBlueZ value3(
@@ -80,7 +80,7 @@
 
 TEST(BluetoothServiceAttributeBlueZTest, NestedValue) {
   BluetoothServiceAttributeValueBlueZ value1(
-      Type::UUID, 16, base::MakeUnique<base::StringValue>(kServiceUuid));
+      Type::UUID, 16, base::MakeUnique<base::Value>(kServiceUuid));
   BluetoothServiceAttributeValueBlueZ value2(
       Type::INT, 4, base::MakeUnique<base::Value>(0x1337));
   BluetoothServiceAttributeValueBlueZ value3(MakeSequence({value1, value2}));
@@ -124,7 +124,7 @@
 
 TEST(BluetoothServiceAttributeBlueZTest, CopyAssignment) {
   BluetoothServiceAttributeValueBlueZ value1(
-      Type::UUID, 16, base::MakeUnique<base::StringValue>(kServiceUuid));
+      Type::UUID, 16, base::MakeUnique<base::Value>(kServiceUuid));
   BluetoothServiceAttributeValueBlueZ value2(
       Type::INT, 4, base::MakeUnique<base::Value>(0x1337));
   BluetoothServiceAttributeValueBlueZ value3(

diff --git a/device/bluetooth/bluez/bluetooth_service_record_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_service_record_bluez_unittest.cc
index a16f67e..0c2433ce0 100644
--- a/device/bluetooth/bluez/bluetooth_service_record_bluez_unittest.cc
+++ b/device/bluetooth/bluez/bluetooth_service_record_bluez_unittest.cc

@@ -130,7 +130,7 @@
     record.AddRecordEntry(kServiceUuidAttributeId,
                           BluetoothServiceAttributeValueBlueZ(
                               BluetoothServiceAttributeValueBlueZ::UUID, 16,
-                              base::MakeUnique<base::StringValue>(uuid)));
+                              base::MakeUnique<base::Value>(uuid)));
     return record;
   }
 

diff --git a/device/bluetooth/dbus/bluetooth_device_client.cc b/device/bluetooth/dbus/bluetooth_device_client.cc
index 09b66e1c..53199eb 100644
--- a/device/bluetooth/dbus/bluetooth_device_client.cc
+++ b/device/bluetooth/dbus/bluetooth_device_client.cc

@@ -87,7 +87,7 @@
       std::string str;
       if (!struct_reader->PopVariantOfString(&str))
         return nullptr;
-      value = base::MakeUnique<base::StringValue>(str);
+      value = base::MakeUnique<base::Value>(str);
       break;
     }
     case bluez::BluetoothServiceAttributeValueBlueZ::BOOL: {

diff --git a/device/bluetooth/dbus/fake_bluetooth_device_client.cc b/device/bluetooth/dbus/fake_bluetooth_device_client.cc
index 949d29da..58f694f0 100644
--- a/device/bluetooth/dbus/fake_bluetooth_device_client.cc
+++ b/device/bluetooth/dbus/fake_bluetooth_device_client.cc

@@ -114,7 +114,7 @@
   std::unique_ptr<BluetoothServiceAttributeValueBlueZ::Sequence> class_id_list =
       base::MakeUnique<BluetoothServiceAttributeValueBlueZ::Sequence>();
   class_id_list->emplace_back(BluetoothServiceAttributeValueBlueZ::UUID, 4,
-                              base::MakeUnique<base::StringValue>("1802"));
+                              base::MakeUnique<base::Value>("1802"));
   record1->AddRecordEntry(
       0x1, BluetoothServiceAttributeValueBlueZ(std::move(class_id_list)));
   records.emplace_back(*record1);

diff --git a/extensions/browser/api/app_window/app_window_api.cc b/extensions/browser/api/app_window/app_window_api.cc
index 10d91fb..56e00d5 100644
--- a/extensions/browser/api/app_window/app_window_api.cc
+++ b/extensions/browser/api/app_window/app_window_api.cc

@@ -382,7 +382,7 @@
 
   std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue);
   result->Set("frameId", new base::Value(frame_id));
-  result->Set("id", new base::StringValue(app_window->window_key()));
+  result->Set("id", new base::Value(app_window->window_key()));
   app_window->GetSerializedState(result.get());
   SetResult(std::move(result));
 

diff --git a/extensions/browser/api/cast_channel/cast_message_util.cc b/extensions/browser/api/cast_channel/cast_message_util.cc
index 7cdf1c5..5d4e9ff8 100644
--- a/extensions/browser/api/cast_channel/cast_message_util.cc
+++ b/extensions/browser/api/cast_channel/cast_message_util.cc

@@ -81,7 +81,7 @@
   switch (message_proto.payload_type()) {
   case CastMessage_PayloadType_STRING:
     if (message_proto.has_payload_utf8())
-      value.reset(new base::StringValue(message_proto.payload_utf8()));
+      value.reset(new base::Value(message_proto.payload_utf8()));
     break;
   case CastMessage_PayloadType_BINARY:
     if (message_proto.has_payload_binary())

diff --git a/extensions/browser/api/declarative/declarative_api.cc b/extensions/browser/api/declarative/declarative_api.cc
index 6fdeacc..84dbfff 100644
--- a/extensions/browser/api/declarative/declarative_api.cc
+++ b/extensions/browser/api/declarative/declarative_api.cc

@@ -41,12 +41,11 @@
 
 // Encodes |binary| as base64 and returns a new StringValue populated with the
 // encoded string.
-std::unique_ptr<base::StringValue> ConvertBinaryToBase64(
-    base::BinaryValue* binary) {
+std::unique_ptr<base::Value> ConvertBinaryToBase64(base::BinaryValue* binary) {
   std::string binary_data = std::string(binary->GetBuffer(), binary->GetSize());
   std::string data64;
   base::Base64Encode(binary_data, &data64);
-  return std::unique_ptr<base::StringValue>(new base::StringValue(data64));
+  return std::unique_ptr<base::Value>(new base::Value(data64));
 }
 
 // Parses through |args| replacing any BinaryValues with base64 encoded

diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
index e40c6c4..53edf36 100644
--- a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc
+++ b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute.cc

@@ -35,7 +35,6 @@
 using base::CaseInsensitiveCompareASCII;
 using base::DictionaryValue;
 using base::ListValue;
-using base::StringValue;
 using base::Value;
 
 namespace helpers = extension_web_request_api_helpers;

diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
index 1dfaac9..0ef967fed 100644
--- a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
+++ b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc

@@ -27,7 +27,6 @@
 
 using base::DictionaryValue;
 using base::ListValue;
-using base::StringValue;
 using base::Value;
 
 namespace extensions {
@@ -49,7 +48,7 @@
 
   std::string error;
   scoped_refptr<const WebRequestConditionAttribute> result;
-  base::StringValue string_value("main_frame");
+  base::Value string_value("main_frame");
   base::ListValue resource_types;
   resource_types.AppendString("main_frame");
 

diff --git a/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc b/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
index a910b4a..6dbbc9b1 100644
--- a/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc
+++ b/extensions/browser/api/guest_view/web_view/web_view_internal_api.cc

@@ -334,7 +334,7 @@
     return;
   }
 
-  SetResult(base::MakeUnique<base::StringValue>(base64_result));
+  SetResult(base::MakeUnique<base::Value>(base64_result));
   SendResponse(true);
 }
 
@@ -703,8 +703,8 @@
       NOTREACHED();
   }
 
-  return RespondNow(OneArgument(base::MakeUnique<base::StringValue>(
-      web_view_internal::ToString(zoom_mode))));
+  return RespondNow(OneArgument(
+      base::MakeUnique<base::Value>(web_view_internal::ToString(zoom_mode))));
 }
 
 WebViewInternalFindFunction::WebViewInternalFindFunction() {

diff --git a/extensions/browser/api/idle/idle_manager.cc b/extensions/browser/api/idle/idle_manager.cc
index 715c98a..1b1adf26 100644
--- a/extensions/browser/api/idle/idle_manager.cc
+++ b/extensions/browser/api/idle/idle_manager.cc

@@ -181,7 +181,7 @@
 }
 
 // static
-std::unique_ptr<base::StringValue> IdleManager::CreateIdleValue(
+std::unique_ptr<base::Value> IdleManager::CreateIdleValue(
     ui::IdleState idle_state) {
   const char* description;
 
@@ -193,7 +193,7 @@
     description = keys::kStateLocked;
   }
 
-  return base::MakeUnique<base::StringValue>(description);
+  return base::MakeUnique<base::Value>(description);
 }
 
 void IdleManager::SetEventDelegateForTest(

diff --git a/extensions/browser/api/idle/idle_manager.h b/extensions/browser/api/idle/idle_manager.h
index 2dd296b..e4a076b 100644
--- a/extensions/browser/api/idle/idle_manager.h
+++ b/extensions/browser/api/idle/idle_manager.h

@@ -23,7 +23,6 @@
 
 namespace base {
 class Value;
-using StringValue = Value;
 }  // namespace base
 
 namespace content {
@@ -92,8 +91,7 @@
 
   void QueryState(int threshold, const QueryStateCallback& notify);
   void SetThreshold(const std::string& extension_id, int threshold);
-  static std::unique_ptr<base::StringValue> CreateIdleValue(
-      ui::IdleState idle_state);
+  static std::unique_ptr<base::Value> CreateIdleValue(ui::IdleState idle_state);
 
   // Override default event class. Callee assumes ownership. Used for testing.
   void SetEventDelegateForTest(std::unique_ptr<EventDelegate> event_delegate);

diff --git a/extensions/browser/api/metrics_private/metrics_private_api.cc b/extensions/browser/api/metrics_private/metrics_private_api.cc
index 844a056..c1be316 100644
--- a/extensions/browser/api/metrics_private/metrics_private_api.cc
+++ b/extensions/browser/api/metrics_private/metrics_private_api.cc

@@ -52,8 +52,8 @@
   std::string name;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &name));
 
-  return RespondNow(OneArgument(base::MakeUnique<base::StringValue>(
-      base::FieldTrialList::FindFullName(name))));
+  return RespondNow(OneArgument(
+      base::MakeUnique<base::Value>(base::FieldTrialList::FindFullName(name))));
 }
 
 ExtensionFunction::ResponseAction

diff --git a/extensions/browser/api/networking_private/networking_private_chromeos.cc b/extensions/browser/api/networking_private/networking_private_chromeos.cc
index 15d6816..0396e47 100644
--- a/extensions/browser/api/networking_private/networking_private_chromeos.cc
+++ b/extensions/browser/api/networking_private/networking_private_chromeos.cc

@@ -280,9 +280,9 @@
   base::DictionaryValue* dict = EnsureDictionaryValue(key, manual);
   base::DictionaryValue* host_dict =
       EnsureDictionaryValue(::onc::proxy::kHost, dict);
-  SetProxyEffectiveValue(host_dict, state,
-                         base::MakeUnique<base::StringValue>(
-                             proxy.server.host_port_pair().host()));
+  SetProxyEffectiveValue(
+      host_dict, state,
+      base::MakeUnique<base::Value>(proxy.server.host_port_pair().host()));
   uint16_t port = proxy.server.host_port_pair().port();
   base::DictionaryValue* port_dict =
       EnsureDictionaryValue(::onc::proxy::kPort, dict);
@@ -779,7 +779,7 @@
   base::DictionaryValue* proxy_type_dict =
       EnsureDictionaryValue(::onc::network_config::kType, proxy_settings);
   SetProxyEffectiveValue(proxy_type_dict, state,
-                         base::WrapUnique<base::Value>(new base::StringValue(
+                         base::WrapUnique<base::Value>(new base::Value(
                              GetProxySettingsType(config.mode))));
 
   // Update any appropriate sub dictionary based on the new type.
@@ -806,9 +806,9 @@
     case UIProxyConfig::MODE_PAC_SCRIPT: {
       base::DictionaryValue* pac =
           EnsureDictionaryValue(::onc::proxy::kPAC, proxy_settings);
-      SetProxyEffectiveValue(
-          pac, state, base::WrapUnique<base::Value>(new base::StringValue(
-                          config.automatic_proxy.pac_url.spec())));
+      SetProxyEffectiveValue(pac, state,
+                             base::WrapUnique<base::Value>(new base::Value(
+                                 config.automatic_proxy.pac_url.spec())));
       break;
     }
     case UIProxyConfig::MODE_DIRECT:

diff --git a/extensions/browser/api/runtime/runtime_api.cc b/extensions/browser/api/runtime/runtime_api.cc
index f5644c4b..bb4a1f7 100644
--- a/extensions/browser/api/runtime/runtime_api.cc
+++ b/extensions/browser/api/runtime/runtime_api.cc

@@ -155,8 +155,8 @@
 void SetUninstallURL(ExtensionPrefs* prefs,
                      const std::string& extension_id,
                      const std::string& url_string) {
-  prefs->UpdateExtensionPref(
-      extension_id, kUninstallUrl, new base::StringValue(url_string));
+  prefs->UpdateExtensionPref(extension_id, kUninstallUrl,
+                             new base::Value(url_string));
 }
 
 std::string GetUninstallURL(ExtensionPrefs* prefs,
@@ -701,11 +701,11 @@
   if (result.success) {
     std::unique_ptr<base::DictionaryValue> details(new base::DictionaryValue);
     details->SetString("version", result.version);
-    Respond(TwoArguments(base::MakeUnique<base::StringValue>(result.response),
+    Respond(TwoArguments(base::MakeUnique<base::Value>(result.response),
                          std::move(details)));
   } else {
     // HMM(kalman): Why does !success not imply Error()?
-    Respond(OneArgument(base::MakeUnique<base::StringValue>(result.response)));
+    Respond(OneArgument(base::MakeUnique<base::Value>(result.response)));
   }
 }
 

diff --git a/extensions/browser/api/storage/settings_quota_unittest.cc b/extensions/browser/api/storage/settings_quota_unittest.cc
index b2aab26..26373fe8 100644
--- a/extensions/browser/api/storage/settings_quota_unittest.cc
+++ b/extensions/browser/api/storage/settings_quota_unittest.cc

@@ -69,7 +69,7 @@
 
   // Values with different serialized sizes.
   base::Value byte_value_1_;
-  base::StringValue byte_value_16_;
+  base::Value byte_value_16_;
   base::ListValue byte_value_256_;
 
   // Quota enforcing storage area being tested.

diff --git a/extensions/browser/api/storage/settings_test_util.cc b/extensions/browser/api/storage/settings_test_util.cc
index edc4254..1b619ef6 100644
--- a/extensions/browser/api/storage/settings_test_util.cc
+++ b/extensions/browser/api/storage/settings_test_util.cc

@@ -23,7 +23,7 @@
   for (int i = 0; i < 1024; ++i) {
     kilobyte_string += "a";
   }
-  return std::unique_ptr<base::Value>(new base::StringValue(kilobyte_string));
+  return std::unique_ptr<base::Value>(new base::Value(kilobyte_string));
 }
 
 // Creates a megabyte of data.

diff --git a/extensions/browser/api/storage/storage_frontend_unittest.cc b/extensions/browser/api/storage/storage_frontend_unittest.cc
index 6f37a2e..91733d6b 100644
--- a/extensions/browser/api/storage/storage_frontend_unittest.cc
+++ b/extensions/browser/api/storage/storage_frontend_unittest.cc

@@ -103,7 +103,7 @@
   // The correctness of Get/Set/Remove/Clear is tested elsewhere so no need to
   // be too rigorous.
   {
-    base::StringValue bar("bar");
+    base::Value bar("bar");
     ValueStore::WriteResult result = storage->Set(DEFAULTS, "foo", bar);
     ASSERT_TRUE(result->status().ok());
   }
@@ -133,7 +133,7 @@
       util::GetStorage(extension, settings::LOCAL, frontend_.get());
 
   {
-    base::StringValue bar("bar");
+    base::Value bar("bar");
     ValueStore::WriteResult result = storage->Set(DEFAULTS, "foo", bar);
     ASSERT_TRUE(result->status().ok());
   }
@@ -160,7 +160,7 @@
       util::GetStorage(extension, settings::LOCAL, frontend_.get());
 
   {
-    base::StringValue bar("bar");
+    base::Value bar("bar");
     ValueStore::WriteResult result = storage->Set(DEFAULTS, "foo", bar);
     ASSERT_TRUE(result->status().ok());
     EXPECT_TRUE(base::PathExists(temp_dir_.GetPath()));

diff --git a/extensions/browser/api/system_storage/system_storage_api.cc b/extensions/browser/api/system_storage/system_storage_api.cc
index 3bd5ecfa..ebc0ae5 100644
--- a/extensions/browser/api/system_storage/system_storage_api.cc
+++ b/extensions/browser/api/system_storage/system_storage_api.cc

@@ -89,8 +89,8 @@
       result = api::system_storage::EJECT_DEVICE_RESULT_CODE_FAILURE;
   }
 
-  Respond(OneArgument(base::MakeUnique<base::StringValue>(
-      api::system_storage::ToString(result))));
+  Respond(OneArgument(
+      base::MakeUnique<base::Value>(api::system_storage::ToString(result))));
 }
 
 SystemStorageGetAvailableCapacityFunction::

diff --git a/extensions/browser/api/test/test_api.cc b/extensions/browser/api/test/test_api.cc
index 2eefdaf9..7bd4372 100644
--- a/extensions/browser/api/test/test_api.cc
+++ b/extensions/browser/api/test/test_api.cc

@@ -97,8 +97,7 @@
   // finish the function.
   if (!listener_will_respond || response_.get()) {
     if (!response_) {
-      response_ =
-          OneArgument(base::MakeUnique<base::StringValue>(std::string()));
+      response_ = OneArgument(base::MakeUnique<base::Value>(std::string()));
     }
     return RespondNow(std::move(response_));
   }
@@ -111,7 +110,7 @@
 
 void TestSendMessageFunction::Reply(const std::string& message) {
   DCHECK(!response_);
-  response_ = OneArgument(base::MakeUnique<base::StringValue>(message));
+  response_ = OneArgument(base::MakeUnique<base::Value>(message));
   if (waiting_)
     Respond(std::move(response_));
 }
@@ -155,7 +154,7 @@
   std::unique_ptr<WaitForRoundTrip::Params> params(
       WaitForRoundTrip::Params::Create(*args_));
   return RespondNow(
-      OneArgument(base::MakeUnique<base::StringValue>(params->message)));
+      OneArgument(base::MakeUnique<base::Value>(params->message)));
 }
 
 }  // namespace extensions

diff --git a/extensions/browser/api/vpn_provider/vpn_provider_api.cc b/extensions/browser/api/vpn_provider/vpn_provider_api.cc
index 5f58f32..27d9c02 100644
--- a/extensions/browser/api/vpn_provider/vpn_provider_api.cc
+++ b/extensions/browser/api/vpn_provider/vpn_provider_api.cc

@@ -163,7 +163,7 @@
 
 void VpnThreadExtensionFunction::SignalCallCompletionSuccessWithId(
     const std::string& configuration_id) {
-  Respond(OneArgument(base::MakeUnique<base::StringValue>(configuration_id)));
+  Respond(OneArgument(base::MakeUnique<base::Value>(configuration_id)));
 }
 
 void VpnThreadExtensionFunction::SignalCallCompletionSuccessWithWarning(

diff --git a/extensions/browser/api/web_request/upload_data_presenter.cc b/extensions/browser/api/web_request/upload_data_presenter.cc
index ff63010..dfe9eda0 100644
--- a/extensions/browser/api/web_request/upload_data_presenter.cc
+++ b/extensions/browser/api/web_request/upload_data_presenter.cc

@@ -19,7 +19,6 @@
 using base::BinaryValue;
 using base::DictionaryValue;
 using base::ListValue;
-using base::StringValue;
 using base::Value;
 
 namespace keys = extension_web_request_api_constants;
@@ -98,7 +97,7 @@
 void RawDataPresenter::FeedNextFile(const std::string& filename) {
   // Insert the file path instead of the contents, which may be too large.
   subtle::AppendKeyValuePair(keys::kRequestBodyRawFileKey,
-                             base::MakeUnique<base::StringValue>(filename),
+                             base::MakeUnique<base::Value>(filename),
                              list_.get());
 }
 

diff --git a/extensions/browser/api/web_request/upload_data_presenter_unittest.cc b/extensions/browser/api/web_request/upload_data_presenter_unittest.cc
index 6a2fe4f..548ad63 100644
--- a/extensions/browser/api/web_request/upload_data_presenter_unittest.cc
+++ b/extensions/browser/api/web_request/upload_data_presenter_unittest.cc

@@ -54,8 +54,7 @@
   std::unique_ptr<base::BinaryValue> expected_a(
       base::BinaryValue::CreateWithCopiedBuffer(block1, block1_size));
   ASSERT_TRUE(expected_a.get() != NULL);
-  std::unique_ptr<base::StringValue> expected_b(
-      new base::StringValue(kFilename));
+  std::unique_ptr<base::Value> expected_b(new base::Value(kFilename));
   ASSERT_TRUE(expected_b.get() != NULL);
   std::unique_ptr<base::BinaryValue> expected_c(
       base::BinaryValue::CreateWithCopiedBuffer(block2, block2_size));

diff --git a/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc b/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc
index f1526d18..fc4ad9e 100644
--- a/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc
+++ b/extensions/browser/api/webcam_private/webcam_private_api_chromeos.cc

@@ -205,7 +205,7 @@
     const std::string& webcam_id,
     bool success) {
   if (success) {
-    SetResult(base::MakeUnique<base::StringValue>(webcam_id));
+    SetResult(base::MakeUnique<base::Value>(webcam_id));
     SendResponse(true);
   } else {
     SetError(kOpenSerialWebcamError);

diff --git a/extensions/browser/event_listener_map_unittest.cc b/extensions/browser/event_listener_map_unittest.cc
index b308f18b..67de0d8 100644
--- a/extensions/browser/event_listener_map_unittest.cc
+++ b/extensions/browser/event_listener_map_unittest.cc

@@ -16,7 +16,7 @@
 
 using base::DictionaryValue;
 using base::ListValue;
-using base::StringValue;
+using base::Value;
 
 namespace extensions {
 
@@ -54,7 +54,7 @@
     std::unique_ptr<ListValue> filter_list(new ListValue);
     std::unique_ptr<DictionaryValue> filter_dict(new DictionaryValue);
 
-    filter_dict->Set("hostSuffix", new StringValue(suffix));
+    filter_dict->Set("hostSuffix", new Value(suffix));
 
     filter_list->Append(std::move(filter_dict));
     filter->Set("url", filter_list.release());

diff --git a/extensions/browser/event_router_unittest.cc b/extensions/browser/event_router_unittest.cc
index 53cb9daa..f76c6c15 100644
--- a/extensions/browser/event_router_unittest.cc
+++ b/extensions/browser/event_router_unittest.cc

@@ -31,7 +31,7 @@
 
 using base::DictionaryValue;
 using base::ListValue;
-using base::StringValue;
+using base::Value;
 
 namespace extensions {
 
@@ -124,7 +124,7 @@
   std::unique_ptr<ListValue> filter_list(new ListValue());
   std::unique_ptr<DictionaryValue> filter_dict(new DictionaryValue());
 
-  filter_dict->Set("hostSuffix", base::MakeUnique<StringValue>(suffix));
+  filter_dict->Set("hostSuffix", base::MakeUnique<Value>(suffix));
   filter_list->Append(std::move(filter_dict));
   filter->Set("url", std::move(filter_list));
 

diff --git a/extensions/browser/extension_pref_value_map_unittest.cc b/extensions/browser/extension_pref_value_map_unittest.cc
index c2f1fdd..36c2fb9 100644
--- a/extensions/browser/extension_pref_value_map_unittest.cc
+++ b/extensions/browser/extension_pref_value_map_unittest.cc

@@ -27,7 +27,7 @@
 }  // namespace
 
 static base::Value* CreateVal(const char* str) {
-  return new base::StringValue(str);
+  return new base::Value(str);
 }
 
 static base::Time CreateTime(int64_t t) {

diff --git a/extensions/browser/extension_prefs.cc b/extensions/browser/extension_prefs.cc
index ae1aa4a..eaf48f3 100644
--- a/extensions/browser/extension_prefs.cc
+++ b/extensions/browser/extension_prefs.cc

@@ -1361,8 +1361,7 @@
   const base::Time install_time = time_provider_->GetCurrentTime();
   pending_install_dict->Set(
       kPrefInstallTime,
-      new base::StringValue(
-          base::Int64ToString(install_time.ToInternalValue())));
+      new base::Value(base::Int64ToString(install_time.ToInternalValue())));
 
   // Commit the delayed install data.
   for (base::DictionaryValue::Iterator it(*pending_install_dict); !it.IsAtEnd();
@@ -1694,9 +1693,8 @@
 
 void ExtensionPrefs::SetInstallParam(const std::string& extension_id,
                                      const std::string& install_parameter) {
-  UpdateExtensionPref(extension_id,
-                      kPrefInstallParam,
-                      new base::StringValue(install_parameter));
+  UpdateExtensionPref(extension_id, kPrefInstallParam,
+                      new base::Value(install_parameter));
 }
 
 int ExtensionPrefs::GetCorruptedDisableCount() const {
@@ -1844,18 +1842,17 @@
                       new base::Value(extension->was_installed_by_default()));
   extension_dict->Set(kPrefWasInstalledByOem,
                       new base::Value(extension->was_installed_by_oem()));
-  extension_dict->Set(kPrefInstallTime,
-                      new base::StringValue(
-                          base::Int64ToString(install_time.ToInternalValue())));
+  extension_dict->Set(
+      kPrefInstallTime,
+      new base::Value(base::Int64ToString(install_time.ToInternalValue())));
   if (install_flags & kInstallFlagIsBlacklistedForMalware)
     extension_dict->Set(kPrefBlacklist, new base::Value(true));
 
   base::FilePath::StringType path = MakePathRelative(install_directory_,
                                                      extension->path());
-  extension_dict->Set(kPrefPath, new base::StringValue(path));
+  extension_dict->Set(kPrefPath, new base::Value(path));
   if (!install_parameter.empty()) {
-    extension_dict->Set(kPrefInstallParam,
-                        new base::StringValue(install_parameter));
+    extension_dict->Set(kPrefInstallParam, new base::Value(install_parameter));
   }
   // We store prefs about LOAD extensions, but don't cache their manifest
   // since it may change on disk.

diff --git a/extensions/browser/guest_view/web_view/javascript_dialog_helper.cc b/extensions/browser/guest_view/web_view/javascript_dialog_helper.cc
index e420cdc..1d48653 100644
--- a/extensions/browser/guest_view/web_view/javascript_dialog_helper.cc
+++ b/extensions/browser/guest_view/web_view/javascript_dialog_helper.cc

@@ -49,15 +49,13 @@
     const DialogClosedCallback& callback,
     bool* did_suppress_message) {
   base::DictionaryValue request_info;
-  request_info.Set(
-      webview::kDefaultPromptText,
-      new base::StringValue(base::UTF16ToUTF8(default_prompt_text)));
+  request_info.Set(webview::kDefaultPromptText,
+                   new base::Value(base::UTF16ToUTF8(default_prompt_text)));
   request_info.Set(webview::kMessageText,
-                   new base::StringValue(base::UTF16ToUTF8(message_text)));
-  request_info.Set(
-      webview::kMessageType,
-      new base::StringValue(JavaScriptDialogTypeToString(dialog_type)));
-  request_info.Set(guest_view::kUrl, new base::StringValue(origin_url.spec()));
+                   new base::Value(base::UTF16ToUTF8(message_text)));
+  request_info.Set(webview::kMessageType,
+                   new base::Value(JavaScriptDialogTypeToString(dialog_type)));
+  request_info.Set(guest_view::kUrl, new base::Value(origin_url.spec()));
   WebViewPermissionHelper* web_view_permission_helper =
       WebViewPermissionHelper::FromWebContents(web_contents);
   web_view_permission_helper->RequestPermission(

diff --git a/extensions/browser/guest_view/web_view/web_view_guest.cc b/extensions/browser/guest_view/web_view/web_view_guest.cc
index 6973ebb0..e127774 100644
--- a/extensions/browser/guest_view/web_view/web_view_guest.cc
+++ b/extensions/browser/guest_view/web_view/web_view_guest.cc

@@ -1487,16 +1487,15 @@
   request_info.SetInteger(webview::kInitialHeight, initial_bounds.height());
   request_info.SetInteger(webview::kInitialWidth, initial_bounds.width());
   request_info.Set(webview::kTargetURL,
-                   new base::StringValue(new_window_info.url.spec()));
-  request_info.Set(webview::kName, new base::StringValue(new_window_info.name));
+                   new base::Value(new_window_info.url.spec()));
+  request_info.Set(webview::kName, new base::Value(new_window_info.name));
   request_info.SetInteger(webview::kWindowID, guest->guest_instance_id());
   // We pass in partition info so that window-s created through newwindow
   // API can use it to set their partition attribute.
   request_info.Set(webview::kStoragePartitionId,
-                   new base::StringValue(storage_partition_id));
-  request_info.Set(
-      webview::kWindowOpenDisposition,
-      new base::StringValue(WindowOpenDispositionToString(disposition)));
+                   new base::Value(storage_partition_id));
+  request_info.Set(webview::kWindowOpenDisposition,
+                   new base::Value(WindowOpenDispositionToString(disposition)));
 
   web_view_permission_helper_->
       RequestPermission(WEB_VIEW_PERMISSION_TYPE_NEW_WINDOW,

diff --git a/extensions/browser/value_store/leveldb_value_store_unittest.cc b/extensions/browser/value_store/leveldb_value_store_unittest.cc
index 8498409e..4cb1151 100644
--- a/extensions/browser/value_store/leveldb_value_store_unittest.cc
+++ b/extensions/browser/value_store/leveldb_value_store_unittest.cc

@@ -75,7 +75,7 @@
   const char kValue[] = "value";
 
   // Insert a valid pair.
-  std::unique_ptr<base::Value> value(new base::StringValue(kValue));
+  std::unique_ptr<base::Value> value(new base::Value(kValue));
   ASSERT_TRUE(store()
                   ->Set(ValueStore::DEFAULTS, kNotCorruptKey, *value)
                   ->status().ok());
@@ -117,7 +117,7 @@
   const char kCorruptValue[] = "[{(.*+\"\'\\";
 
   // Insert a collection of non-corrupted pairs.
-  std::unique_ptr<base::Value> value(new base::StringValue(kValue));
+  std::unique_ptr<base::Value> value(new base::Value(kValue));
   for (size_t i = 0; i < kNotCorruptKeysSize; ++i) {
     ASSERT_TRUE(store()
                     ->Set(ValueStore::DEFAULTS, kNotCorruptKeys[i], *value)
@@ -163,7 +163,7 @@
   const char kValue[] = "value";
 
   // Generate a database.
-  std::unique_ptr<base::Value> value(new base::StringValue(kValue));
+  std::unique_ptr<base::Value> value(new base::Value(kValue));
   for (size_t i = 0; i < kNotCorruptKeysSize; ++i) {
     ASSERT_TRUE(store()
                     ->Set(ValueStore::DEFAULTS, kNotCorruptKeys[i], *value)

diff --git a/extensions/browser/value_store/value_store_change_unittest.cc b/extensions/browser/value_store/value_store_change_unittest.cc
index ef4934a7..10fd6a0 100644
--- a/extensions/browser/value_store/value_store_change_unittest.cc
+++ b/extensions/browser/value_store/value_store_change_unittest.cc

@@ -20,40 +20,39 @@
 
 TEST(ValueStoreChangeTest, NullOldValue) {
   ValueStoreChange change("key", nullptr,
-                          base::MakeUnique<base::StringValue>("value"));
+                          base::MakeUnique<base::Value>("value"));
 
   EXPECT_EQ("key", change.key());
   EXPECT_EQ(NULL, change.old_value());
   {
-    base::StringValue expected("value");
+    base::Value expected("value");
     EXPECT_TRUE(change.new_value()->Equals(&expected));
   }
 }
 
 TEST(ValueStoreChangeTest, NullNewValue) {
-  ValueStoreChange change("key", base::MakeUnique<base::StringValue>("value"),
+  ValueStoreChange change("key", base::MakeUnique<base::Value>("value"),
                           nullptr);
 
   EXPECT_EQ("key", change.key());
   {
-    base::StringValue expected("value");
+    base::Value expected("value");
     EXPECT_TRUE(change.old_value()->Equals(&expected));
   }
   EXPECT_EQ(NULL, change.new_value());
 }
 
 TEST(ValueStoreChangeTest, NonNullValues) {
-  ValueStoreChange change("key",
-                          base::MakeUnique<base::StringValue>("old_value"),
-                          base::MakeUnique<base::StringValue>("new_value"));
+  ValueStoreChange change("key", base::MakeUnique<base::Value>("old_value"),
+                          base::MakeUnique<base::Value>("new_value"));
 
   EXPECT_EQ("key", change.key());
   {
-    base::StringValue expected("old_value");
+    base::Value expected("old_value");
     EXPECT_TRUE(change.old_value()->Equals(&expected));
   }
   {
-    base::StringValue expected("new_value");
+    base::Value expected("new_value");
     EXPECT_TRUE(change.new_value()->Equals(&expected));
   }
 }

diff --git a/extensions/browser/value_store/value_store_frontend_unittest.cc b/extensions/browser/value_store/value_store_frontend_unittest.cc
index abc33a9..8a7281d 100644
--- a/extensions/browser/value_store/value_store_frontend_unittest.cc
+++ b/extensions/browser/value_store/value_store_frontend_unittest.cc

@@ -96,8 +96,7 @@
 
 TEST_F(ValueStoreFrontendTest, ChangesPersistAfterReload) {
   storage_->Set("key0", std::unique_ptr<base::Value>(new base::Value(0)));
-  storage_->Set("key1",
-                std::unique_ptr<base::Value>(new base::StringValue("new1")));
+  storage_->Set("key1", std::unique_ptr<base::Value>(new base::Value("new1")));
   storage_->Remove("key2");
 
   // Reload the DB and test our changes.

diff --git a/extensions/browser/value_store/value_store_unittest.cc b/extensions/browser/value_store/value_store_unittest.cc
index 9d332d7c..d3dfba3b 100644
--- a/extensions/browser/value_store/value_store_unittest.cc
+++ b/extensions/browser/value_store/value_store_unittest.cc

@@ -133,9 +133,9 @@
       dict123_(new base::DictionaryValue()),
       ui_thread_(BrowserThread::UI, base::MessageLoop::current()),
       file_thread_(BrowserThread::FILE, base::MessageLoop::current()) {
-  val1_.reset(new base::StringValue(key1_ + "Value"));
-  val2_.reset(new base::StringValue(key2_ + "Value"));
-  val3_.reset(new base::StringValue(key3_ + "Value"));
+  val1_.reset(new base::Value(key1_ + "Value"));
+  val2_.reset(new base::Value(key2_ + "Value"));
+  val3_.reset(new base::Value(key3_ + "Value"));
 
   list1_.push_back(key1_);
   list2_.push_back(key2_);
@@ -330,7 +330,7 @@
 // indexing into a dictionary.
 TEST_P(ValueStoreTest, DotsInKeyNames) {
   std::string dot_key("foo.bar");
-  base::StringValue dot_value("baz.qux");
+  base::Value dot_value("baz.qux");
   std::vector<std::string> dot_list;
   dot_list.push_back(dot_key);
   base::DictionaryValue dot_dict;

diff --git a/extensions/common/event_filter_unittest.cc b/extensions/common/event_filter_unittest.cc
index 6e96c991..d51e163 100644
--- a/extensions/common/event_filter_unittest.cc
+++ b/extensions/common/event_filter_unittest.cc

@@ -33,7 +33,7 @@
  protected:
   std::unique_ptr<base::Value> HostSuffixDict(const std::string& host_suffix) {
     std::unique_ptr<base::DictionaryValue> dict(new DictionaryValue());
-    dict->Set("hostSuffix", new base::StringValue(host_suffix));
+    dict->Set("hostSuffix", new base::Value(host_suffix));
     return std::unique_ptr<base::Value>(dict.release());
   }
 

diff --git a/extensions/common/extension_l10n_util.cc b/extensions/common/extension_l10n_util.cc
index bf0194a4..4422ca3 100644
--- a/extensions/common/extension_l10n_util.cc
+++ b/extensions/common/extension_l10n_util.cc

@@ -92,7 +92,7 @@
     std::string result;
     if (list->GetString(i, &result)) {
       if (messages.ReplaceMessages(&result, error))
-        list->Set(i, new base::StringValue(result));
+        list->Set(i, new base::Value(result));
       else
         ret = false;
     }

diff --git a/extensions/common/permissions/media_galleries_permission_data.cc b/extensions/common/permissions/media_galleries_permission_data.cc
index 13f7d93..330923d 100644
--- a/extensions/common/permissions/media_galleries_permission_data.cc
+++ b/extensions/common/permissions/media_galleries_permission_data.cc

@@ -24,7 +24,7 @@
 }
 
 std::unique_ptr<base::Value> MediaGalleriesPermissionData::ToValue() const {
-  return std::unique_ptr<base::Value>(new base::StringValue(permission_));
+  return std::unique_ptr<base::Value>(new base::Value(permission_));
 }
 
 bool MediaGalleriesPermissionData::FromValue(const base::Value* value) {

diff --git a/extensions/common/permissions/settings_override_permission.cc b/extensions/common/permissions/settings_override_permission.cc
index df5b073..55f6a17 100644
--- a/extensions/common/permissions/settings_override_permission.cc
+++ b/extensions/common/permissions/settings_override_permission.cc

@@ -62,7 +62,7 @@
 }
 
 std::unique_ptr<base::Value> SettingsOverrideAPIPermission::ToValue() const {
-  return base::MakeUnique<base::StringValue>(setting_value_);
+  return base::MakeUnique<base::Value>(setting_value_);
 }
 
 APIPermission* SettingsOverrideAPIPermission::Clone() const {

diff --git a/extensions/common/permissions/socket_permission_data.cc b/extensions/common/permissions/socket_permission_data.cc
index e4dbbdc..1616a10 100644
--- a/extensions/common/permissions/socket_permission_data.cc
+++ b/extensions/common/permissions/socket_permission_data.cc

@@ -103,7 +103,7 @@
 }
 
 std::unique_ptr<base::Value> SocketPermissionData::ToValue() const {
-  return std::unique_ptr<base::Value>(new base::StringValue(GetAsString()));
+  return std::unique_ptr<base::Value>(new base::Value(GetAsString()));
 }
 
 bool SocketPermissionData::FromValue(const base::Value* value) {

diff --git a/extensions/common/url_pattern_set.cc b/extensions/common/url_pattern_set.cc
index 5686092..28c8cf7 100644
--- a/extensions/common/url_pattern_set.cc
+++ b/extensions/common/url_pattern_set.cc

@@ -233,8 +233,7 @@
   std::unique_ptr<base::ListValue> value(new base::ListValue);
   for (URLPatternSet::const_iterator i = patterns_.begin();
        i != patterns_.end(); ++i)
-    value->AppendIfNotPresent(
-        base::MakeUnique<base::StringValue>(i->GetAsString()));
+    value->AppendIfNotPresent(base::MakeUnique<base::Value>(i->GetAsString()));
   return value;
 }
 

diff --git a/extensions/common/value_builder.cc b/extensions/common/value_builder.cc
index 08bb7de..7f2a177 100644
--- a/extensions/common/value_builder.cc
+++ b/extensions/common/value_builder.cc

@@ -42,15 +42,13 @@
 
 DictionaryBuilder& DictionaryBuilder::Set(const std::string& path,
                                           const std::string& in_value) {
-  dict_->SetWithoutPathExpansion(path,
-                                 base::MakeUnique<base::StringValue>(in_value));
+  dict_->SetWithoutPathExpansion(path, base::MakeUnique<base::Value>(in_value));
   return *this;
 }
 
 DictionaryBuilder& DictionaryBuilder::Set(const std::string& path,
                                           const base::string16& in_value) {
-  dict_->SetWithoutPathExpansion(path,
-                                 base::MakeUnique<base::StringValue>(in_value));
+  dict_->SetWithoutPathExpansion(path, base::MakeUnique<base::Value>(in_value));
   return *this;
 }
 

diff --git a/extensions/renderer/activity_log_converter_strategy.cc b/extensions/renderer/activity_log_converter_strategy.cc
index 1be41aa..443535f 100644
--- a/extensions/renderer/activity_log_converter_strategy.cc
+++ b/extensions/renderer/activity_log_converter_strategy.cc

@@ -40,11 +40,11 @@
 
   if (try_catch.HasCaught()) {
     return std::unique_ptr<base::Value>(
-        new base::StringValue("[JS Execution Exception]"));
+        new base::Value("[JS Execution Exception]"));
   }
 
   return std::unique_ptr<base::Value>(
-      new base::StringValue(std::string(*v8::String::Utf8Value(name))));
+      new base::Value(std::string(*v8::String::Utf8Value(name))));
 }
 
 }  // namespace

diff --git a/extensions/renderer/argument_spec.cc b/extensions/renderer/argument_spec.cc
index c71e0e70..c46d320 100644
--- a/extensions/renderer/argument_spec.cc
+++ b/extensions/renderer/argument_spec.cc

@@ -228,9 +228,9 @@
       if (!enum_values_.empty() && enum_values_.count(s) == 0)
         return false;
       if (out_value) {
-        // TODO(devlin): If base::StringValue ever takes a std::string&&, we
+        // TODO(devlin): If base::Value ever takes a std::string&&, we
         // could use std::move to construct.
-        *out_value = base::MakeUnique<base::StringValue>(s);
+        *out_value = base::MakeUnique<base::Value>(s);
       }
       return true;
     }

diff --git a/extensions/shell/browser/api/identity/identity_api.cc b/extensions/shell/browser/api/identity/identity_api.cc
index b2b057c..c1eccfd 100644
--- a/extensions/shell/browser/api/identity/identity_api.cc
+++ b/extensions/shell/browser/api/identity/identity_api.cc

@@ -127,7 +127,7 @@
 void IdentityGetAuthTokenFunction::OnMintTokenSuccess(
     const std::string& access_token,
     int time_to_live) {
-  Respond(OneArgument(base::MakeUnique<base::StringValue>(access_token)));
+  Respond(OneArgument(base::MakeUnique<base::Value>(access_token)));
   Release();  // Balanced in Run().
 }
 

diff --git a/headless/lib/browser/devtools_api/domain_type_conversions_h.template b/headless/lib/browser/devtools_api/domain_type_conversions_h.template
index f14b423..15796eb 100644
--- a/headless/lib/browser/devtools_api/domain_type_conversions_h.template
+++ b/headless/lib/browser/devtools_api/domain_type_conversions_h.template

@@ -40,7 +40,7 @@
   switch (value) {
     {% for literal in type.enum %}
     case {{namespace}}::{{type.id}}::{{literal | sanitize_literal | dash_to_camelcase | camelcase_to_hacker_style | upper }}:
-      return base::WrapUnique(new base::StringValue("{{literal}}"));
+      return base::WrapUnique(new base::Value("{{literal}}"));
     {% endfor %}
   };
   NOTREACHED();

diff --git a/headless/public/internal/value_conversions.h b/headless/public/internal/value_conversions.h
index 948c94f..5622fb84 100644
--- a/headless/public/internal/value_conversions.h
+++ b/headless/public/internal/value_conversions.h

@@ -47,7 +47,7 @@
 
 template <typename T>
 std::unique_ptr<base::Value> ToValueImpl(const std::string& value, T*) {
-  return base::MakeUnique<base::StringValue>(value);
+  return base::MakeUnique<base::Value>(value);
 }
 
 template <typename T>

diff --git a/ios/chrome/browser/ui/reader_mode/reader_mode_checker.mm b/ios/chrome/browser/ui/reader_mode/reader_mode_checker.mm
index d2ccabaa..8c207d6 100644
--- a/ios/chrome/browser/ui/reader_mode/reader_mode_checker.mm
+++ b/ios/chrome/browser/ui/reader_mode/reader_mode_checker.mm

@@ -118,7 +118,7 @@
         }
         const dom_distiller::DistillablePageDetector* detector =
             dom_distiller::DistillablePageDetector::GetDefault();
-        const base::StringValue value(base::SysNSStringToUTF8(result));
+        const base::Value value(base::SysNSStringToUTF8(result));
         std::vector<double> features(
             dom_distiller::CalculateDerivedFeaturesFromJSON(&value));
         if (detector->Classify(features)) {

diff --git a/ios/chrome/browser/ui/settings/block_popups_collection_view_controller.mm b/ios/chrome/browser/ui/settings/block_popups_collection_view_controller.mm
index 39638f8..03f4656 100644
--- a/ios/chrome/browser/ui/settings/block_popups_collection_view_controller.mm
+++ b/ios/chrome/browser/ui/settings/block_popups_collection_view_controller.mm

@@ -296,7 +296,7 @@
     if (entries[i].secondary_pattern == ContentSettingsPattern::Wildcard() &&
         entries[i].setting == CONTENT_SETTING_ALLOW) {
       _exceptions.Append(
-          new base::StringValue(entries[i].primary_pattern.ToString()));
+          new base::Value(entries[i].primary_pattern.ToString()));
     } else {
       LOG(ERROR) << "Secondary content settings patterns are not "
                  << "supported by the content settings UI";

diff --git a/ios/chrome/browser/ui/webui/crashes_ui.cc b/ios/chrome/browser/ui/webui/crashes_ui.cc
index 088588f7..37ae935c 100644
--- a/ios/chrome/browser/ui/webui/crashes_ui.cc
+++ b/ios/chrome/browser/ui/webui/crashes_ui.cc

@@ -124,9 +124,9 @@
   base::Value enabled(crash_reporting_enabled);
   base::Value dynamic_backend(false);
   base::Value manual_uploads(false);
-  base::StringValue version(version_info::GetVersionNumber());
-  base::StringValue os_string(base::SysInfo::OperatingSystemName() + " " +
-                              base::SysInfo::OperatingSystemVersion());
+  base::Value version(version_info::GetVersionNumber());
+  base::Value os_string(base::SysInfo::OperatingSystemName() + " " +
+                        base::SysInfo::OperatingSystemVersion());
 
   std::vector<const base::Value*> args;
   args.push_back(&enabled);

diff --git a/ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc b/ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc
index 8ee1b614..4a136416 100644
--- a/ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc
+++ b/ios/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc

@@ -125,13 +125,12 @@
   ModelTypeSet protocol_types = syncer::ProtocolTypes();
   for (ModelTypeSet::Iterator it = protocol_types.First(); it.Good();
        it.Inc()) {
-    type_list->Append(new base::StringValue(ModelTypeToString(it.Get())));
+    type_list->Append(new base::Value(ModelTypeToString(it.Get())));
   }
   event_details.Set(syncer::sync_ui_util::kTypes, type_list.release());
   web_ui()->CallJavascriptFunction(
       syncer::sync_ui_util::kDispatchEvent,
-      base::StringValue(syncer::sync_ui_util::kOnReceivedListOfTypes),
-      event_details);
+      base::Value(syncer::sync_ui_util::kOnReceivedListOfTypes), event_details);
 }
 
 void SyncInternalsMessageHandler::HandleGetAllNodes(
@@ -167,7 +166,7 @@
       syncer::ProtocolEvent::ToValue(event));
   web_ui()->CallJavascriptFunction(
       syncer::sync_ui_util::kDispatchEvent,
-      base::StringValue(syncer::sync_ui_util::kOnProtocolEvent), *value);
+      base::Value(syncer::sync_ui_util::kOnProtocolEvent), *value);
 }
 
 void SyncInternalsMessageHandler::OnCommitCountersUpdated(
@@ -198,7 +197,7 @@
   details->Set(syncer::sync_ui_util::kCounters, value.release());
   web_ui()->CallJavascriptFunction(
       syncer::sync_ui_util::kDispatchEvent,
-      base::StringValue(syncer::sync_ui_util::kOnCountersUpdated), *details);
+      base::Value(syncer::sync_ui_util::kOnCountersUpdated), *details);
 }
 
 void SyncInternalsMessageHandler::HandleJsEvent(const std::string& name,
@@ -206,7 +205,7 @@
   DVLOG(1) << "Handling event: " << name << " with details "
            << details.ToString();
   web_ui()->CallJavascriptFunction(syncer::sync_ui_util::kDispatchEvent,
-                                   base::StringValue(name), details.Get());
+                                   base::Value(name), details.Get());
 }
 
 void SyncInternalsMessageHandler::SendAboutInfo() {
@@ -220,7 +219,7 @@
           sync_service, signin_manager, GetChannel());
   web_ui()->CallJavascriptFunction(
       syncer::sync_ui_util::kDispatchEvent,
-      base::StringValue(syncer::sync_ui_util::kOnAboutInfoUpdated), *value);
+      base::Value(syncer::sync_ui_util::kOnAboutInfoUpdated), *value);
 }
 
 // Gets the SyncService of the underlying original profile. May return null.

diff --git a/ios/web/web_state/ui/web_view_js_utils.mm b/ios/web/web_state/ui/web_view_js_utils.mm
index 50e4f42..b7aade32 100644
--- a/ios/web/web_state/ui/web_view_js_utils.mm
+++ b/ios/web/web_state/ui/web_view_js_utils.mm

@@ -32,7 +32,7 @@
 
   CFTypeID result_type = CFGetTypeID(wk_result);
   if (result_type == CFStringGetTypeID()) {
-    result.reset(new base::StringValue(base::SysNSStringToUTF16(wk_result)));
+    result.reset(new base::Value(base::SysNSStringToUTF16(wk_result)));
     DCHECK(result->IsType(base::Value::Type::STRING));
   } else if (result_type == CFNumberGetTypeID()) {
     result.reset(new base::Value([wk_result doubleValue]));

diff --git a/ipc/ipc_message_unittest.cc b/ipc/ipc_message_unittest.cc
index bde96a1..fd08452 100644
--- a/ipc/ipc_message_unittest.cc
+++ b/ipc/ipc_message_unittest.cc

@@ -66,7 +66,7 @@
 TEST(IPCMessageTest, ListValue) {
   base::ListValue input;
   input.Set(0, new base::Value(42.42));
-  input.Set(1, new base::StringValue("forty"));
+  input.Set(1, new base::Value("forty"));
   input.Set(2, base::Value::CreateNullValue());
 
   IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
@@ -93,13 +93,13 @@
   input.SetWithoutPathExpansion("int.with.dot", new base::Value(43));
 
   std::unique_ptr<base::DictionaryValue> subdict(new base::DictionaryValue());
-  subdict->Set("str", new base::StringValue("forty two"));
+  subdict->Set("str", new base::Value("forty two"));
   subdict->Set("bool", new base::Value(false));
 
   std::unique_ptr<base::ListValue> sublist(new base::ListValue());
   sublist->Set(0, new base::Value(42.42));
-  sublist->Set(1, new base::StringValue("forty"));
-  sublist->Set(2, new base::StringValue("two"));
+  sublist->Set(1, new base::Value("forty"));
+  sublist->Set(2, new base::Value("two"));
   subdict->Set("list", sublist.release());
 
   input.Set("dict", subdict.release());

diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc
index 328e804..bf8daa5 100644
--- a/ipc/ipc_message_utils.cc
+++ b/ipc/ipc_message_utils.cc

@@ -96,7 +96,7 @@
       sizer->AddDouble();
       break;
     case base::Value::Type::STRING: {
-      const base::StringValue* result;
+      const base::Value* result;
       value->GetAsString(&result);
       if (value->GetAsString(&result)) {
         DCHECK(result);
@@ -289,7 +289,7 @@
       std::string val;
       if (!ReadParam(m, iter, &val))
         return false;
-      *value = new base::StringValue(val);
+      *value = new base::Value(val);
       break;
     }
     case base::Value::Type::BINARY: {

diff --git a/ipc/ipc_message_utils_unittest.cc b/ipc/ipc_message_utils_unittest.cc
index dae8675..36b0dbd 100644
--- a/ipc/ipc_message_utils_unittest.cc
+++ b/ipc/ipc_message_utils_unittest.cc

@@ -99,7 +99,7 @@
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue);
   value->SetWithoutPathExpansion("foo", new base::Value(42));
   value->SetWithoutPathExpansion("bar", new base::Value(3.14));
-  value->SetWithoutPathExpansion("baz", new base::StringValue("hello"));
+  value->SetWithoutPathExpansion("baz", new base::Value("hello"));
   value->SetWithoutPathExpansion("qux", base::Value::CreateNullValue());
 
   std::unique_ptr<base::DictionaryValue> nested_dict(new base::DictionaryValue);

diff --git a/mojo/common/common_custom_types_unittest.cc b/mojo/common/common_custom_types_unittest.cc
index fe61a35cd..e3571d9 100644
--- a/mojo/common/common_custom_types_unittest.cc
+++ b/mojo/common/common_custom_types_unittest.cc

@@ -290,7 +290,7 @@
   ASSERT_TRUE(ptr->BounceValue(input->CreateDeepCopy(), &output));
   EXPECT_TRUE(base::Value::Equals(input.get(), output.get()));
 
-  input = base::MakeUnique<base::StringValue>("test string");
+  input = base::MakeUnique<base::Value>("test string");
   ASSERT_TRUE(ptr->BounceValue(input->CreateDeepCopy(), &output));
   EXPECT_TRUE(base::Value::Equals(input.get(), output.get()));
 

diff --git a/mojo/common/values_struct_traits.cc b/mojo/common/values_struct_traits.cc
index 9c5df7a..6af7a395 100644
--- a/mojo/common/values_struct_traits.cc
+++ b/mojo/common/values_struct_traits.cc

@@ -77,7 +77,7 @@
       base::StringPiece string_value;
       if (!data.ReadStringValue(&string_value))
         return false;
-      *value_out = base::MakeUnique<base::StringValue>(string_value);
+      *value_out = base::MakeUnique<base::Value>(string_value);
       return true;
     }
     case common::mojom::ValueDataView::Tag::BINARY_VALUE: {

diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc
index 5f82c28..fa4f7876 100644
--- a/net/http/transport_security_state.cc
+++ b/net/http/transport_security_state.cc

@@ -91,7 +91,7 @@
   std::vector<std::string> pem_encoded_chain;
   cert_chain->GetPEMEncodedChain(&pem_encoded_chain);
   for (const std::string& cert : pem_encoded_chain)
-    result->Append(base::MakeUnique<base::StringValue>(cert));
+    result->Append(base::MakeUnique<base::Value>(cert));
 
   return result;
 }
@@ -157,7 +157,7 @@
     known_pin += "\"" + base64_value + "\"";
 
     known_pin_list->Append(
-        std::unique_ptr<base::Value>(new base::StringValue(known_pin)));
+        std::unique_ptr<base::Value>(new base::Value(known_pin)));
   }
 
   report.Set("known-pins", std::move(known_pin_list));

diff --git a/net/log/file_net_log_observer_unittest.cc b/net/log/file_net_log_observer_unittest.cc
index 66c61c1..84dcc98 100644
--- a/net/log/file_net_log_observer_unittest.cc
+++ b/net/log/file_net_log_observer_unittest.cc

@@ -334,8 +334,7 @@
   TestClosure closure;
 
   const char kConstantString[] = "awesome constant";
-  std::unique_ptr<base::Value> constants(
-      new base::StringValue(kConstantString));
+  std::unique_ptr<base::Value> constants(new base::Value(kConstantString));
 
   CreateAndStartObserving(std::move(constants));
 

diff --git a/net/log/net_log_with_source.cc b/net/log/net_log_with_source.cc
index 8a03c8c..fc954ba 100644
--- a/net/log/net_log_with_source.cc
+++ b/net/log/net_log_with_source.cc

@@ -23,7 +23,7 @@
 // Returns parameters for logging data transferred events. At a minimum includes
 // the number of bytes transferred. If the capture mode allows logging byte
 // contents and |byte_count| > 0, then will include the actual bytes. The
-// bytes are hex-encoded, since base::StringValue only supports UTF-8.
+// bytes are hex-encoded, since base::Value only supports UTF-8.
 std::unique_ptr<base::Value> BytesTransferredCallback(
     int byte_count,
     const char* bytes,

diff --git a/net/log/write_to_file_net_log_observer_unittest.cc b/net/log/write_to_file_net_log_observer_unittest.cc
index 06c2065..1f07c0ee 100644
--- a/net/log/write_to_file_net_log_observer_unittest.cc
+++ b/net/log/write_to_file_net_log_observer_unittest.cc

@@ -152,8 +152,7 @@
 
 TEST_F(WriteToFileNetLogObserverTest, CustomConstants) {
   const char kConstantString[] = "awesome constant";
-  std::unique_ptr<base::Value> constants(
-      new base::StringValue(kConstantString));
+  std::unique_ptr<base::Value> constants(new base::Value(kConstantString));
   base::ScopedFILE file(base::OpenFile(log_path_, "w"));
   ASSERT_TRUE(file);
   std::unique_ptr<WriteToFileNetLogObserver> logger(

diff --git a/net/spdy/spdy_header_block.cc b/net/spdy/spdy_header_block.cc
index 2683a1ca..d3d1fe2 100644
--- a/net/spdy/spdy_header_block.cc
+++ b/net/spdy/spdy_header_block.cc

@@ -343,7 +343,7 @@
        it != headers->end(); ++it) {
     headers_dict->SetWithoutPathExpansion(
         it->first.as_string(),
-        new base::StringValue(ElideHeaderValueForNetLog(
+        new base::Value(ElideHeaderValueForNetLog(
             capture_mode, it->first.as_string(), it->second.as_string())));
   }
   dict->Set("headers", headers_dict);

diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index e856c55d..785319e 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc

@@ -3578,7 +3578,7 @@
   for (std::vector<std::string>::const_iterator it = expected.begin();
        it != expected.end();
        ++it) {
-    base::StringValue header(*it);
+    base::Value header(*it);
     EXPECT_NE(header_list->end(), header_list->Find(header)) <<
         "Header not found: " << *it;
   }

diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
index c3ffc07b..afc77f3 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc

@@ -84,18 +84,18 @@
     values->AppendString("aes128gcm");
 }
 
-base::StringValue* GetTLSIntoleranceType(
+base::Value* GetTLSIntoleranceType(
     BaseTestServer::SSLOptions::TLSIntoleranceType type) {
   switch (type) {
     case BaseTestServer::SSLOptions::TLS_INTOLERANCE_ALERT:
-      return new base::StringValue("alert");
+      return new base::Value("alert");
     case BaseTestServer::SSLOptions::TLS_INTOLERANCE_CLOSE:
-      return new base::StringValue("close");
+      return new base::Value("close");
     case BaseTestServer::SSLOptions::TLS_INTOLERANCE_RESET:
-      return new base::StringValue("reset");
+      return new base::Value("reset");
     default:
       NOTREACHED();
-      return new base::StringValue("");
+      return new base::Value("");
   }
 }
 

diff --git a/rlz/chromeos/lib/rlz_value_store_chromeos.cc b/rlz/chromeos/lib/rlz_value_store_chromeos.cc
index 84167aa..6c72bff 100644
--- a/rlz/chromeos/lib/rlz_value_store_chromeos.cc
+++ b/rlz/chromeos/lib/rlz_value_store_chromeos.cc

@@ -148,7 +148,7 @@
                                             const char* event_rlz) {
   DCHECK(CalledOnValidThread());
   return AddValueToList(GetKeyName(kProductEventKey, product),
-                        base::MakeUnique<base::StringValue>(event_rlz));
+                        base::MakeUnique<base::Value>(event_rlz));
 }
 
 bool RlzValueStoreChromeOS::ReadProductEvents(
@@ -170,7 +170,7 @@
 bool RlzValueStoreChromeOS::ClearProductEvent(Product product,
                                               const char* event_rlz) {
   DCHECK(CalledOnValidThread());
-  base::StringValue event_value(event_rlz);
+  base::Value event_value(event_rlz);
   return RemoveValueFromList(GetKeyName(kProductEventKey, product),
                              event_value);
 }
@@ -185,13 +185,13 @@
                                              const char* event_rlz) {
   DCHECK(CalledOnValidThread());
   return AddValueToList(GetKeyName(kStatefulEventKey, product),
-                        base::MakeUnique<base::StringValue>(event_rlz));
+                        base::MakeUnique<base::Value>(event_rlz));
 }
 
 bool RlzValueStoreChromeOS::IsStatefulEvent(Product product,
                                             const char* event_rlz) {
   DCHECK(CalledOnValidThread());
-  base::StringValue event_value(event_rlz);
+  base::Value event_value(event_rlz);
   base::ListValue* events_list = NULL;
   return rlz_store_->GetList(GetKeyName(kStatefulEventKey, product),
                              &events_list) &&

diff --git a/services/catalog/public/tools/catalog.cc.tmpl b/services/catalog/public/tools/catalog.cc.tmpl
index 2edab79..f905080 100644
--- a/services/catalog/public/tools/catalog.cc.tmpl
+++ b/services/catalog/public/tools/catalog.cc.tmpl

@@ -39,7 +39,7 @@
 {%-   elif source|is_bool -%}
 base::MakeUnique<base::Value>({{source|lower}})
 {%-   elif source|is_string or source|is_unicode -%}
-base::MakeUnique<base::StringValue>("{{source|make_ascii}}")
+base::MakeUnique<base::Value>("{{source|make_ascii}}")
 {%-   else %}
 {{raise("Unknown value type: %s" % source, source)}}
 {%-   endif %}

diff --git a/services/preferences/public/cpp/tests/pref_client_store_unittest.cc b/services/preferences/public/cpp/tests/pref_client_store_unittest.cc
index ac21660c..a044b03 100644
--- a/services/preferences/public/cpp/tests/pref_client_store_unittest.cc
+++ b/services/preferences/public/cpp/tests/pref_client_store_unittest.cc

@@ -210,7 +210,7 @@
   const int kValue = 42;
   base::Value pref1(kValue);
   const std::string kStringValue("look");
-  base::StringValue pref2(kStringValue);
+  base::Value pref2(kStringValue);
 
   base::DictionaryValue prefs;
   prefs.Set(key1, pref1.CreateDeepCopy());

diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 35dc6e2..c262cbb 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn

@@ -390,7 +390,7 @@
     deps += [
       "//third_party/android_tools:cpu_features",
       "//third_party/expat",
-      "//third_party/freetype-android:freetype",
+      "//third_party/freetype",
     ]
   }
 

diff --git a/skia/ext/benchmarking_canvas.cc b/skia/ext/benchmarking_canvas.cc
index 60a47a8..bcd1043 100644
--- a/skia/ext/benchmarking_canvas.cc
+++ b/skia/ext/benchmarking_canvas.cc

@@ -117,8 +117,7 @@
 }
 
 std::unique_ptr<base::Value> AsValue(SkBlendMode mode) {
-  std::unique_ptr<base::StringValue> val(
-      new base::StringValue(SkBlendMode_Name(mode)));
+  std::unique_ptr<base::Value> val(new base::Value(SkBlendMode_Name(mode)));
 
   return val;
 }
@@ -127,8 +126,7 @@
   static const char* gModeStrings[] = { "Points", "Lines", "Polygon" };
   DCHECK_LT(static_cast<size_t>(mode), SK_ARRAY_COUNT(gModeStrings));
 
-  std::unique_ptr<base::StringValue> val(
-      new base::StringValue(gModeStrings[mode]));
+  std::unique_ptr<base::Value> val(new base::Value(gModeStrings[mode]));
 
   return val;
 }
@@ -256,7 +254,7 @@
   builder.addFlag(flags & SkCanvas::kPreserveLCDText_SaveLayerFlag,
                   "kPreserveLCDText");
 
-  std::unique_ptr<base::StringValue> val(new base::StringValue(builder.str()));
+  std::unique_ptr<base::Value> val(new base::Value(builder.str()));
 
   return val;
 }
@@ -271,8 +269,7 @@
                                     };
   size_t index = static_cast<size_t>(op);
   DCHECK_LT(index, SK_ARRAY_COUNT(gOpStrings));
-  std::unique_ptr<base::StringValue> val(
-      new base::StringValue(gOpStrings[index]));
+  std::unique_ptr<base::Value> val(new base::Value(gOpStrings[index]));
   return val;
 }
 

diff --git a/testing/android/junit/java/src/org/chromium/testing/local/AnnotationProcessor.java b/testing/android/junit/java/src/org/chromium/testing/local/AnnotationProcessor.java
index 86ac990..8b60b1a 100644
--- a/testing/android/junit/java/src/org/chromium/testing/local/AnnotationProcessor.java
+++ b/testing/android/junit/java/src/org/chromium/testing/local/AnnotationProcessor.java

@@ -47,7 +47,7 @@
     @Override
     public Statement apply(Statement base, Description description) {
         mTestDescription = description;
-        mAnnotation = description.getAnnotation(mAnnotationClass);
+        mAnnotation = getAnnotation(description);
         if (mAnnotation == null) return base;
 
         // Return the wrapped statement to execute before() and after().
@@ -63,4 +63,12 @@
     protected T getAnnotation() {
         return mAnnotation;
     }
+
+    private T getAnnotation(Description description) {
+        T annotation = description.getAnnotation(mAnnotationClass);
+        if (annotation != null) return annotation;
+
+        annotation = description.getTestClass().getAnnotation(mAnnotationClass);
+        return annotation;
+    }
 }

diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index 58a4665..ababfc5 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations

@@ -1613,15 +1613,6 @@
 
 crbug.com/596752 virtual/threaded/inspector/tracing/decode-resize.html [ Pass Failure ]
 
-crbug.com/610300 css3/fonts/font-style-matching-0.html [ Failure Pass ]
-crbug.com/610300 css3/fonts/font-style-matching-1.html [ Failure Pass ]
-crbug.com/610300 css3/fonts/font-style-matching-2.html [ Failure Pass ]
-crbug.com/610300 css3/fonts/font-style-matching-3.html [ Failure Pass ]
-crbug.com/610300 css3/fonts/font-style-matching-4.html [ Failure Pass ]
-crbug.com/610300 css3/fonts/font-style-matching-5.html [ Failure Pass ]
-crbug.com/610300 css3/fonts/font-style-matching-6.html [ Failure Pass ]
-crbug.com/610300 css3/fonts/font-style-matching-7.html [ Failure Pass ]
-crbug.com/610300 css3/fonts/font-style-matching-8.html [ Failure Pass ]
 crbug.com/524646 [ Mac10.10 ] fast/dom/shadow/shadowdom-for-button.html [ Failure ]
 
 crbug.com/538717 [ Win Mac Linux ] http/tests/permissions/chromium/test-request-multiple-window.html [ Failure Pass Timeout ]

diff --git a/third_party/WebKit/LayoutTests/fast/css/fontfaceset-ready.html b/third_party/WebKit/LayoutTests/fast/css/fontfaceset-ready.html
index c55b7f3..479f677 100644
--- a/third_party/WebKit/LayoutTests/fast/css/fontfaceset-ready.html
+++ b/third_party/WebKit/LayoutTests/fast/css/fontfaceset-ready.html

@@ -2,6 +2,7 @@
 <title>FontFaceSet.ready attribute</title>
 <script src="../../resources/testharness.js"></script>
 <script src="../../resources/testharnessreport.js"></script>
+<div style="font-family: ahem">A</div>
 <script>
 
 promise_test(function(t) {
@@ -36,4 +37,16 @@
         });
 }, 'FontFaceSet.ready attribute');
 
+promise_test(function(t) {
+    var face = new FontFace('ahem', 'url(../../resources/Ahem.ttf)');
+
+    return document.fonts.ready
+        .then(function(fonts) {
+            document.fonts.add(face);
+            return document.fonts.ready;
+        }).then(function(fonts) {
+            assert_equals(face.status, 'loaded');
+        });
+}, 'FontFaceSet.ready should be resolved after layout operations which may cause font loads.');
+
 </script>

diff --git a/third_party/WebKit/LayoutTests/fast/dom/MutationObserver/observe-gc.html b/third_party/WebKit/LayoutTests/fast/dom/MutationObserver/observe-gc.html
new file mode 100644
index 0000000..ab0b0b4a
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/dom/MutationObserver/observe-gc.html

@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<script src="../../../resources/gc.js"></script>
+<script src='../../../resources/testharness.js'></script>
+<script src='../../../resources/testharnessreport.js'></script>
+<script>
+
+// All the following tests make sure that the observer callback is called even
+// if there are no references to the nodes and a garbage collection kicks in
+// before returning to the event loop.
+
+async_test(function(t) {
+
+    (function simple() {
+        var d = document.createElement('div');
+        var c = document.createElement('div');
+        var obs = new MutationObserver(t.step_func_done(function() {}));
+        obs.observe(d, {childList: true});
+        d.appendChild(c);
+    })();
+    gc();
+}, "Tests that pending callbacks retain the nodes even in the presence of garbage collection");
+
+async_test(function(t) {
+    (function addedChildNodes() {
+        var d = document.createElement('div');
+        var c = document.createElement('div');
+        c.expando = "c";
+        var obs = new MutationObserver(t.step_func_done(function(records) {
+            assert_equals(1, records[0].addedNodes.length, "one node added");
+            assert_equals("c", records[0].addedNodes[0].expando, "expando preserved");
+        }));
+        obs.observe(d, {childList: true});
+        d.appendChild(c);
+    })();
+    gc();
+}, "Tests that pending callbacks retain the nodes even in the presence of garbage collection");
+
+async_test(function(t) {
+    (function siblings() {
+        var d = document.createElement('div');
+        var b = document.createElement('b');
+        var i = document.createElement('i');
+        var p = document.createElement('p');
+        d.appendChild(b);
+        d.appendChild(i);
+        d.appendChild(p);
+        b.expando = "hello";
+        p.expando = "goodbye";
+
+        var obs = new MutationObserver(t.step_func_done(function(records) {
+            assert_equals(3, records.length, "number of records");
+            assert_equals("hello", records[0].previousSibling.expando, "expando preserved");
+            assert_equals("goodbye", records[0].nextSibling.expando, "expando preserved");
+        }));
+        obs.observe(d, {childList: true});
+        d = null;
+        i.remove();
+        i = null;
+        b.remove();
+        b = null;
+        p.remove();
+        p = null;
+    })();
+    gc();
+}, "Tests that pending callbacks retain the nodes even in the presence of garbage collection");
+
+</script>
\ No newline at end of file

diff --git a/third_party/WebKit/LayoutTests/fast/dom/MutationObserver/weak-callback-gc-crash-expected.txt b/third_party/WebKit/LayoutTests/fast/dom/MutationObserver/weak-callback-gc-crash-expected.txt
index 0d88634..2634613 100644
--- a/third_party/WebKit/LayoutTests/fast/dom/MutationObserver/weak-callback-gc-crash-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/dom/MutationObserver/weak-callback-gc-crash-expected.txt

@@ -1 +1,2 @@
+CONSOLE MESSAGE: line 13: MutationObserver callback
 Test passes if it does not crash

diff --git a/third_party/WebKit/LayoutTests/fast/dom/MutationObserver/weak-callback-gc-crash.html b/third_party/WebKit/LayoutTests/fast/dom/MutationObserver/weak-callback-gc-crash.html
index fb8d2b3..673bbc8 100644
--- a/third_party/WebKit/LayoutTests/fast/dom/MutationObserver/weak-callback-gc-crash.html
+++ b/third_party/WebKit/LayoutTests/fast/dom/MutationObserver/weak-callback-gc-crash.html

@@ -10,7 +10,7 @@
 
 function initializeObserver() {
     observer = new MutationObserver(
-                   function() {console.log('Should not appear')});
+                   function() {console.log('MutationObserver callback')});
     div = document.createElement('div');
     observer.observe(div, {attributes: true});
     div.id = 'foo';

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/first-line-with-first-letter-expected.html b/third_party/WebKit/LayoutTests/paint/invalidation/first-line-with-first-letter-expected.html
new file mode 100644
index 0000000..7389da8de
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/first-line-with-first-letter-expected.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<style>
+  div::first-letter { color: white }
+  div::first-line { background: green }
+</style>
+<div>
+  First letter should be white, and the first line should have a green
+  background.
+</div>

diff --git a/third_party/WebKit/LayoutTests/paint/invalidation/first-line-with-first-letter.html b/third_party/WebKit/LayoutTests/paint/invalidation/first-line-with-first-letter.html
new file mode 100644
index 0000000..5d46894
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/paint/invalidation/first-line-with-first-letter.html

@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<style>
+  #t1::first-letter { color: white }
+  #t1::first-line { background: red }
+  #t1.green::first-line { background: green }
+</style>
+<div id="t1">
+  First letter should be white, and the first line should have a green
+  background.
+</div>
+<script>
+  if (window.testRunner)
+    testRunner.waitUntilDone();
+
+  requestAnimationFrame(() =>
+    requestAnimationFrame(() => {
+      t1.className = "green";
+      if (window.testRunner)
+        testRunner.notifyDone();
+    }));
+</script>

diff --git a/third_party/WebKit/Source/bindings/core/v8/V8MutationCallback.cpp b/third_party/WebKit/Source/bindings/core/v8/V8MutationCallback.cpp
index 61c0d76..ef5563b 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8MutationCallback.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/V8MutationCallback.cpp

@@ -39,10 +39,10 @@
 V8MutationCallback::V8MutationCallback(v8::Local<v8::Function> callback,
                                        v8::Local<v8::Object> owner,
                                        ScriptState* scriptState)
-    : m_callback(scriptState->isolate(), callback), m_scriptState(scriptState) {
+    : m_callback(scriptState->isolate(), this, callback),
+      m_scriptState(scriptState) {
   V8PrivateProperty::getMutationObserverCallback(scriptState->isolate())
       .set(scriptState->context(), owner, callback);
-  m_callback.setPhantom();
 }
 
 V8MutationCallback::~V8MutationCallback() {}
@@ -85,4 +85,9 @@
   MutationCallback::trace(visitor);
 }
 
+DEFINE_TRACE_WRAPPERS(V8MutationCallback) {
+  visitor->traceWrappers(m_callback.cast<v8::Value>());
+  MutationCallback::traceWrappers(visitor);
+}
+
 }  // namespace blink

diff --git a/third_party/WebKit/Source/bindings/core/v8/V8MutationCallback.h b/third_party/WebKit/Source/bindings/core/v8/V8MutationCallback.h
index ebbf26c..8bee001 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8MutationCallback.h
+++ b/third_party/WebKit/Source/bindings/core/v8/V8MutationCallback.h

@@ -28,6 +28,7 @@
 
 #include "bindings/core/v8/ScopedPersistent.h"
 #include "bindings/core/v8/ScriptState.h"
+#include "bindings/core/v8/TraceWrapperV8Reference.h"
 #include "core/dom/MutationCallback.h"
 #include "v8/include/v8.h"
 #include "wtf/RefPtr.h"
@@ -53,13 +54,14 @@
   }
 
   DECLARE_VIRTUAL_TRACE();
+  DECLARE_VIRTUAL_TRACE_WRAPPERS();
 
  private:
   V8MutationCallback(v8::Local<v8::Function>,
                      v8::Local<v8::Object>,
                      ScriptState*);
 
-  ScopedPersistent<v8::Function> m_callback;
+  TraceWrapperV8Reference<v8::Function> m_callback;
   RefPtr<ScriptState> m_scriptState;
 };
 

diff --git a/third_party/WebKit/Source/core/css/FontFaceSet.cpp b/third_party/WebKit/Source/core/css/FontFaceSet.cpp
index a7e2c3a..00ecea4a 100644
--- a/third_party/WebKit/Source/core/css/FontFaceSet.cpp
+++ b/third_party/WebKit/Source/core/css/FontFaceSet.cpp

@@ -243,6 +243,13 @@
 }
 
 ScriptPromise FontFaceSet::ready(ScriptState* scriptState) {
+  if (m_ready->getState() != ReadyProperty::Pending) {
+    // |m_ready| is already resolved, but there may be pending stylesheet
+    // changes and/or layout operations that may cause another font loads.
+    // So synchronously update style and layout here.
+    // This may trigger font loads, and replace |m_ready| with a new Promise.
+    document()->updateStyleAndLayout();
+  }
   return m_ready->promise(scriptState->world());
 }
 

diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
index cc1d397a..f33de88 100644
--- a/third_party/WebKit/Source/core/dom/Element.cpp
+++ b/third_party/WebKit/Source/core/dom/Element.cpp

@@ -1808,30 +1808,32 @@
   DCHECK(needsAttach());
 }
 
-bool Element::pseudoStyleCacheIsInvalid(const ComputedStyle* currentStyle,
+void Element::pseudoStyleCacheIsInvalid(const ComputedStyle* currentStyle,
                                         ComputedStyle* newStyle) {
+  // TODO(rune@opera.com): This method does not take into account pseudo style
+  // which is only present for the newStyle. Also the first-line part should
+  // probably be moved to where we handle visual invalidation diff for setStyle.
+  // setHasPseudoStyle() calls are probably unnecessary.
   DCHECK_EQ(currentStyle, computedStyle());
   DCHECK(layoutObject());
 
   if (!currentStyle)
-    return false;
+    return;
 
   const PseudoStyleCache* pseudoStyleCache = currentStyle->cachedPseudoStyles();
   if (!pseudoStyleCache)
-    return false;
+    return;
 
   size_t cacheSize = pseudoStyleCache->size();
   for (size_t i = 0; i < cacheSize; ++i) {
     RefPtr<ComputedStyle> newPseudoStyle;
     RefPtr<ComputedStyle> oldPseudoStyle = pseudoStyleCache->at(i);
     PseudoId pseudoId = oldPseudoStyle->styleType();
-    if (pseudoId == PseudoIdFirstLine || pseudoId == PseudoIdFirstLineInherited)
-      newPseudoStyle = layoutObject()->uncachedFirstLineStyle(newStyle);
-    else
-      newPseudoStyle = layoutObject()->getUncachedPseudoStyle(
-          PseudoStyleRequest(pseudoId), newStyle, newStyle);
+    if (pseudoId != PseudoIdFirstLine && pseudoId != PseudoIdFirstLineInherited)
+      continue;
+    newPseudoStyle = layoutObject()->uncachedFirstLineStyle(newStyle);
     if (!newPseudoStyle)
-      return true;
+      continue;
     if (*oldPseudoStyle != *newPseudoStyle ||
         oldPseudoStyle->font().loadingCustomFonts() !=
             newPseudoStyle->font().loadingCustomFonts()) {
@@ -1839,13 +1841,12 @@
         newStyle->setHasPseudoStyle(pseudoId);
       newStyle->addCachedPseudoStyle(newPseudoStyle);
       if (pseudoId == PseudoIdFirstLine ||
-          pseudoId == PseudoIdFirstLineInherited)
+          pseudoId == PseudoIdFirstLineInherited) {
         layoutObject()->firstLineStyleDidChange(*oldPseudoStyle,
                                                 *newPseudoStyle);
-      return true;
+      }
     }
   }
-  return false;
 }
 
 PassRefPtr<ComputedStyle> Element::styleForLayoutObject() {
@@ -2034,8 +2035,8 @@
     updateCallbackSelectors(oldStyle.get(), newStyle.get());
 
   if (LayoutObject* layoutObject = this->layoutObject()) {
-    if (localChange != NoChange ||
-        pseudoStyleCacheIsInvalid(oldStyle.get(), newStyle.get())) {
+    if (localChange != NoChange) {
+      pseudoStyleCacheIsInvalid(oldStyle.get(), newStyle.get());
       layoutObject->setStyle(newStyle.get());
     } else {
       // Although no change occurred, we use the new style so that the cousin

diff --git a/third_party/WebKit/Source/core/dom/Element.h b/third_party/WebKit/Source/core/dom/Element.h
index 4e02a99..21a3f70 100644
--- a/third_party/WebKit/Source/core/dom/Element.h
+++ b/third_party/WebKit/Source/core/dom/Element.h

@@ -903,7 +903,7 @@
                                              const AtomicString&,
                                              AttributeModificationReason);
 
-  bool pseudoStyleCacheIsInvalid(const ComputedStyle* currentStyle,
+  void pseudoStyleCacheIsInvalid(const ComputedStyle* currentStyle,
                                  ComputedStyle* newStyle);
 
   void cancelFocusAppearanceUpdate();

diff --git a/third_party/WebKit/Source/core/dom/MutationCallback.h b/third_party/WebKit/Source/core/dom/MutationCallback.h
index 4a17f1a..469435b 100644
--- a/third_party/WebKit/Source/core/dom/MutationCallback.h
+++ b/third_party/WebKit/Source/core/dom/MutationCallback.h

@@ -40,7 +40,8 @@
 class MutationRecord;
 class MutationObserver;
 
-class MutationCallback : public GarbageCollectedFinalized<MutationCallback> {
+class MutationCallback : public GarbageCollectedFinalized<MutationCallback>,
+                         public TraceWrapperBase {
  public:
   virtual ~MutationCallback() {}
 

diff --git a/third_party/WebKit/Source/core/dom/MutationObserver.cpp b/third_party/WebKit/Source/core/dom/MutationObserver.cpp
index 6d06700..93fa739 100644
--- a/third_party/WebKit/Source/core/dom/MutationObserver.cpp
+++ b/third_party/WebKit/Source/core/dom/MutationObserver.cpp

@@ -58,7 +58,7 @@
 }
 
 MutationObserver::MutationObserver(MutationCallback* callback)
-    : m_callback(callback), m_priority(s_observerPriority++) {}
+    : m_callback(this, callback), m_priority(s_observerPriority++) {}
 
 MutationObserver::~MutationObserver() {
   cancelInspectorAsyncTasks();
@@ -137,7 +137,7 @@
 MutationRecordVector MutationObserver::takeRecords() {
   MutationRecordVector records;
   cancelInspectorAsyncTasks();
-  records.swap(m_records);
+  swap(m_records, records, this);
   return records;
 }
 
@@ -216,7 +216,7 @@
 
 void MutationObserver::enqueueMutationRecord(MutationRecord* mutation) {
   DCHECK(isMainThread());
-  m_records.push_back(mutation);
+  m_records.push_back(TraceWrapperMember<MutationRecord>(this, mutation));
   activateObserver(this);
   probe::asyncTaskScheduled(m_callback->getExecutionContext(), mutation->type(),
                             mutation);
@@ -262,7 +262,7 @@
     return;
 
   MutationRecordVector records;
-  records.swap(m_records);
+  swap(m_records, records, this);
 
   // Report the first (earliest) stack as the async cause.
   probe::AsyncTask asyncTask(m_callback->getExecutionContext(),
@@ -310,10 +310,21 @@
     slot->dispatchSlotChangeEvent();
 }
 
+ExecutionContext* MutationObserver::getExecutionContext() const {
+  return m_callback->getExecutionContext();
+}
+
 DEFINE_TRACE(MutationObserver) {
   visitor->trace(m_callback);
   visitor->trace(m_records);
   visitor->trace(m_registrations);
+  visitor->trace(m_callback);
+}
+
+DEFINE_TRACE_WRAPPERS(MutationObserver) {
+  visitor->traceWrappers(m_callback);
+  for (auto record : m_records)
+    visitor->traceWrappers(record);
 }
 
 }  // namespace blink

diff --git a/third_party/WebKit/Source/core/dom/MutationObserver.h b/third_party/WebKit/Source/core/dom/MutationObserver.h
index 7c7e8c2..7e11de2 100644
--- a/third_party/WebKit/Source/core/dom/MutationObserver.h
+++ b/third_party/WebKit/Source/core/dom/MutationObserver.h

@@ -33,7 +33,9 @@
 
 #include "base/gtest_prod_util.h"
 #include "bindings/core/v8/ScriptWrappable.h"
+#include "bindings/core/v8/TraceWrapperMember.h"
 #include "core/CoreExport.h"
+#include "core/dom/ExecutionContext.h"
 #include "platform/heap/Handle.h"
 #include "wtf/HashSet.h"
 #include "wtf/Vector.h"
@@ -61,8 +63,10 @@
 
 class CORE_EXPORT MutationObserver final
     : public GarbageCollectedFinalized<MutationObserver>,
+      public ActiveScriptWrappable<MutationObserver>,
       public ScriptWrappable {
   DEFINE_WRAPPERTYPEINFO();
+  USING_GARBAGE_COLLECTED_MIXIN(MutationObserver);
 
  public:
   enum MutationType {
@@ -98,10 +102,15 @@
 
   HeapHashSet<Member<Node>> getObservedNodes() const;
 
+  bool hasPendingActivity() const override { return !m_records.isEmpty(); }
+  ExecutionContext* getExecutionContext() const;
+
   // Eagerly finalized as destructor accesses heap object members.
   EAGERLY_FINALIZE();
   DECLARE_TRACE();
 
+  DECLARE_VIRTUAL_TRACE_WRAPPERS();
+
  private:
   struct ObserverLessThan;
 
@@ -110,8 +119,8 @@
   bool shouldBeSuspended() const;
   void cancelInspectorAsyncTasks();
 
-  Member<MutationCallback> m_callback;
-  MutationRecordVector m_records;
+  TraceWrapperMember<MutationCallback> m_callback;
+  HeapVector<TraceWrapperMember<MutationRecord>> m_records;
   MutationObserverRegistrationSet m_registrations;
   unsigned m_priority;
 

diff --git a/third_party/WebKit/Source/core/dom/MutationObserver.idl b/third_party/WebKit/Source/core/dom/MutationObserver.idl
index 53231f7..b199a17 100644
--- a/third_party/WebKit/Source/core/dom/MutationObserver.idl
+++ b/third_party/WebKit/Source/core/dom/MutationObserver.idl

@@ -32,6 +32,7 @@
 
 [
     CustomConstructor(MutationCallback callback),
+    ActiveScriptWrappable,
     DependentLifetime,
 ] interface MutationObserver {
     [RaisesException] void observe(Node target, optional MutationObserverInit options);

diff --git a/third_party/WebKit/Source/core/dom/MutationRecord.cpp b/third_party/WebKit/Source/core/dom/MutationRecord.cpp
index 37eeb31..2c52bede 100644
--- a/third_party/WebKit/Source/core/dom/MutationRecord.cpp
+++ b/third_party/WebKit/Source/core/dom/MutationRecord.cpp

@@ -47,9 +47,9 @@
                   StaticNodeList* removed,
                   Node* previousSibling,
                   Node* nextSibling)
-      : m_target(target),
-        m_addedNodes(added),
-        m_removedNodes(removed),
+      : m_target(this, target),
+        m_addedNodes(this, added),
+        m_removedNodes(this, removed),
         m_previousSibling(previousSibling),
         m_nextSibling(nextSibling) {}
 
@@ -62,6 +62,13 @@
     MutationRecord::trace(visitor);
   }
 
+  DEFINE_INLINE_VIRTUAL_TRACE_WRAPPERS() {
+    visitor->traceWrappers(m_target);
+    visitor->traceWrappers(m_addedNodes);
+    visitor->traceWrappers(m_removedNodes);
+    MutationRecord::traceWrappers(visitor);
+  }
+
  private:
   const AtomicString& type() override;
   Node* target() override { return m_target.get(); }
@@ -70,9 +77,9 @@
   Node* previousSibling() override { return m_previousSibling.get(); }
   Node* nextSibling() override { return m_nextSibling.get(); }
 
-  Member<Node> m_target;
-  Member<StaticNodeList> m_addedNodes;
-  Member<StaticNodeList> m_removedNodes;
+  TraceWrapperMember<Node> m_target;
+  TraceWrapperMember<StaticNodeList> m_addedNodes;
+  TraceWrapperMember<StaticNodeList> m_removedNodes;
   Member<Node> m_previousSibling;
   Member<Node> m_nextSibling;
 };
@@ -80,7 +87,10 @@
 class RecordWithEmptyNodeLists : public MutationRecord {
  public:
   RecordWithEmptyNodeLists(Node* target, const String& oldValue)
-      : m_target(target), m_oldValue(oldValue) {}
+      : m_target(this, target),
+        m_oldValue(oldValue),
+        m_addedNodes(this, nullptr),
+        m_removedNodes(this, nullptr) {}
 
   DEFINE_INLINE_VIRTUAL_TRACE() {
     visitor->trace(m_target);
@@ -89,6 +99,13 @@
     MutationRecord::trace(visitor);
   }
 
+  DEFINE_INLINE_VIRTUAL_TRACE_WRAPPERS() {
+    visitor->traceWrappers(m_target);
+    visitor->traceWrappers(m_addedNodes);
+    visitor->traceWrappers(m_removedNodes);
+    MutationRecord::traceWrappers(visitor);
+  }
+
  private:
   Node* target() override { return m_target.get(); }
   String oldValue() override { return m_oldValue; }
@@ -106,10 +123,10 @@
     return nodeList.get();
   }
 
-  Member<Node> m_target;
+  TraceWrapperMember<Node> m_target;
   String m_oldValue;
-  Member<StaticNodeList> m_addedNodes;
-  Member<StaticNodeList> m_removedNodes;
+  TraceWrapperMember<StaticNodeList> m_addedNodes;
+  TraceWrapperMember<StaticNodeList> m_removedNodes;
 };
 
 class AttributesRecord : public RecordWithEmptyNodeLists {
@@ -143,13 +160,19 @@
 
 class MutationRecordWithNullOldValue : public MutationRecord {
  public:
-  MutationRecordWithNullOldValue(MutationRecord* record) : m_record(record) {}
+  MutationRecordWithNullOldValue(MutationRecord* record)
+      : m_record(this, record) {}
 
   DEFINE_INLINE_VIRTUAL_TRACE() {
     visitor->trace(m_record);
     MutationRecord::trace(visitor);
   }
 
+  DEFINE_INLINE_VIRTUAL_TRACE_WRAPPERS() {
+    visitor->traceWrappers(m_record);
+    MutationRecord::traceWrappers(visitor);
+  }
+
  private:
   const AtomicString& type() override { return m_record->type(); }
   Node* target() override { return m_record->target(); }
@@ -166,7 +189,7 @@
 
   String oldValue() override { return String(); }
 
-  Member<MutationRecord> m_record;
+  TraceWrapperMember<MutationRecord> m_record;
 };
 
 const AtomicString& ChildListRecord::type() {

diff --git a/third_party/WebKit/Source/core/dom/StaticNodeList.h b/third_party/WebKit/Source/core/dom/StaticNodeList.h
index 7df9827..c03504b 100644
--- a/third_party/WebKit/Source/core/dom/StaticNodeList.h
+++ b/third_party/WebKit/Source/core/dom/StaticNodeList.h

@@ -29,6 +29,7 @@
 #ifndef StaticNodeList_h
 #define StaticNodeList_h
 
+#include "bindings/core/v8/TraceWrapperMember.h"
 #include "core/dom/NodeList.h"
 #include "wtf/Vector.h"
 
@@ -49,9 +50,14 @@
   NodeType* item(unsigned index) const override;
 
   DECLARE_VIRTUAL_TRACE();
+  DEFINE_INLINE_VIRTUAL_TRACE_WRAPPERS() {
+    for (unsigned i = 0; i < length(); i++)
+      visitor->traceWrappers(m_nodes[i]);
+    NodeList::traceWrappers(visitor);
+  }
 
  private:
-  HeapVector<Member<NodeType>> m_nodes;
+  HeapVector<TraceWrapperMember<NodeType>> m_nodes;
 };
 
 using StaticNodeList = StaticNodeTypeList<Node>;
@@ -60,7 +66,7 @@
 StaticNodeTypeList<NodeType>* StaticNodeTypeList<NodeType>::adopt(
     HeapVector<Member<NodeType>>& nodes) {
   StaticNodeTypeList<NodeType>* nodeList = new StaticNodeTypeList<NodeType>;
-  nodeList->m_nodes.swap(nodes);
+  swap(nodeList->m_nodes, nodes, nodeList);
   return nodeList;
 }
 

diff --git a/third_party/WebKit/Source/core/paint/BackgroundImageGeometry.cpp b/third_party/WebKit/Source/core/paint/BackgroundImageGeometry.cpp
index c6c2fb0..d9c2b1b 100644
--- a/third_party/WebKit/Source/core/paint/BackgroundImageGeometry.cpp
+++ b/third_party/WebKit/Source/core/paint/BackgroundImageGeometry.cpp

@@ -411,7 +411,7 @@
     const LayoutRect& paintRect) {
   LayoutUnit left;
   LayoutUnit top;
-  LayoutSize positioningAreaSize;
+  LayoutRect positioningArea;
   bool isLayoutView = obj.isLayoutView();
   const LayoutBox* rootBox = nullptr;
   if (isLayoutView) {
@@ -473,8 +473,9 @@
       // The background of the box generated by the root element covers the
       // entire canvas and will be painted by the view object, but the we should
       // still use the root element box for positioning.
-      positioningAreaSize =
-          rootBox->size() - LayoutSize(left + right, top + bottom);
+      positioningArea.setSize(rootBox->size());
+      positioningArea.contractEdges(top, right, bottom, left);
+
       // The input paint rect is specified in root element local coordinate
       // (i.e. a transform is applied on the context for painting), and is
       // expanded to cover the whole canvas.  Since left/top is relative to the
@@ -482,12 +483,14 @@
       left -= paintRect.x();
       top -= paintRect.y();
     } else {
-      positioningAreaSize =
-          (cellUsingContainerBackground
-               ? getBackgroundObjectDimensions(toLayoutTableCell(obj),
-                                               toLayoutBox(positioningBox))
-               : paintRect.size()) -
-          LayoutSize(left + right, top + bottom);
+      if (cellUsingContainerBackground) {
+        positioningArea.setSize(getBackgroundObjectDimensions(
+            toLayoutTableCell(obj), toLayoutBox(positioningBox)));
+      } else {
+        positioningArea = paintRect;
+      }
+
+      positioningArea.contractEdges(top, right, bottom, left);
     }
   } else {
     setHasNonLocalGeometry();
@@ -509,11 +512,11 @@
           LayoutPoint(-paintContainer->localToAbsolute(FloatPoint())));
 
     setDestRect(viewportRect);
-    positioningAreaSize = destRect().size();
+    positioningArea = viewportRect;
   }
 
   LayoutSize fillTileSize(
-      calculateFillTileSize(positioningBox, fillLayer, positioningAreaSize));
+      calculateFillTileSize(positioningBox, fillLayer, positioningArea.size()));
   // It's necessary to apply the heuristic here prior to any further
   // calculations to avoid incorrectly using sub-pixel values that won't be
   // present in the painted tile.
@@ -522,12 +525,12 @@
   EFillRepeat backgroundRepeatX = fillLayer.repeatX();
   EFillRepeat backgroundRepeatY = fillLayer.repeatY();
   LayoutUnit unsnappedAvailableWidth =
-      positioningAreaSize.width() - fillTileSize.width();
+      positioningArea.width() - fillTileSize.width();
   LayoutUnit unsnappedAvailableHeight =
-      positioningAreaSize.height() - fillTileSize.height();
-  positioningAreaSize =
-      LayoutSize(snapSizeToPixel(positioningAreaSize.width(), m_destRect.x()),
-                 snapSizeToPixel(positioningAreaSize.height(), m_destRect.y()));
+      positioningArea.height() - fillTileSize.height();
+  LayoutSize positioningAreaSize =
+      LayoutSize(snapSizeToPixel(positioningArea.width(), m_destRect.x()),
+                 snapSizeToPixel(positioningArea.height(), m_destRect.y()));
   LayoutUnit availableWidth = positioningAreaSize.width() - tileSize().width();
   LayoutUnit availableHeight =
       positioningAreaSize.height() - tileSize().height();

diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
index 340e8b6..ed8e7e1 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h

@@ -3790,19 +3790,20 @@
 }
 
 inline bool ComputedStyle::hasAnyPublicPseudoStyles() const {
-  return PublicPseudoIdMask & m_nonInheritedData.m_pseudoBits;
+  return m_nonInheritedData.m_pseudoBits;
 }
 
 inline bool ComputedStyle::hasPseudoStyle(PseudoId pseudo) const {
-  ASSERT(pseudo > PseudoIdNone);
-  ASSERT(pseudo < FirstInternalPseudoId);
-  return (1 << (pseudo - 1)) & m_nonInheritedData.m_pseudoBits;
+  DCHECK(pseudo >= FirstPublicPseudoId);
+  DCHECK(pseudo < FirstInternalPseudoId);
+  return (1 << (pseudo - FirstPublicPseudoId)) &
+         m_nonInheritedData.m_pseudoBits;
 }
 
 inline void ComputedStyle::setHasPseudoStyle(PseudoId pseudo) {
-  ASSERT(pseudo > PseudoIdNone);
-  ASSERT(pseudo < FirstInternalPseudoId);
-  m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - 1);
+  DCHECK(pseudo >= FirstPublicPseudoId);
+  DCHECK(pseudo < FirstInternalPseudoId);
+  m_nonInheritedData.m_pseudoBits |= 1 << (pseudo - FirstPublicPseudoId);
 }
 
 inline bool ComputedStyle::hasPseudoElementStyle() const {

diff --git a/third_party/WebKit/Source/core/style/ComputedStyleConstants.h b/third_party/WebKit/Source/core/style/ComputedStyleConstants.h
index 1840c76..1175eed8 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyleConstants.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyleConstants.h

@@ -81,11 +81,9 @@
   AfterLastInternalPseudoId,
   FirstPublicPseudoId = PseudoIdFirstLine,
   FirstInternalPseudoId = PseudoIdScrollbarThumb,
-  PublicPseudoIdMask =
-      ((1 << FirstInternalPseudoId) - 1) & ~((1 << FirstPublicPseudoId) - 1),
-  ElementPseudoIdMask = (1 << (PseudoIdBefore - 1)) |
-                        (1 << (PseudoIdAfter - 1)) |
-                        (1 << (PseudoIdBackdrop - 1))
+  ElementPseudoIdMask = (1 << (PseudoIdBefore - FirstPublicPseudoId)) |
+                        (1 << (PseudoIdAfter - FirstPublicPseudoId)) |
+                        (1 << (PseudoIdBackdrop - FirstPublicPseudoId))
 };
 
 enum ColumnFill { ColumnFillBalance, ColumnFillAuto };

diff --git a/third_party/WebKit/Source/core/style/ComputedStyleTest.cpp b/third_party/WebKit/Source/core/style/ComputedStyleTest.cpp
index f3f588b5..7c8f3c6 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyleTest.cpp
+++ b/third_party/WebKit/Source/core/style/ComputedStyleTest.cpp

@@ -78,4 +78,18 @@
   EXPECT_TRUE(style->isStackingContext());
 }
 
+TEST(ComputedStyleTest, FirstPublicPseudoStyle) {
+  RefPtr<ComputedStyle> style = ComputedStyle::create();
+  style->setHasPseudoStyle(PseudoIdFirstLine);
+  EXPECT_TRUE(style->hasPseudoStyle(PseudoIdFirstLine));
+  EXPECT_TRUE(style->hasAnyPublicPseudoStyles());
+}
+
+TEST(ComputedStyleTest, LastPublicPseudoStyle) {
+  RefPtr<ComputedStyle> style = ComputedStyle::create();
+  style->setHasPseudoStyle(PseudoIdScrollbar);
+  EXPECT_TRUE(style->hasPseudoStyle(PseudoIdScrollbar));
+  EXPECT_TRUE(style->hasAnyPublicPseudoStyles());
+}
+
 }  // namespace blink

diff --git a/third_party/WebKit/Source/web/WebFrame.cpp b/third_party/WebKit/Source/web/WebFrame.cpp
index 943f738..59df86f0 100644
--- a/third_party/WebKit/Source/web/WebFrame.cpp
+++ b/third_party/WebKit/Source/web/WebFrame.cpp

@@ -15,6 +15,7 @@
 #include "core/page/Page.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/heap/Handle.h"
+#include "platform/instrumentation/tracing/TraceEvent.h"
 #include "public/web/WebElement.h"
 #include "public/web/WebFrameOwnerProperties.h"
 #include "public/web/WebSandboxFlags.h"
@@ -99,6 +100,10 @@
         toHTMLFrameOwnerElement(owner)->setWidget(localFrame.view());
     } else {
       localFrame.page()->setMainFrame(&localFrame);
+      // This trace event is needed to detect the main frame of the
+      // renderer in telemetry metrics. See crbug.com/692112#c11.
+      TRACE_EVENT_INSTANT1("loading", "markAsMainFrame",
+                           TRACE_EVENT_SCOPE_THREAD, "frame", &localFrame);
     }
   } else {
     toWebRemoteFrameImpl(frame)->initializeCoreFrame(host, owner, name,

diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
index a95f10f..917372c4 100644
--- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
+++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

@@ -1612,6 +1612,12 @@
 
     frame()->interfaceRegistry()->addInterface(WTF::bind(
         &InstallationServiceImpl::create, wrapWeakPersistent(frame())));
+    if (!owner) {
+      // This trace event is needed to detect the main frame of the
+      // renderer in telemetry metrics. See crbug.com/692112#c11.
+      TRACE_EVENT_INSTANT1("loading", "markAsMainFrame",
+                           TRACE_EVENT_SCOPE_THREAD, "frame", frame());
+    }
   }
 }
 

diff --git a/third_party/freetype-android/.clang-format b/third_party/freetype/.clang-format
similarity index 100%
rename from third_party/freetype-android/.clang-format
rename to third_party/freetype/.clang-format


diff --git a/third_party/freetype-android/BUILD.gn b/third_party/freetype/BUILD.gn
similarity index 92%
rename from third_party/freetype-android/BUILD.gn
rename to third_party/freetype/BUILD.gn
index c853c762..30c0b37 100644
--- a/third_party/freetype-android/BUILD.gn
+++ b/third_party/freetype/BUILD.gn

@@ -65,8 +65,8 @@
     "DARWIN_NO_CARBON",
 
     # Long directory name to avoid accidentally using wrong headers.
-    "FT_CONFIG_MODULES_H=<freetype-android-config/ftmodule.h>",
-    "FT_CONFIG_OPTIONS_H=<freetype-android-config/ftoption.h>",
+    "FT_CONFIG_MODULES_H=<freetype-custom-config/ftmodule.h>",
+    "FT_CONFIG_OPTIONS_H=<freetype-custom-config/ftoption.h>",
   ]
 
   public_configs = [ ":freetype_config" ]
@@ -74,7 +74,7 @@
   configs += [
     "//build/config/compiler:no_chromium_code",
     ":freetype-warnings",
-    ":freetype-visibility"
+    ":freetype-visibility",
   ]
 
   deps = [

diff --git a/third_party/freetype-android/OWNERS b/third_party/freetype/OWNERS
similarity index 100%
rename from third_party/freetype-android/OWNERS
rename to third_party/freetype/OWNERS


diff --git a/third_party/freetype-android/README.chromium b/third_party/freetype/README.chromium
similarity index 100%
rename from third_party/freetype-android/README.chromium
rename to third_party/freetype/README.chromium


diff --git a/third_party/freetype-android/include/freetype-android-config/ftmodule.h b/third_party/freetype/include/freetype-custom-config/ftmodule.h
similarity index 100%
rename from third_party/freetype-android/include/freetype-android-config/ftmodule.h
rename to third_party/freetype/include/freetype-custom-config/ftmodule.h


diff --git a/third_party/freetype-android/include/freetype-android-config/ftoption.h b/third_party/freetype/include/freetype-custom-config/ftoption.h
similarity index 100%
rename from third_party/freetype-android/include/freetype-android-config/ftoption.h
rename to third_party/freetype/include/freetype-custom-config/ftoption.h


diff --git a/third_party/libaddressinput/chromium/chrome_storage_impl.cc b/third_party/libaddressinput/chromium/chrome_storage_impl.cc
index 4daab33..2504eee 100644
--- a/third_party/libaddressinput/chromium/chrome_storage_impl.cc
+++ b/third_party/libaddressinput/chromium/chrome_storage_impl.cc

@@ -26,7 +26,7 @@
   DCHECK(data);
   std::unique_ptr<std::string> owned_data(data);
   backing_store_->SetValue(
-      key, base::MakeUnique<base::StringValue>(std::move(*owned_data)),
+      key, base::MakeUnique<base::Value>(std::move(*owned_data)),
       WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
 }
 

diff --git a/tools/clang/value_cleanup/ListValueRewriter.cpp b/tools/clang/value_cleanup/ListValueRewriter.cpp
index 85b1d28..67988b5 100644
--- a/tools/clang/value_cleanup/ListValueRewriter.cpp
+++ b/tools/clang/value_cleanup/ListValueRewriter.cpp

@@ -408,20 +408,20 @@
                                           realFloatingPointType())))))))))))),
       &append_double_callback_);
 
-  // base::ListValue::Append(new base::StringValue(...))
+  // base::ListValue::Append(new base::Value(...))
   //     => base::ListValue::AppendString()
   match_finder->addMatcher(
       id("callExpr",
          cxxMemberCallExpr(
              is_list_append,
              hasArgument(
-                 0, ignoringParenImpCasts(id(
-                        "newExpr",
-                        cxxNewExpr(has(cxxConstructExpr(
-                            hasDeclaration(cxxMethodDecl(
-                                hasName("::base::StringValue::StringValue"))),
-                            argumentCountIs(1),
-                            hasArgument(0, id("argExpr", expr())))))))))),
+                 0, ignoringParenImpCasts(
+                        id("newExpr",
+                           cxxNewExpr(has(cxxConstructExpr(
+                               hasDeclaration(cxxMethodDecl(
+                                   hasName("::base::Value::StringValue"))),
+                               argumentCountIs(1),
+                               hasArgument(0, id("argExpr", expr())))))))))),
       &append_string_callback_);
 
   auto is_unique_ptr_release =

diff --git a/tools/clang/value_cleanup/tests/list-value-append-original.cc b/tools/clang/value_cleanup/tests/list-value-append-original.cc
index 806da66..adebcf4 100644
--- a/tools/clang/value_cleanup/tests/list-value-append-original.cc
+++ b/tools/clang/value_cleanup/tests/list-value-append-original.cc

@@ -29,7 +29,7 @@
   list.Append(new base::Value(true));
   list.Append(new base::Value(static_cast<unsigned char>(1.0)));
   list.Append(new base::Value(double{3}));
-  list.Append(new base::StringValue("abc"));
+  list.Append(new base::Value("abc"));
 
   list.Append(ReturnsUniquePtr().release());
   Thing thing;

diff --git a/tools/gn/command_desc.cc b/tools/gn/command_desc.cc
index 1de9fbb..8e4ebd7 100644
--- a/tools/gn/command_desc.cc
+++ b/tools/gn/command_desc.cc

@@ -85,7 +85,7 @@
   const base::ListValue* list;
   if (value->GetAsList(&list)) {
     if (list->empty()) {
-      base::StringValue str("(no visibility)");
+      base::Value str("(no visibility)");
       DefaultHandler(name, &str);
     } else {
       DefaultHandler(name, value);
@@ -97,7 +97,7 @@
   std::string p;
   if (value->GetAsString(&p)) {
     if (p == "*") {
-      base::StringValue str("[All headers listed in the sources are public.]");
+      base::Value str("[All headers listed in the sources are public.]");
       DefaultHandler(name, &str);
       return;
     }

diff --git a/tools/gn/desc_builder.cc b/tools/gn/desc_builder.cc
index a1a5710..c04fad6 100644
--- a/tools/gn/desc_builder.cc
+++ b/tools/gn/desc_builder.cc

@@ -123,17 +123,17 @@
 
   ValuePtr RenderValue(const std::string& s, bool optional = false) {
     return (s.empty() && optional) ? base::Value::CreateNullValue()
-                                   : ValuePtr(new base::StringValue(s));
+                                   : ValuePtr(new base::Value(s));
   }
 
   ValuePtr RenderValue(const SourceDir& d) {
     return d.is_null() ? base::Value::CreateNullValue()
-                       : ValuePtr(new base::StringValue(FormatSourceDir(d)));
+                       : ValuePtr(new base::Value(FormatSourceDir(d)));
   }
 
   ValuePtr RenderValue(const SourceFile& f) {
     return f.is_null() ? base::Value::CreateNullValue()
-                       : ValuePtr(new base::StringValue(f.value()));
+                       : ValuePtr(new base::Value(f.value()));
   }
 
   ValuePtr RenderValue(const LibFile& lib) {
@@ -679,7 +679,7 @@
         // Indent string values in blame mode
         if (blame_ && rendered->GetAsString(&str)) {
           str = "  " + str;
-          rendered = base::MakeUnique<base::StringValue>(str);
+          rendered = base::MakeUnique<base::Value>(str);
         }
         res->Append(std::move(rendered));
       }

diff --git a/tools/ipc_fuzzer/fuzzer/fuzzer.cc b/tools/ipc_fuzzer/fuzzer/fuzzer.cc
index 8efc54741..eac733f 100644
--- a/tools/ipc_fuzzer/fuzzer/fuzzer.cc
+++ b/tools/ipc_fuzzer/fuzzer/fuzzer.cc

@@ -530,7 +530,7 @@
           std::string tmp;
           p->GetString(index, &tmp);
           fuzzer->FuzzString(&tmp);
-          p->Set(index, new base::StringValue(tmp));
+          p->Set(index, new base::Value(tmp));
           break;
         }
         case base::Value::Type::BINARY: {
@@ -599,7 +599,7 @@
         case base::Value::Type::STRING: {
           std::string tmp;
           fuzzer->FuzzString(&tmp);
-          p->SetWithoutPathExpansion(property, new base::StringValue(tmp));
+          p->SetWithoutPathExpansion(property, new base::Value(tmp));
           break;
         }
         case base::Value::Type::BINARY: {

diff --git a/tools/json_schema_compiler/cc_generator.py b/tools/json_schema_compiler/cc_generator.py
index b653a9c..26cab363 100644
--- a/tools/json_schema_compiler/cc_generator.py
+++ b/tools/json_schema_compiler/cc_generator.py

@@ -567,7 +567,7 @@
 
     var: variable or variable*
 
-    E.g for std::string, generate new base::StringValue(var)
+    E.g for std::string, generate new base::Value(var)
     """
     c = Code()
     underlying_type = self._type_helper.FollowRef(type_)
@@ -631,7 +631,7 @@
       maybe_namespace = ''
       if type_.property_type == PropertyType.REF:
         maybe_namespace = '%s::' % underlying_type.namespace.unix_name
-      return 'base::MakeUnique<base::StringValue>(%sToString(%s))' % (
+      return 'base::MakeUnique<base::Value>(%sToString(%s))' % (
           maybe_namespace, var)
     elif underlying_type.property_type == PropertyType.BINARY:
       if is_ptr:
@@ -648,7 +648,7 @@
       if is_ptr:
         var = '*%s' % var
       if underlying_type.property_type == PropertyType.STRING:
-        return 'base::MakeUnique<base::StringValue>(%s)' % var
+        return 'base::MakeUnique<base::Value>(%s)' % var
       else:
         return 'base::MakeUnique<base::Value>(%s)' % var
     else:

diff --git a/tools/json_schema_compiler/test/any_unittest.cc b/tools/json_schema_compiler/test/any_unittest.cc
index 33da1ba..9010ffc 100644
--- a/tools/json_schema_compiler/test/any_unittest.cc
+++ b/tools/json_schema_compiler/test/any_unittest.cc

@@ -38,7 +38,7 @@
   }
   {
     std::unique_ptr<base::ListValue> params_value(new base::ListValue());
-    std::unique_ptr<base::Value> param(new base::StringValue("asdf"));
+    std::unique_ptr<base::Value> param(new base::Value("asdf"));
     params_value->Append(param->CreateDeepCopy());
     std::unique_ptr<OptionalAny::Params> params(
         OptionalAny::Params::Create(*params_value));

diff --git a/tools/json_schema_compiler/test/choices_unittest.cc b/tools/json_schema_compiler/test/choices_unittest.cc
index 584641c..35ec229 100644
--- a/tools/json_schema_compiler/test/choices_unittest.cc
+++ b/tools/json_schema_compiler/test/choices_unittest.cc

@@ -46,8 +46,8 @@
 TEST(JsonSchemaCompilerChoicesTest, ObjectWithChoicesParamsCreate) {
   {
     std::unique_ptr<ObjectWithChoices::Params> params(
-        ObjectWithChoices::Params::Create(*List(
-            Dictionary("strings", new base::StringValue("asdf")).release())));
+        ObjectWithChoices::Params::Create(
+            *List(Dictionary("strings", new base::Value("asdf")).release())));
     ASSERT_TRUE(params);
     EXPECT_FALSE(params->string_info.strings.as_strings);
     EXPECT_EQ("asdf", *params->string_info.strings.as_string);
@@ -56,8 +56,8 @@
   {
     std::unique_ptr<ObjectWithChoices::Params> params(
         ObjectWithChoices::Params::Create(
-            *List(Dictionary("strings", new base::StringValue("asdf"),
-                             "integers", new base::Value(6))
+            *List(Dictionary("strings", new base::Value("asdf"), "integers",
+                             new base::Value(6))
                       .release())));
     ASSERT_TRUE(params);
     EXPECT_FALSE(params->string_info.strings.as_strings);
@@ -85,10 +85,8 @@
   {
     std::unique_ptr<base::DictionaryValue> object_param(
         new base::DictionaryValue());
-    object_param->SetWithoutPathExpansion("strings",
-                                          new base::StringValue("asdf"));
-    object_param->SetWithoutPathExpansion("integers",
-                                          new base::StringValue("asdf"));
+    object_param->SetWithoutPathExpansion("strings", new base::Value("asdf"));
+    object_param->SetWithoutPathExpansion("integers", new base::Value("asdf"));
     std::unique_ptr<base::ListValue> params_value(new base::ListValue());
     params_value->Append(std::move(object_param));
     std::unique_ptr<ObjectWithChoices::Params> params(

diff --git a/tools/json_schema_compiler/test/crossref_unittest.cc b/tools/json_schema_compiler/test/crossref_unittest.cc
index 75406ea..21e52aa 100644
--- a/tools/json_schema_compiler/test/crossref_unittest.cc
+++ b/tools/json_schema_compiler/test/crossref_unittest.cc

@@ -18,7 +18,7 @@
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   value->Set("number", new base::Value(1.1));
   value->Set("integer", new base::Value(4));
-  value->Set("string", new base::StringValue("bling"));
+  value->Set("string", new base::Value("bling"));
   value->Set("boolean", new base::Value(true));
   return value;
 }
@@ -28,8 +28,8 @@
 TEST(JsonSchemaCompilerCrossrefTest, CrossrefTypePopulateAndToValue) {
   base::DictionaryValue crossref_orig;
   crossref_orig.Set("testType", CreateTestTypeValue().release());
-  crossref_orig.Set("testEnumRequired", new base::StringValue("one"));
-  crossref_orig.Set("testEnumOptional", new base::StringValue("two"));
+  crossref_orig.Set("testEnumRequired", new base::Value("one"));
+  crossref_orig.Set("testEnumOptional", new base::Value("two"));
 
   // Test Populate of the value --> compiled type.
   crossref::CrossrefType crossref_type;
@@ -115,7 +115,7 @@
     std::unique_ptr<base::ListValue> params_value(new base::ListValue());
     std::unique_ptr<base::DictionaryValue> param_object_value(
         new base::DictionaryValue());
-    param_object_value->Set("testType", new base::StringValue("invalid"));
+    param_object_value->Set("testType", new base::Value("invalid"));
     param_object_value->Set("boolean", new base::Value(true));
     params_value->Append(std::move(param_object_value));
     std::unique_ptr<crossref::TestTypeInObject::Params> params(

diff --git a/tools/json_schema_compiler/test/enums_unittest.cc b/tools/json_schema_compiler/test/enums_unittest.cc
index d5ba3250..5318981 100644
--- a/tools/json_schema_compiler/test/enums_unittest.cc
+++ b/tools/json_schema_compiler/test/enums_unittest.cc

@@ -14,7 +14,7 @@
   {
     EnumType enum_type;
     base::DictionaryValue value;
-    value.Set("type", new base::StringValue("one"));
+    value.Set("type", new base::Value("one"));
     EXPECT_TRUE(EnumType::Populate(value, &enum_type));
     EXPECT_EQ(ENUMERATION_ONE, enum_type.type);
     EXPECT_TRUE(value.Equals(enum_type.ToValue().get()));
@@ -22,7 +22,7 @@
   {
     EnumType enum_type;
     base::DictionaryValue value;
-    value.Set("type", new base::StringValue("invalid"));
+    value.Set("type", new base::Value("invalid"));
     EXPECT_FALSE(EnumType::Populate(value, &enum_type));
   }
 }
@@ -50,11 +50,11 @@
     base::DictionaryValue value;
     ASSERT_FALSE(HasEnumeration::Populate(value, &enumeration));
 
-    value.Set("enumeration", new base::StringValue("one"));
+    value.Set("enumeration", new base::Value("one"));
     ASSERT_TRUE(HasEnumeration::Populate(value, &enumeration));
     EXPECT_TRUE(value.Equals(enumeration.ToValue().get()));
 
-    value.Set("optional_enumeration", new base::StringValue("two"));
+    value.Set("optional_enumeration", new base::Value("two"));
     ASSERT_TRUE(HasEnumeration::Populate(value, &enumeration));
     EXPECT_TRUE(value.Equals(enumeration.ToValue().get()));
   }
@@ -63,7 +63,7 @@
     base::DictionaryValue value;
     ASSERT_FALSE(ReferenceEnum::Populate(value, &enumeration));
 
-    value.Set("reference_enum", new base::StringValue("one"));
+    value.Set("reference_enum", new base::Value("one"));
     ASSERT_TRUE(ReferenceEnum::Populate(value, &enumeration));
     EXPECT_TRUE(value.Equals(enumeration.ToValue().get()));
   }
@@ -72,8 +72,7 @@
 TEST(JsonSchemaCompilerEnumsTest, EnumsArrayAsType) {
   {
     base::ListValue params_value;
-    params_value.Append(
-        List(new base::StringValue("one"), new base::StringValue("two")));
+    params_value.Append(List(new base::Value("one"), new base::Value("two")));
     std::unique_ptr<TakesEnumArrayAsType::Params> params(
         TakesEnumArrayAsType::Params::Create(params_value));
     ASSERT_TRUE(params);
@@ -83,7 +82,7 @@
   }
   {
     base::ListValue params_value;
-    params_value.Append(List(new base::StringValue("invalid")));
+    params_value.Append(List(new base::Value("invalid")));
     std::unique_ptr<TakesEnumArrayAsType::Params> params(
         TakesEnumArrayAsType::Params::Create(params_value));
     EXPECT_FALSE(params);
@@ -93,8 +92,8 @@
 TEST(JsonSchemaCompilerEnumsTest, ReturnsEnumCreate) {
   {
     Enumeration state = ENUMERATION_ONE;
-    std::unique_ptr<base::Value> result(new base::StringValue(ToString(state)));
-    std::unique_ptr<base::Value> expected(new base::StringValue("one"));
+    std::unique_ptr<base::Value> result(new base::Value(ToString(state)));
+    std::unique_ptr<base::Value> expected(new base::Value("one"));
     EXPECT_TRUE(result->Equals(expected.get()));
   }
   {
@@ -122,7 +121,7 @@
   {
     OptionalEnumType enum_type;
     base::DictionaryValue value;
-    value.Set("type", new base::StringValue("two"));
+    value.Set("type", new base::Value("two"));
     EXPECT_TRUE(OptionalEnumType::Populate(value, &enum_type));
     EXPECT_EQ(ENUMERATION_TWO, enum_type.type);
     EXPECT_TRUE(value.Equals(enum_type.ToValue().get()));
@@ -137,7 +136,7 @@
   {
     OptionalEnumType enum_type;
     base::DictionaryValue value;
-    value.Set("type", new base::StringValue("invalid"));
+    value.Set("type", new base::Value("invalid"));
     EXPECT_FALSE(OptionalEnumType::Populate(value, &enum_type));
   }
 }
@@ -163,8 +162,7 @@
 TEST(JsonSchemaCompilerEnumsTest, TakesEnumArrayParamsCreate) {
   {
     base::ListValue params_value;
-    params_value.Append(
-        List(new base::StringValue("one"), new base::StringValue("two")));
+    params_value.Append(List(new base::Value("one"), new base::Value("two")));
     std::unique_ptr<TakesEnumArray::Params> params(
         TakesEnumArray::Params::Create(params_value));
     ASSERT_TRUE(params);
@@ -174,7 +172,7 @@
   }
   {
     base::ListValue params_value;
-    params_value.Append(List(new base::StringValue("invalid")));
+    params_value.Append(List(new base::Value("invalid")));
     std::unique_ptr<TakesEnumArray::Params> params(
         TakesEnumArray::Params::Create(params_value));
     EXPECT_FALSE(params);
@@ -247,9 +245,8 @@
 TEST(JsonSchemaCompilerEnumsTest, OnEnumFiredCreate) {
   {
     Enumeration some_enum = ENUMERATION_ONE;
-    std::unique_ptr<base::Value> result(
-        new base::StringValue(ToString(some_enum)));
-    std::unique_ptr<base::Value> expected(new base::StringValue("one"));
+    std::unique_ptr<base::Value> result(new base::Value(ToString(some_enum)));
+    std::unique_ptr<base::Value> expected(new base::Value("one"));
     EXPECT_TRUE(result->Equals(expected.get()));
   }
   {

diff --git a/tools/json_schema_compiler/test/error_generation_unittest.cc b/tools/json_schema_compiler/test/error_generation_unittest.cc
index 7812be62..e55ecb98 100644
--- a/tools/json_schema_compiler/test/error_generation_unittest.cc
+++ b/tools/json_schema_compiler/test/error_generation_unittest.cc

@@ -36,7 +36,7 @@
 TEST(JsonSchemaCompilerErrorTest, RequiredPropertyPopulate) {
   {
     std::unique_ptr<base::DictionaryValue> value =
-        Dictionary("string", new base::StringValue("bling"));
+        Dictionary("string", new base::Value("bling"));
     EXPECT_TRUE(EqualsUtf16("", GetPopulateError<TestType>(*value)));
   }
   {
@@ -113,7 +113,7 @@
 TEST(JsonSchemaCompilerErrorTest, WrongPropertyValueType) {
   {
     std::unique_ptr<base::DictionaryValue> value =
-        Dictionary("string", new base::StringValue("yes"));
+        Dictionary("string", new base::Value("yes"));
     EXPECT_TRUE(EqualsUtf16("", GetPopulateError<TestType>(*value)));
   }
   {
@@ -128,7 +128,7 @@
   {
     base::string16 error;
     std::unique_ptr<base::ListValue> params_value =
-        List(new base::StringValue("Yeah!"));
+        List(new base::Value("Yeah!"));
     EXPECT_TRUE(TestString::Params::Create(*params_value, &error));
   }
   {
@@ -205,12 +205,12 @@
 TEST(JsonSchemaCompilerErrorTest, BadEnumValue) {
   {
     std::unique_ptr<base::DictionaryValue> value =
-        Dictionary("enumeration", new base::StringValue("one"));
+        Dictionary("enumeration", new base::Value("one"));
     EXPECT_TRUE(EqualsUtf16("", GetPopulateError<HasEnumeration>(*value)));
   }
   {
     std::unique_ptr<base::DictionaryValue> value =
-        Dictionary("enumeration", new base::StringValue("bad sauce"));
+        Dictionary("enumeration", new base::Value("bad sauce"));
     EXPECT_TRUE(EqualsUtf16("'Enumeration': expected \"one\" or \"two\" "
               "or \"three\", got \"bad sauce\"",
         GetPopulateError<HasEnumeration>(*value)));
@@ -222,7 +222,7 @@
 TEST(JsonSchemaCompilerErrorTest, WarnOnOptionalFailure) {
   {
     std::unique_ptr<base::DictionaryValue> value =
-        Dictionary("string", new base::StringValue("bling"));
+        Dictionary("string", new base::Value("bling"));
     EXPECT_TRUE(EqualsUtf16("", GetPopulateError<OptionalTestType>(*value)));
   }
   {
@@ -318,13 +318,13 @@
 TEST(JsonSchemaCompilerErrorTest, TooManyKeys) {
   {
     std::unique_ptr<base::DictionaryValue> value =
-        Dictionary("string", new base::StringValue("yes"));
+        Dictionary("string", new base::Value("yes"));
     EXPECT_TRUE(EqualsUtf16("", GetPopulateError<TestType>(*value)));
   }
   {
     std::unique_ptr<base::DictionaryValue> value =
-        Dictionary("string", new base::StringValue("yes"), "ohno",
-                   new base::StringValue("many values"));
+        Dictionary("string", new base::Value("yes"), "ohno",
+                   new base::Value("many values"));
     EXPECT_TRUE(EqualsUtf16("found unexpected key 'ohno'",
         GetPopulateError<TestType>(*value)));
   }

diff --git a/tools/json_schema_compiler/test/simple_api_unittest.cc b/tools/json_schema_compiler/test/simple_api_unittest.cc
index b79e3bc..29d7637 100644
--- a/tools/json_schema_compiler/test/simple_api_unittest.cc
+++ b/tools/json_schema_compiler/test/simple_api_unittest.cc

@@ -14,7 +14,7 @@
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   value->SetWithoutPathExpansion("number", new base::Value(1.1));
   value->SetWithoutPathExpansion("integer", new base::Value(4));
-  value->SetWithoutPathExpansion("string", new base::StringValue("bling"));
+  value->SetWithoutPathExpansion("string", new base::Value("bling"));
   value->SetWithoutPathExpansion("boolean", new base::Value(true));
   return value;
 }

diff --git a/tools/win/DebugVisualizers/chrome.natvis b/tools/win/DebugVisualizers/chrome.natvis
index fc9f9a9..8ed8e1d 100644
--- a/tools/win/DebugVisualizers/chrome.natvis
+++ b/tools/win/DebugVisualizers/chrome.natvis

@@ -237,7 +237,7 @@
       <Item Name="Double">double_value_</Item>
     </Expand>
   </Type>
-  <Type Name="base::StringValue">
+  <Type Name="base::Value">
     <DisplayString>String ({value_})</DisplayString>
     <Expand>
       <ExpandedItem>(base::Value*)this,nd</ExpandedItem>