Make ValueDeserializer::Deserialize return scoped_ptr

chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc

 // Copyright 2015 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 "base/json/json_file_value_serializer.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/developer_private/extension_info_generator.h"
 #include "chrome/browser/extensions/api/developer_private/inspectable_views_finder.h"
@@ skipping 18 matching lines @@
 
 namespace developer = api::developer_private;
 
 namespace {
 
 const char kAllHostsPermission[] = "*://*/*";
 
 scoped_ptr<base::DictionaryValue> DeserializeJSONTestData(
     const base::FilePath& path,
     std::string *error) {
-  base::Value* value = nullptr;
+  scoped_ptr<base::Value> value = nullptr;

[Lei Zhang, 2015/10/12 22:42:21]

no need to initialize to nullptr.

   JSONFileValueDeserializer deserializer(path);
   value = deserializer.Deserialize(nullptr, error);
-  return make_scoped_ptr(static_cast<base::DictionaryValue*>(value));
+  return make_scoped_ptr(static_cast<base::DictionaryValue*>(value.release()));
 }
 
 }  // namespace
 
 class ExtensionInfoGeneratorUnitTest : public ExtensionServiceTestBase {
  public:
   ExtensionInfoGeneratorUnitTest() {}
   ~ExtensionInfoGeneratorUnitTest() override {}
 
  protected:
@@ skipping 344 matching lines @@
       "all_urls_II", ListBuilder().Append(kAllHostsPermission).Pass());
 
   // Even though the extension has all_urls permission, the checkbox shouldn't
   // show up without the switch.
   info = GenerateExtensionInfo(all_urls_extension->id());
   EXPECT_FALSE(info->run_on_all_urls.is_enabled);
   EXPECT_TRUE(info->run_on_all_urls.is_active);
 }
 
 }  // namespace extensions