Drive extension functions from ExtensionFunction::Run. The

chrome/browser/extensions/chrome_extension_function.h

Index: chrome/browser/extensions/chrome_extension_function.h
diff --git a/chrome/browser/extensions/chrome_extension_function.h b/chrome/browser/extensions/chrome_extension_function.h
index 40fc5391c0b49ea8ca68a9fdd33a9008e82676a5..6536a7659b17740a35408d06eb74681896ab331b 100644
--- a/chrome/browser/extensions/chrome_extension_function.h
+++ b/chrome/browser/extensions/chrome_extension_function.h
@@ -18,11 +18,11 @@ namespace extensions {
 class WindowController;
 }
 
-// A chrome specific analog to AsyncExtensionFunction. This has access
-// the a chrome Profile.
-class ChromeAsyncExtensionFunction : public UIThreadExtensionFunction {
+// A chrome specific analog to AsyncExtensionFunction. This has access to a
+// chrome Profile.
+class ChromeUIThreadExtensionFunction : public UIThreadExtensionFunction {
  public:
-  ChromeAsyncExtensionFunction();
+  ChromeUIThreadExtensionFunction();
 
   Profile* GetProfile() const;
 
@@ -59,21 +59,39 @@ class ChromeAsyncExtensionFunction : public UIThreadExtensionFunction {
   virtual content::WebContents* GetAssociatedWebContents() OVERRIDE;
 
  protected:
+  virtual ~ChromeUIThreadExtensionFunction();
+};
+
+// A chrome specific analog to AsyncExtensionFunction. This has access to a
+// chrome Profile.
+class ChromeAsyncExtensionFunction : public ChromeUIThreadExtensionFunction {
+ public:
+  ChromeAsyncExtensionFunction();
+
+ protected:
   virtual ~ChromeAsyncExtensionFunction();
+
+  // Deprecated, see AsyncExtensionFunction::RunAsync.
+  virtual bool RunAsync() = 0;
+
+ private:
+  virtual ResponseAction Run() OVERRIDE;
 };
 
-// A chrome specific analog to SyncExtensionFunction. This has access
-// the a chrome Profile.
-class ChromeSyncExtensionFunction : public ChromeAsyncExtensionFunction {
+// A chrome specific analog to SyncExtensionFunction. This has access to a
+// chrome Profile.
+class ChromeSyncExtensionFunction : public ChromeUIThreadExtensionFunction {
  public:
   ChromeSyncExtensionFunction();
 
-  virtual bool RunImpl() OVERRIDE;
+ protected:
+  virtual ~ChromeSyncExtensionFunction();
 
+  // Deprecated, see SyncExtensionFunction::RunSync.
   virtual bool RunSync() = 0;
 
- protected:
-  virtual ~ChromeSyncExtensionFunction();
+ private:
+  virtual ResponseAction Run() OVERRIDE;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_CHROME_EXTENSION_FUNCTION_H_