Revert revision 176015

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

 // Copyright (c) 2012 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/extensions/api/content_settings/content_settings_api.h"
 
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 44 matching lines @@
   return *content_type != CONTENT_SETTINGS_TYPE_DEFAULT;
 }
 
 }  // namespace
 
 namespace extensions {
 
 namespace helpers = content_settings_helpers;
 namespace keys = content_settings_api_constants;
 
-bool ContentSettingsClearFunction::RunImpl() {
+bool ClearContentSettingsFunction::RunImpl() {
   ContentSettingsType content_type;
   EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
 
   scoped_ptr<Clear::Params> params(Clear::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   ExtensionPrefsScope scope = kExtensionPrefsScopeRegular;
   bool incognito = false;
   if (params->details.scope ==
           Clear::Params::Details::SCOPE_INCOGNITO_SESSION_ONLY) {
@@ skipping 13 matching lines @@
     }
   }
 
   ContentSettingsStore* store = extensions::ExtensionSystem::Get(profile_)->
       extension_service()->GetContentSettingsStore();
   store->ClearContentSettingsForExtension(extension_id(), scope);
 
   return true;
 }
 
-bool ContentSettingsGetFunction::RunImpl() {
+bool GetContentSettingFunction::RunImpl() {
   ContentSettingsType content_type;
   EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
 
   scoped_ptr<Get::Params> params(Get::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   GURL primary_url(params->details.primary_url);
   if (!primary_url.is_valid()) {
     error_ = ErrorUtils::FormatErrorMessage(keys::kInvalidUrlError,
         params->details.primary_url);
@@ skipping 52 matching lines @@
 
   DictionaryValue* result = new DictionaryValue();
   result->SetString(keys::kContentSettingKey,
                     helpers::ContentSettingToString(setting));
 
   SetResult(result);
 
   return true;
 }
 
-bool ContentSettingsSetFunction::RunImpl() {
+bool SetContentSettingFunction::RunImpl() {
   ContentSettingsType content_type;
   EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
 
   scoped_ptr<Set::Params> params(Set::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   std::string primary_error;
   ContentSettingsPattern primary_pattern =
       helpers::ParseExtensionPattern(params->details.primary_pattern,
                                      &primary_error);
@@ skipping 60 matching lines @@
   }
 
   ContentSettingsStore* store = extensions::ExtensionSystem::Get(profile_)->
       extension_service()->GetContentSettingsStore();
   store->SetExtensionContentSetting(extension_id(), primary_pattern,
                                     secondary_pattern, content_type,
                                     resource_identifier, setting, scope);
   return true;
 }
 
-bool ContentSettingsGetResourceIdentifiersFunction::RunImpl() {
+bool GetResourceIdentifiersFunction::RunImpl() {
   ContentSettingsType content_type;
   EXTENSION_FUNCTION_VALIDATE(RemoveContentType(args_.get(), &content_type));
 
   if (content_type != CONTENT_SETTINGS_TYPE_PLUGINS) {
     SendResponse(true);
     return true;
   }
 
   if (!g_testing_plugins_) {
     PluginService::GetInstance()->GetPlugins(
-        base::Bind(&ContentSettingsGetResourceIdentifiersFunction::OnGotPlugins,
-                   this));
+        base::Bind(&GetResourceIdentifiersFunction::OnGotPlugins, this));
   } else {
     OnGotPlugins(*g_testing_plugins_);
   }
   return true;
 }
 
-void ContentSettingsGetResourceIdentifiersFunction::OnGotPlugins(
+void GetResourceIdentifiersFunction::OnGotPlugins(
     const std::vector<webkit::WebPluginInfo>& plugins) {
   PluginFinder* finder = PluginFinder::GetInstance();
   std::set<std::string> group_identifiers;
   ListValue* list = new ListValue();
   for (std::vector<webkit::WebPluginInfo>::const_iterator it = plugins.begin();
        it != plugins.end(); ++it) {
     scoped_ptr<PluginMetadata> plugin_metadata(finder->GetPluginMetadata(*it));
     const std::string& group_identifier = plugin_metadata->identifier();
     if (group_identifiers.find(group_identifier) != group_identifiers.end())
       continue;
 
     group_identifiers.insert(group_identifier);
     DictionaryValue* dict = new DictionaryValue();
     dict->SetString(keys::kIdKey, group_identifier);
     dict->SetString(keys::kDescriptionKey, plugin_metadata->name());
     list->Append(dict);
   }
   SetResult(list);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, base::Bind(
-          &ContentSettingsGetResourceIdentifiersFunction::SendResponse,
-          this,
-          true));
+          &GetResourceIdentifiersFunction::SendResponse, this, true));
 }
 
 // static
-void ContentSettingsGetResourceIdentifiersFunction::SetPluginsForTesting(
+void GetResourceIdentifiersFunction::SetPluginsForTesting(
     const std::vector<webkit::WebPluginInfo>* plugins) {
   g_testing_plugins_ = plugins;
 }
 
 }  // namespace extensions