Removal of Profile from content part 6.

chrome/browser/ui/webui/options/browser_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/browser_options_handler.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
@@ skipping 121 matching lines @@
       NewCallback(this, &BrowserOptionsHandler::EnableInstant));
   web_ui_->RegisterMessageCallback(
       "disableInstant",
       NewCallback(this, &BrowserOptionsHandler::DisableInstant));
   web_ui_->RegisterMessageCallback(
       "getInstantFieldTrialStatus",
       NewCallback(this, &BrowserOptionsHandler::GetInstantFieldTrialStatus));
 }
 
 void BrowserOptionsHandler::Initialize() {
-  Profile* profile = web_ui_->GetProfile();
+  Profile* profile = Profile::FromWebUI(web_ui_);
 
   // Create our favicon data source.
   profile->GetChromeURLDataManager()->AddDataSource(
       new FaviconSource(profile, FaviconSource::FAVICON));
 
   homepage_.Init(prefs::kHomePage, profile->GetPrefs(), NULL);
   default_browser_policy_.Init(prefs::kDefaultBrowserSettingEnabled,
                                g_browser_process->local_state(),
                                this);
   UpdateDefaultBrowserState();
@@ skipping 62 matching lines @@
 #if defined(OS_MACOSX)
   if (ShellIntegration::SetAsDefaultBrowser())
     UpdateDefaultBrowserState();
 #else
   default_browser_worker_->StartSetAsDefault();
   // Callback takes care of updating UI.
 #endif
 
   // If the user attempted to make Chrome the default browser, then he/she
   // arguably wants to be notified when that changes.
-  PrefService* prefs = web_ui_->GetProfile()->GetPrefs();
+  PrefService* prefs = Profile::FromWebUI(web_ui_)->GetPrefs();
   prefs->SetBoolean(prefs::kCheckDefaultBrowser, true);
 }
 
 int BrowserOptionsHandler::StatusStringIdForState(
     ShellIntegration::DefaultWebClientState state) {
   if (state == ShellIntegration::IS_DEFAULT_WEB_CLIENT)
     return IDS_OPTIONS_DEFAULTBROWSER_DEFAULT;
   if (state == ShellIntegration::NOT_DEFAULT_WEB_CLIENT)
     return IDS_OPTIONS_DEFAULTBROWSER_NOTDEFAULT;
   return IDS_OPTIONS_DEFAULTBROWSER_UNKNOWN;
@@ skipping 73 matching lines @@
   std::vector<const TemplateURL*> model_urls =
       template_url_service_->GetTemplateURLs();
   if (selected_index >= 0 &&
       selected_index < static_cast<int>(model_urls.size()))
     template_url_service_->SetDefaultSearchProvider(model_urls[selected_index]);
 
   UserMetrics::RecordAction(UserMetricsAction("Options_SearchEngineChanged"));
 }
 
 void BrowserOptionsHandler::UpdateSearchEngines() {
-  template_url_service_ = TemplateURLServiceFactory::GetForProfile(
-      web_ui_->GetProfile());
+  template_url_service_ =
+      TemplateURLServiceFactory::GetForProfile(Profile::FromWebUI(web_ui_));
   if (template_url_service_) {
     template_url_service_->Load();
     template_url_service_->AddObserver(this);
     OnTemplateURLServiceChanged();
   }
 }
 
 void BrowserOptionsHandler::UpdateRestoreOnStartup() {
-  Profile* profile = web_ui_->GetProfile();
+  Profile* profile = Profile::FromWebUI(web_ui_);
   const SessionStartupPref startup_pref =
       SessionStartupPref::GetStartupPref(profile->GetPrefs());
   FundamentalValue restore_on_startup(startup_pref.type);
   web_ui_->CallJavascriptFunction("BrowserOptions.updateRestoreOnStartup",
                                   restore_on_startup);
 }
 
 void BrowserOptionsHandler::UpdateStartupPages() {
-  Profile* profile = web_ui_->GetProfile();
+  Profile* profile = Profile::FromWebUI(web_ui_);
   const SessionStartupPref startup_pref =
       SessionStartupPref::GetStartupPref(profile->GetPrefs());
   startup_custom_pages_table_model_->SetURLs(startup_pref.urls);
 }
 
 void BrowserOptionsHandler::OnModelChanged() {
   ListValue startup_pages;
   int page_count = startup_custom_pages_table_model_->RowCount();
   std::vector<GURL> urls = startup_custom_pages_table_model_->GetURLs();
   for (int i = 0; i < page_count; ++i) {
@@ skipping 45 matching lines @@
     const ListValue* args) {
   startup_custom_pages_table_model_->SetToCurrentlyOpenPages();
   SaveStartupPagesPref();
 }
 
 void BrowserOptionsHandler::SetRestoreOnStartup(const ListValue* args) {
   std::string pref_string;
   CHECK_EQ(args->GetSize(), 1UL);
   CHECK(args->GetString(0, &pref_string));
 
-  PrefService* prefs = web_ui_->GetProfile()->GetPrefs();
+  PrefService* prefs = Profile::FromWebUI(web_ui_)->GetPrefs();
 
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs);
   if (pref_string == "0") {
     pref.type = SessionStartupPref::DEFAULT;
   } else if (pref_string == "1") {
     pref.type = SessionStartupPref::LAST;
   } else if (pref_string == "2") {
     pref.type = SessionStartupPref::URLS;
   } else {
     NOTREACHED();
@@ skipping 69 matching lines @@
     CHECK(selected->GetString(i, &value));
     base::StringToInt(value, &index);
     index_list.push_back(index);
   }
 
   startup_custom_pages_table_model_->MoveURLs(to_index, index_list);
   SaveStartupPagesPref();
 }
 
 void BrowserOptionsHandler::SaveStartupPagesPref() {
-  PrefService* prefs = web_ui_->GetProfile()->GetPrefs();
+  PrefService* prefs = Profile::FromWebUI(web_ui_)->GetPrefs();
 
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(prefs);
   pref.urls = startup_custom_pages_table_model_->GetURLs();
 
   SessionStartupPref::SetStartupPref(prefs, pref);
 }
 
 void BrowserOptionsHandler::RequestAutocompleteSuggestions(
     const ListValue* args) {
   string16 input;
   CHECK_EQ(args->GetSize(), 1U);
   CHECK(args->GetString(0, &input));
 
   autocomplete_controller_->Start(input, string16(), true, false, false,
                                   AutocompleteInput::ALL_MATCHES);
 }
 
 void BrowserOptionsHandler::ToggleShowBookmarksBar(const ListValue* args) {
-  Source<Profile> source(web_ui_->GetProfile());
+  Source<Profile> source(Profile::FromWebUI(web_ui_));
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
       source,
       NotificationService::NoDetails());
 }
 
 void BrowserOptionsHandler::EnableInstant(const ListValue* args) {
-  InstantController::Enable(web_ui_->GetProfile());
+  InstantController::Enable(Profile::FromWebUI(web_ui_));
 }
 
 void BrowserOptionsHandler::DisableInstant(const ListValue* args) {
-  InstantController::Disable(web_ui_->GetProfile());
+  InstantController::Disable(Profile::FromWebUI(web_ui_));
 }
 
 void BrowserOptionsHandler::GetInstantFieldTrialStatus(const ListValue* args) {
   FundamentalValue enabled(
-      InstantFieldTrial::IsExperimentGroup(web_ui_->GetProfile()));
+      InstantFieldTrial::IsExperimentGroup(Profile::FromWebUI(web_ui_)));
   web_ui_->CallJavascriptFunction("BrowserOptions.setInstantFieldTrialStatus",
                                   enabled);
 }
 
 void BrowserOptionsHandler::OnResultChanged(bool default_match_changed) {
   const AutocompleteResult& result = autocomplete_controller_->result();
   ListValue suggestions;
   for (size_t i = 0; i < result.size(); ++i) {
     const AutocompleteMatch& match = result.match_at(i);
     AutocompleteMatch::Type type = match.type;
     if (type != AutocompleteMatch::HISTORY_URL &&
         type != AutocompleteMatch::HISTORY_TITLE &&
         type != AutocompleteMatch::HISTORY_BODY &&
         type != AutocompleteMatch::HISTORY_KEYWORD &&
         type != AutocompleteMatch::NAVSUGGEST)
       continue;
     DictionaryValue* entry = new DictionaryValue();
     entry->SetString("title", match.description);
     entry->SetString("displayURL", match.contents);
     entry->SetString("url", match.destination_url.spec());
     suggestions.Append(entry);
   }
 
   web_ui_->CallJavascriptFunction(
       "BrowserOptions.updateAutocompleteSuggestions", suggestions);
 }