Make ValueDeserializer::Deserialize return scoped_ptr

chromeos/network/onc/onc_test_utils.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 "chromeos/network/onc/onc_test_utils.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
@@ skipping 20 matching lines @@
                  << kNetworkComponentDirectory << "/" << filename;
     return "";
   }
   std::string result;
   base::ReadFileToString(path, &result);
   return result;
 }
 
 scoped_ptr<base::DictionaryValue> ReadTestDictionary(
     const std::string& filename) {
-  base::DictionaryValue* dict = NULL;
+  scoped_ptr<base::DictionaryValue> dict = NULL;

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

No need to initialize to NULL.

   base::FilePath path;
   if (!chromeos::test_utils::GetTestDataPath(kNetworkComponentDirectory,
                                              filename,
                                              &path)) {
     NOTREACHED() << "Unable to get test dictionary path for "
                  << kNetworkComponentDirectory << "/" << filename;
-    return make_scoped_ptr(dict);
+    return dict;
   }
 
   JSONFileValueDeserializer deserializer(path);
   deserializer.set_allow_trailing_comma(true);
 
   std::string error_message;
-  base::Value* content = deserializer.Deserialize(NULL, &error_message);
+  scoped_ptr<base::Value> content =
+      deserializer.Deserialize(NULL, &error_message);
   CHECK(content != NULL) << "Couldn't json-deserialize file '"
                          << filename << "': " << error_message;
 
-  CHECK(content->GetAsDictionary(&dict))
-      << "File '" << filename
-      << "' does not contain a dictionary as expected, but type "
-      << content->GetType();
-  return make_scoped_ptr(dict);
+  dict = base::DictionaryValue::From(content.Pass());
+  CHECK(dict) << "File '" << filename
+              << "' does not contain a dictionary as expected, but type "
+              << content->GetType();
+  return dict;
 }
 
 ::testing::AssertionResult Equals(const base::Value* expected,
                                   const base::Value* actual) {
   CHECK(expected != NULL);
   if (actual == NULL)
     return ::testing::AssertionFailure() << "Actual value pointer is NULL";
 
   if (expected->Equals(actual))
     return ::testing::AssertionSuccess() << "Values are equal";
 
   return ::testing::AssertionFailure() << "Values are unequal.\n"
                                        << "Expected value:\n" << *expected
                                        << "Actual value:\n" << *actual;
 }
 
 }  // namespace test_utils
 }  // namespace onc
 }  // namespace chromeos