Factor out PluginGroup into a separate class in common/.

chrome/browser/dom_ui/plugins_ui.cc

 // Copyright (c) 2010 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/dom_ui/plugins_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 149 matching lines @@
   dom_ui_->RegisterMessageCallback("enablePlugin",
       NewCallback(this, &PluginsDOMHandler::HandleEnablePluginMessage));
   dom_ui_->RegisterMessageCallback("showTermsOfService",
       NewCallback(this, &PluginsDOMHandler::HandleShowTermsOfServiceMessage));
 }
 
 void PluginsDOMHandler::HandleRequestPluginsData(const Value* value) {
   DictionaryValue* results = new DictionaryValue();
 
   // Grouped plugins.
-  results->Set(L"plugins", PluginUpdater::GetInstance()->GetPluginGroupsData());
+  results->Set(L"plugins", plugin_updater::GetPluginGroupsData());
 
   dom_ui_->CallJavascriptFunction(L"returnPluginsData", *results);
 }
 
 void PluginsDOMHandler::HandleEnablePluginMessage(const Value* value) {
   // Be robust in accepting badness since plug-ins display HTML (hence
   // JavaScript).
   if (!value->IsType(Value::TYPE_LIST))
     return;
 
   const ListValue* list = static_cast<const ListValue*>(value);
   if (list->GetSize() != 3)
     return;
 
   std::string enable_str;
   std::string is_group_str;
-  if (!list->GetString(1, &enable_str) ||
-      !list->GetString(2, &is_group_str))
+  if (!list->GetString(1, &enable_str) || !list->GetString(2, &is_group_str))
     return;
 
   if (is_group_str == "true") {
     std::wstring group_name;
     if (!list->GetString(0, &group_name))
       return;
 
-    PluginUpdater::GetInstance()->EnablePluginGroup(enable_str == "true",
-                                                    WideToUTF16(group_name));
+    plugin_updater::EnablePluginGroup(enable_str == "true",
+                                     WideToUTF16(group_name));
   } else {
     FilePath::StringType file_path;
     if (!list->GetString(0, &file_path))
       return;
 
-    PluginUpdater::GetInstance()->EnablePluginFile(enable_str == "true",
-                                                   file_path);
+    plugin_updater::EnablePluginFile(enable_str == "true", 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>
-  PluginUpdater::GetInstance()->UpdatePreferences(dom_ui_->GetProfile());
+  plugin_updater::UpdatePreferences(dom_ui_->GetProfile());
 }
 
 void PluginsDOMHandler::HandleShowTermsOfServiceMessage(const Value* value) {
   // Show it in a new browser window....
   Browser* browser = Browser::Create(dom_ui_->GetProfile());
   browser->OpenURL(GURL(chrome::kAboutTermsURL),
                    GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
   browser->window()->Show();
 }
 
@@ skipping 28 matching lines @@
 // static
 void PluginsUI::RegisterUserPrefs(PrefService* prefs) {
   FilePath internal_dir;
   PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir);
   prefs->RegisterFilePathPref(prefs::kPluginsLastInternalDirectory,
                               internal_dir);
 
   prefs->RegisterListPref(prefs::kPluginsPluginsList);
   prefs->RegisterBooleanPref(prefs::kPluginsEnabledInternalPDF, false);
 }