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

chrome/browser/ui/webui/options/core_options_handler.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 "chrome/browser/ui/webui/options/core_options_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 351 matching lines @@
 }
 
 base::Value* CoreOptionsHandler::CreateValueForPref(
     const std::string& pref_name,
     const std::string& controlling_pref_name) {
   const PrefService* pref_service = FindServiceForPref(pref_name.c_str());
   const PrefService::Preference* pref =
       pref_service->FindPreference(pref_name.c_str());
   if (!pref) {
     NOTREACHED();
-    return base::Value::CreateNullValue();
+    return base::Value::CreateNullValue().release();
   }
   const PrefService::Preference* controlling_pref =
       pref_service->FindPreference(controlling_pref_name.c_str());
   if (!controlling_pref)
     controlling_pref = pref;
 
   base::DictionaryValue* dict = new base::DictionaryValue;
   dict->Set("value", pref->GetValue()->DeepCopy());
   if (controlling_pref->IsManaged()) {
     dict->SetString("controlledBy", "policy");
@@ skipping 270 matching lines @@
           plugin_status_pref_setter_.IsPepperFlashSettingsEnabled());
   web_ui()->CallJavascriptFunction(
       "OptionsPage.setPepperFlashSettingsEnabled", enabled);
 }
 
 bool CoreOptionsHandler::IsUserUnsupervised(const base::Value* to_value) {
   return !Profile::FromWebUI(web_ui())->IsSupervised();
 }
 
 }  // namespace options