More base::Values-related bare pointer -> scoped_ptr conversions

chrome/browser/extensions/api/settings_private/settings_private_apitest.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/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/settings_private/settings_private_delegate.h"
 #include "chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ skipping 16 matching lines @@
   bool SetPref(const std::string& name, const base::Value* value) override {
     // Write to the actual pref service, so that the SettingsPrivateEventRouter
     // dispatches an onPrefsChanged event.
     PrefService* pref_service = profile_->GetPrefs();
     pref_service->Set(name.c_str(), *value);
     return true;
   }
 
   scoped_ptr<base::Value> GetPref(const std::string& name) override {
     if (name.compare(kTestPrefName) != 0)
-      return make_scoped_ptr(base::Value::CreateNullValue());
+      return base::Value::CreateNullValue();
 
     return CreateTestPrefObject()->ToValue();
   }
 
   scoped_ptr<base::Value> GetAllPrefs() override {
     base::ListValue* list_value = new base::ListValue();
     list_value->Append(CreateTestPrefObject()->ToValue().release());
     return make_scoped_ptr(list_value);
   }
 
@@ skipping 67 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(SettingsPrivateApiTest, GetAllPrefs) {
   EXPECT_TRUE(RunSettingsSubtest("getAllPrefs")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(SettingsPrivateApiTest, OnPrefsChanged) {
   EXPECT_TRUE(RunSettingsSubtest("onPrefsChanged")) << message_;
 }
 
 }  // namespace extensions