Revert 176047

chrome/browser/extensions/api/content_settings/content_settings_api.cc

Index: chrome/browser/extensions/api/content_settings/content_settings_api.cc
===================================================================
--- chrome/browser/extensions/api/content_settings/content_settings_api.cc	(revision 176049)
+++ chrome/browser/extensions/api/content_settings/content_settings_api.cc	(working copy)
@@ -62,7 +62,7 @@
 namespace helpers = content_settings_helpers;
 namespace keys = content_settings_api_constants;
 
-bool ClearContentSettingsFunction::RunImpl() {
+bool ContentSettingsClearFunction::RunImpl() {
   ContentSettingsType content_type;
   EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
 
@@ -96,7 +96,7 @@
   return true;
 }
 
-bool GetContentSettingFunction::RunImpl() {
+bool ContentSettingsGetFunction::RunImpl() {
   ContentSettingsType content_type;
   EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
 
@@ -169,7 +169,7 @@
   return true;
 }
 
-bool SetContentSettingFunction::RunImpl() {
+bool ContentSettingsSetFunction::RunImpl() {
   ContentSettingsType content_type;
   EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
 
@@ -250,7 +250,7 @@
   return true;
 }
 
-bool GetResourceIdentifiersFunction::RunImpl() {
+bool ContentSettingsGetResourceIdentifiersFunction::RunImpl() {
   ContentSettingsType content_type;
   EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
 
@@ -261,14 +261,15 @@
 
   if (!g_testing_plugins_) {
     PluginService::GetInstance()->GetPlugins(
-        base::Bind(&GetResourceIdentifiersFunction::OnGotPlugins, this));
+        base::Bind(&ContentSettingsGetResourceIdentifiersFunction::OnGotPlugins,
+                   this));
   } else {
     OnGotPlugins(*g_testing_plugins_);
   }
   return true;
 }
 
-void GetResourceIdentifiersFunction::OnGotPlugins(
+void ContentSettingsGetResourceIdentifiersFunction::OnGotPlugins(
     const std::vector<webkit::WebPluginInfo>& plugins) {
   PluginFinder* finder = PluginFinder::GetInstance();
   std::set<std::string> group_identifiers;
@@ -289,11 +290,13 @@
   SetResult(list);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, base::Bind(
-          &GetResourceIdentifiersFunction::SendResponse, this, true));
+          &ContentSettingsGetResourceIdentifiersFunction::SendResponse,
+          this,
+          true));
 }
 
 // static
-void GetResourceIdentifiersFunction::SetPluginsForTesting(
+void ContentSettingsGetResourceIdentifiersFunction::SetPluginsForTesting(
     const std::vector<webkit::WebPluginInfo>* plugins) {
   g_testing_plugins_ = plugins;
 }