Make ValueDeserializer::Deserialize return scoped_ptr

chromeos/network/onc/onc_utils_unittest.cc

Index: chromeos/network/onc/onc_utils_unittest.cc
diff --git a/chromeos/network/onc/onc_utils_unittest.cc b/chromeos/network/onc/onc_utils_unittest.cc
index 6370a68507eccc4b562bf6cf28bd6f7eef4d3ec8..454ffb3992505f9846e37286f864175dc99227c1 100644
--- a/chromeos/network/onc/onc_utils_unittest.cc
+++ b/chromeos/network/onc/onc_utils_unittest.cc
@@ -21,11 +21,11 @@ namespace chromeos {
 namespace {
 
 scoped_ptr<base::Value> ReadTestJson(const std::string& filename) {
-  base::Value* result = nullptr;
   base::FilePath path;
+  scoped_ptr<base::Value> result(nullptr);

[Lei Zhang, 2015/10/14 16:55:35]

no need to initialize a scoped_ptr to nullptr.

   if (!test_utils::GetTestDataPath("network", filename, &path)) {
     NOTREACHED() << "Unable to get test file path for: " << filename;
-    return make_scoped_ptr(result);
+    return result;
   }
   JSONFileValueDeserializer deserializer(path);
   deserializer.set_allow_trailing_comma(true);
@@ -33,7 +33,7 @@ scoped_ptr<base::Value> ReadTestJson(const std::string& filename) {
   result = deserializer.Deserialize(nullptr, &error_message);
   CHECK(result != nullptr) << "Couldn't json-deserialize file: " << filename
                            << ": " << error_message;
-  return make_scoped_ptr(result);
+  return result;
 }
 
 }  // namespace