Drive extension functions from ExtensionFunction::Run. The

SyncExtensionFunction and AsyncExtensionFunction derivates now expose RunSync
and RunAsync respectively. New extension function implementations should just
implement Run directly.


BUG=365732
R=rockot@chromium.org
TBR=dmazzoni@chromium.org

Review URL: https://codereview.chromium.org/257333002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268033 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 11 insertions, 11 deletions

diff --git a/chrome/browser/extensions/api/declarative/declarative_api.cc b/chrome/browser/extensions/api/declarative/declarative_api.cc
index 7a644c2..dbb22a6 100644
--- a/chrome/browser/extensions/api/declarative/declarative_api.cc
+++ b/chrome/browser/extensions/api/declarative/declarative_api.cc
@@ -68,7 +68,7 @@ bool RulesFunction::HasPermission() {
   return availability.is_available();
 }
 
-bool RulesFunction::RunImpl() {
+bool RulesFunction::RunAsync() {
   std::string event_name;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &event_name));
 
@@ -93,7 +93,7 @@ bool RulesFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(rules_registry_.get());
 
   if (content::BrowserThread::CurrentlyOn(rules_registry_->owner_thread())) {
-    bool success = RunImplOnCorrectThread();
+    bool success = RunAsyncOnCorrectThread();
     SendResponse(success);
   } else {
     scoped_refptr<base::MessageLoopProxy> message_loop_proxy =
@@ -102,14 +102,14 @@ bool RulesFunction::RunImpl() {
     base::PostTaskAndReplyWithResult(
         message_loop_proxy.get(),
         FROM_HERE,
-        base::Bind(&RulesFunction::RunImplOnCorrectThread, this),
+        base::Bind(&RulesFunction::RunAsyncOnCorrectThread, this),
         base::Bind(&RulesFunction::SendResponse, this));
   }
 
   return true;
 }
 
-bool EventsEventAddRulesFunction::RunImplOnCorrectThread() {
+bool EventsEventAddRulesFunction::RunAsyncOnCorrectThread() {
   scoped_ptr<AddRules::Params> params(AddRules::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
@@ -121,7 +121,7 @@ bool EventsEventAddRulesFunction::RunImplOnCorrectThread() {
   return error_.empty();
 }
 
-bool EventsEventRemoveRulesFunction::RunImplOnCorrectThread() {
+bool EventsEventRemoveRulesFunction::RunAsyncOnCorrectThread() {
   scoped_ptr<RemoveRules::Params> params(RemoveRules::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
@@ -135,7 +135,7 @@ bool EventsEventRemoveRulesFunction::RunImplOnCorrectThread() {
   return error_.empty();
 }
 
-bool EventsEventGetRulesFunction::RunImplOnCorrectThread() {
+bool EventsEventGetRulesFunction::RunAsyncOnCorrectThread() {
   scoped_ptr<GetRules::Params> params(GetRules::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
diff --git a/chrome/browser/extensions/api/declarative/declarative_api.h b/chrome/browser/extensions/api/declarative/declarative_api.h
index f740a3e..502e2fa 100644
--- a/chrome/browser/extensions/api/declarative/declarative_api.h
+++ b/chrome/browser/extensions/api/declarative/declarative_api.h
@@ -21,12 +21,12 @@ class RulesFunction : public ChromeAsyncExtensionFunction {
 
   // ExtensionFunction:
   virtual bool HasPermission() OVERRIDE;
-  virtual bool RunImpl() OVERRIDE;
+  virtual bool RunAsync() OVERRIDE;
 
   // Concrete implementation of the RulesFunction that is being called
   // on the thread on which the respective RulesRegistry lives.
   // Returns false in case of errors.
-  virtual bool RunImplOnCorrectThread() = 0;
+  virtual bool RunAsyncOnCorrectThread() = 0;
 
   scoped_refptr<RulesRegistry> rules_registry_;
 };
@@ -39,7 +39,7 @@ class EventsEventAddRulesFunction : public RulesFunction {
   virtual ~EventsEventAddRulesFunction() {}
 
   // RulesFunction:
-  virtual bool RunImplOnCorrectThread() OVERRIDE;
+  virtual bool RunAsyncOnCorrectThread() OVERRIDE;
 };
 
 class EventsEventRemoveRulesFunction : public RulesFunction {
@@ -50,7 +50,7 @@ class EventsEventRemoveRulesFunction : public RulesFunction {
   virtual ~EventsEventRemoveRulesFunction() {}
 
   // RulesFunction:
-  virtual bool RunImplOnCorrectThread() OVERRIDE;
+  virtual bool RunAsyncOnCorrectThread() OVERRIDE;
 };
 
 class EventsEventGetRulesFunction : public RulesFunction {
@@ -61,7 +61,7 @@ class EventsEventGetRulesFunction : public RulesFunction {
   virtual ~EventsEventGetRulesFunction() {}
 
   // RulesFunction:
-  virtual bool RunImplOnCorrectThread() OVERRIDE;
+  virtual bool RunAsyncOnCorrectThread() OVERRIDE;
 };
 
 }  // namespace extensions