Removal of Profile from content part 6.

chrome/browser/ui/webui/options/core_options_handler.cc

 // Copyright (c) 2011 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/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
@@ skipping 94 matching lines @@
     if (last_pref != iter->first) {
       StopObservingPref(iter->first);
       last_pref = iter->first;
     }
   }
 }
 
 WebUIMessageHandler* CoreOptionsHandler::Attach(WebUI* web_ui) {
   WebUIMessageHandler* result = WebUIMessageHandler::Attach(web_ui);
   DCHECK(web_ui_);
-  registrar_.Init(web_ui_->GetProfile()->GetPrefs());
+  registrar_.Init(Profile::FromWebUI(web_ui_)->GetPrefs());
   return result;
 }
 
 void CoreOptionsHandler::Observe(int type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PREF_CHANGED)
     NotifyPrefChanged(Details<std::string>(details).ptr());
 }
 
@@ skipping 19 matching lines @@
   web_ui_->RegisterMessageCallback("coreOptionsUserMetricsAction",
       NewCallback(this, &CoreOptionsHandler::HandleUserMetricsAction));
 }
 
 void CoreOptionsHandler::HandleInitialize(const ListValue* args) {
   DCHECK(handlers_host_);
   handlers_host_->InitializeHandlers();
 }
 
 Value* CoreOptionsHandler::FetchPref(const std::string& pref_name) {
-  PrefService* pref_service = web_ui_->GetProfile()->GetPrefs();
+  PrefService* pref_service = Profile::FromWebUI(web_ui_)->GetPrefs();
 
   const PrefService::Preference* pref =
       pref_service->FindPreference(pref_name.c_str());
   if (!pref)
     return Value::CreateNullValue();
 
   return CreateValueForPref(pref);
 }
 
 void CoreOptionsHandler::ObservePref(const std::string& pref_name) {
   registrar_.Add(pref_name.c_str(), this);
 }
 
 void CoreOptionsHandler::SetPref(const std::string& pref_name,
                                  const Value* value,
                                  const std::string& metric) {
-  PrefService* pref_service = web_ui_->GetProfile()->GetPrefs();
+  PrefService* pref_service = Profile::FromWebUI(web_ui_)->GetPrefs();
 
   switch (value->GetType()) {
     case Value::TYPE_BOOLEAN:
     case Value::TYPE_INTEGER:
     case Value::TYPE_DOUBLE:
     case Value::TYPE_STRING:
       pref_service->Set(pref_name.c_str(), *value);
       break;
 
     default:
       NOTREACHED();
       return;
   }
 
   pref_service->ScheduleSavePersistentPrefs();
   ProcessUserMetric(value, metric);
 }
 
 void CoreOptionsHandler::ClearPref(const std::string& pref_name,
                                    const std::string& metric) {
-  PrefService* pref_service = web_ui_->GetProfile()->GetPrefs();
+  PrefService* pref_service = Profile::FromWebUI(web_ui_)->GetPrefs();
   pref_service->ClearPref(pref_name.c_str());
   pref_service->ScheduleSavePersistentPrefs();
 
   if (!metric.empty())
     UserMetrics::RecordComputedAction(metric);
 }
 
 void CoreOptionsHandler::ProcessUserMetric(const Value* value,
                                            const std::string& metric) {
   if (metric.empty())
@@ skipping 166 matching lines @@
       "OptionsPage.setClearPluginLSODataEnabled", *enabled);
 }
 
 void CoreOptionsHandler::NotifyPrefChanged(const std::string* pref_name) {
   if (*pref_name == prefs::kClearPluginLSODataEnabled) {
     // This preference is stored in Local State, not in the user preferences.
     UpdateClearPluginLSOData();
     return;
   }
 
-  PrefService* pref_service = web_ui_->GetProfile()->GetPrefs();
+  PrefService* pref_service = Profile::FromWebUI(web_ui_)->GetPrefs();
   const PrefService::Preference* pref =
       pref_service->FindPreference(pref_name->c_str());
   if (!pref)
     return;
 
   std::pair<PreferenceCallbackMap::const_iterator,
             PreferenceCallbackMap::const_iterator> range;
   range = pref_callback_map_.equal_range(*pref_name);
   for (PreferenceCallbackMap::const_iterator iter = range.first;
        iter != range.second; ++iter) {
     const std::wstring& callback_function = iter->second;
     ListValue result_value;
     result_value.Append(Value::CreateStringValue(pref_name->c_str()));
 
     result_value.Append(CreateValueForPref(pref));
 
     web_ui_->CallJavascriptFunction(WideToASCII(callback_function),
                                     result_value);
   }
 }