Revert 176015

chrome/browser/extensions/api/declarative/declarative_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/declarative/declarative_api.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/task_runner_util.h"
 #include "base/values.h"
@@ skipping 43 matching lines @@
     base::PostTaskAndReplyWithResult(
         message_loop_proxy,
         FROM_HERE,
         base::Bind(&RulesFunction::RunImplOnCorrectThread, this),
         base::Bind(&RulesFunction::SendResponse, this));
   }
 
   return true;
 }
 
-bool EventsAddRulesFunction::RunImplOnCorrectThread() {
+bool AddRulesFunction::RunImplOnCorrectThread() {
   scoped_ptr<AddRules::Params> params(AddRules::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   error_ = rules_registry_->AddRules(extension_id(), params->rules);
 
   if (error_.empty())
     results_ = AddRules::Results::Create(params->rules);
 
   return error_.empty();
 }
 
-bool EventsRemoveRulesFunction::RunImplOnCorrectThread() {
+bool RemoveRulesFunction::RunImplOnCorrectThread() {
   scoped_ptr<RemoveRules::Params> params(RemoveRules::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   if (params->rule_identifiers.get()) {
     error_ = rules_registry_->RemoveRules(extension_id(),
                                           *params->rule_identifiers);
   } else {
     error_ = rules_registry_->RemoveAllRules(extension_id());
   }
 
   return error_.empty();
 }
 
-bool EventsGetRulesFunction::RunImplOnCorrectThread() {
+bool GetRulesFunction::RunImplOnCorrectThread() {
   scoped_ptr<GetRules::Params> params(GetRules::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   std::vector<linked_ptr<Rule> > rules;
   if (params->rule_identifiers.get()) {
     error_ = rules_registry_->GetRules(extension_id(),
                                        *params->rule_identifiers,
                                        &rules);
   } else {
     error_ = rules_registry_->GetAllRules(extension_id(), &rules);
   }
 
   if (error_.empty())
     results_ = GetRules::Results::Create(rules);
 
   return error_.empty();
 }
 
 }  // namespace extensions