Make ValueDeserializer::Deserialize return scoped_ptr

chromeos/network/onc/onc_utils_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 "chromeos/network/onc/onc_utils.h"
 
 #include <string>
 
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chromeos/chromeos_test_utils.h"
 #include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 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);
   std::string error_message;
   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
 
 namespace onc {
 
 TEST(ONCDecrypterTest, BrokenEncryptionIterations) {
   scoped_ptr<base::DictionaryValue> encrypted_onc =
       test_utils::ReadTestDictionary("broken-encrypted-iterations.onc");
 
@@ skipping 166 matching lines @@
 
     scoped_ptr<base::DictionaryValue> actual_proxy_settings =
         ConvertProxyConfigToOncProxySettings(*shill_proxy_config);
     EXPECT_TRUE(
         test_utils::Equals(onc_proxy_settings, actual_proxy_settings.get()));
   }
 }
 
 }  // namespace onc
 }  // namespace chromeos