Removal of Profile from content part 6.

chrome/browser/ui/webui/plugins_ui.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/plugins_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 141 matching lines @@
 };
 
 PluginsDOMHandler::PluginsDOMHandler()
     : ALLOW_THIS_IN_INITIALIZER_LIST(get_plugins_factory_(this)) {
   registrar_.Add(this,
                  content::NOTIFICATION_PLUGIN_ENABLE_STATUS_CHANGED,
                  NotificationService::AllSources());
 }
 
 WebUIMessageHandler* PluginsDOMHandler::Attach(WebUI* web_ui) {
-  PrefService* prefs = web_ui->GetProfile()->GetPrefs();
+  PrefService* prefs = Profile::FromWebUI(web_ui)->GetPrefs();
 
   show_details_.Init(prefs::kPluginsShowDetails, prefs, this);
 
   return WebUIMessageHandler::Attach(web_ui);
 }
 
 void PluginsDOMHandler::RegisterMessages() {
   web_ui_->RegisterMessageCallback("requestPluginsData",
       NewCallback(this, &PluginsDOMHandler::HandleRequestPluginsData));
   web_ui_->RegisterMessageCallback("enablePlugin",
       NewCallback(this, &PluginsDOMHandler::HandleEnablePluginMessage));
   web_ui_->RegisterMessageCallback("saveShowDetailsToPrefs",
       NewCallback(this, &PluginsDOMHandler::HandleSaveShowDetailsToPrefs));
   web_ui_->RegisterMessageCallback("getShowDetails",
       NewCallback(this, &PluginsDOMHandler::HandleGetShowDetails));
 }
 
 void PluginsDOMHandler::HandleRequestPluginsData(const ListValue* args) {
   LoadPlugins();
 }
 
 void PluginsDOMHandler::HandleEnablePluginMessage(const ListValue* args) {
+  Profile* profile = Profile::FromWebUI(web_ui_);
+
   // If a non-first-profile user tries to trigger these methods sneakily,
   // forbid it.
 #if !defined(OS_CHROMEOS)
-  if (!web_ui_->GetProfile()->GetOriginalProfile()->first_launched())
+  if (!profile->GetOriginalProfile()->first_launched())
     return;
 #endif
 
   // Be robust in accepting badness since plug-ins display HTML (hence
   // JavaScript).
   if (args->GetSize() != 3)
     return;
 
   std::string enable_str;
   std::string is_group_str;
@@ skipping 24 matching lines @@
     FilePath::StringType file_path;
     if (!args->GetString(0, &file_path))
       return;
 
     plugin_updater->EnablePlugin(enable, file_path);
   }
 
   // TODO(viettrungluu): We might also want to ensure that the plugins
   // list is always written to prefs even when the user hasn't disabled a
   // plugin. <http://crbug.com/39101>
-  plugin_updater->UpdatePreferences(web_ui_->GetProfile(), 0);
+  plugin_updater->UpdatePreferences(profile, 0);
 }
 
 void PluginsDOMHandler::HandleSaveShowDetailsToPrefs(const ListValue* args) {
   std::string details_mode;
   if (!args->GetString(0, &details_mode)) {
     NOTREACHED();
     return;
   }
   show_details_.SetValue(details_mode == "true");
 }
@@ skipping 83 matching lines @@
   prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF,
                              false,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kPluginsShowDetails,
                              false,
                              PrefService::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kPluginsShowSetReaderDefaultInfobar,
                              true,
                              PrefService::UNSYNCABLE_PREF);
 }