Update from https://crrev.com/333737

base/json/json_value_serializer_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_reader.h"
@@ skipping 57 matching lines @@
   str_serializer.set_pretty_print(true);
   ASSERT_TRUE(str_serializer.Serialize(value));
   // Unify line endings between platforms.
   ReplaceSubstringsAfterOffset(&serialized_json, 0,
                                kWinLineEnds, kLinuxLineEnds);
   // Now compare the input with the output.
   ASSERT_EQ(kProperJSON, serialized_json);
 }
 
 void ValidateJsonList(const std::string& json) {
-  scoped_ptr<Value> root(JSONReader::Read(json));
+  scoped_ptr<Value> root = JSONReader::Read(json);
   ASSERT_TRUE(root.get() && root->IsType(Value::TYPE_LIST));
   ListValue* list = static_cast<ListValue*>(root.get());
   ASSERT_EQ(1U, list->GetSize());
   Value* elt = NULL;
   ASSERT_TRUE(list->Get(0, &elt));
   int value = 0;
   ASSERT_TRUE(elt && elt->GetAsInteger(&value));
   ASSERT_EQ(1, value);
 }
 
@@ skipping 206 matching lines @@
       "\xC3\xA8\xC3\xA9\xC3\xAA\xC3\xAB\xC3\xAC\xC3\xAD\xC3\xAE\xC3\xAF\xC3\xB0"
       "\xC3\xB1\xC3\xB2\xC3\xB3\xC3\xB4\xC3\xB5\xC3\xB6\xC3\xB7\xC3\xB8\xC3\xB9"
       "\xC3\xBA\xC3\xBB\xC3\xBC\xC3\xBD\xC3\xBE\xC3\xBF";
 
   std::string expected_output = "{\"all_chars\":\"" + all_chars_expected +
                                  "\"}";
   // Test JSONWriter interface
   std::string output_js;
   DictionaryValue valueRoot;
   valueRoot.SetString("all_chars", all_chars);
-  JSONWriter::Write(&valueRoot, &output_js);
+  JSONWriter::Write(valueRoot, &output_js);
   ASSERT_EQ(expected_output, output_js);
 
   // Test JSONValueSerializer interface (uses JSONWriter).
   JSONStringValueSerializer serializer(&output_js);
   ASSERT_TRUE(serializer.Serialize(valueRoot));
   ASSERT_EQ(expected_output, output_js);
 }
 
 TEST(JSONValueSerializerTest, UnicodeStrings) {
   // unicode string json -> escaped ascii text
@@ skipping 56 matching lines @@
   ValidateJsonList("[ // 2, 3, ignore me ] \n1 ]");
   ValidateJsonList("[ /* 2, \n3, ignore me ]*/ \n1 ]");
   ValidateJsonList("//header\n[ // 2, \n// 3, \n1 ]// footer");
   ValidateJsonList("/*\n[ // 2, \n// 3, \n1 ]*/[1]");
   ValidateJsonList("[ 1 /* one */ ] /* end */");
   ValidateJsonList("[ 1 //// ,2\r\n ]");
 
   scoped_ptr<Value> root;
 
   // It's ok to have a comment in a string.
-  root.reset(JSONReader::Read("[\"// ok\\n /* foo */ \"]"));
+  root.reset(JSONReader::DeprecatedRead("[\"// ok\\n /* foo */ \"]"));
   ASSERT_TRUE(root.get() && root->IsType(Value::TYPE_LIST));
   ListValue* list = static_cast<ListValue*>(root.get());
   ASSERT_EQ(1U, list->GetSize());
   Value* elt = NULL;
   ASSERT_TRUE(list->Get(0, &elt));
   std::string value;
   ASSERT_TRUE(elt && elt->GetAsString(&value));
   ASSERT_EQ("// ok\n /* foo */ ", value);
 
   // You can't nest comments.
-  root.reset(JSONReader::Read("/* /* inner */ outer */ [ 1 ]"));
+  root.reset(JSONReader::DeprecatedRead("/* /* inner */ outer */ [ 1 ]"));
   ASSERT_FALSE(root.get());
 
   // Not a open comment token.
-  root.reset(JSONReader::Read("/ * * / [1]"));
+  root.reset(JSONReader::DeprecatedRead("/ * * / [1]"));
   ASSERT_FALSE(root.get());
 }
 
 class JSONFileValueSerializerTest : public testing::Test {
  protected:
   void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); }
 
   base::ScopedTempDir temp_dir_;
 };
 
@@ skipping 80 matching lines @@
   ASSERT_TRUE(PathExists(source_file_path));
   JSONFileValueDeserializer deserializer(source_file_path);
   scoped_ptr<Value> root;
   root.reset(deserializer.Deserialize(NULL, NULL));
   ASSERT_TRUE(root.get());
 }
 
 }  // namespace
 
 }  // namespace base