Extract executeScript-like functionality into a single ExtensionScriptExecutor class.

chrome/browser/extensions/extension_tabs_module.h

Index: chrome/browser/extensions/extension_tabs_module.h
diff --git a/chrome/browser/extensions/extension_tabs_module.h b/chrome/browser/extensions/extension_tabs_module.h
index 085b7437733c31195c734e4eb9918c8069110abf..7d9d81d4043f329ff1a97c5b592b37fff99ae2eb 100644
--- a/chrome/browser/extensions/extension_tabs_module.h
+++ b/chrome/browser/extensions/extension_tabs_module.h
@@ -13,7 +13,6 @@
 #include "chrome/browser/extensions/extension_function.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "content/public/browser/web_contents_observer.h"
 #include "googleurl/src/gurl.h"
 
 class BackingStore;
@@ -113,8 +112,7 @@ class HighlightTabsFunction : public SyncExtensionFunction {
   virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.highlight")
 };
-class UpdateTabFunction : public AsyncExtensionFunction,
-                          public content::WebContentsObserver {
+class UpdateTabFunction : public AsyncExtensionFunction {
  public:
   UpdateTabFunction();
 
@@ -124,15 +122,11 @@ class UpdateTabFunction : public AsyncExtensionFunction,
                                   bool* is_async);
   virtual void PopulateResult();
 
-  content::WebContents* web_contents_;
+  TabContentsWrapper* tab_contents_;

[koz (OOO until 15th September), 2012/05/11 01:09:16]

I was going to suggest renaming this to tab_contents_wrapper_ (which would
create a lot of wrapping, ho!), but apparently TabContentsWrapper is going to be
renamed to TabContents, so maybe this name is okay.

[not at google - send to devlin, 2012/05/14 02:27:16]

Yeah, seems to be pretty standard thing to call this. That, or "wrapper" or
"contents" or...

 
  private:
   virtual bool RunImpl() OVERRIDE;
-  virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  void OnExecuteCodeFinished(int request_id,
-                             bool success,
-                             const std::string& error);
+  void OnExecuteCodeFinished(bool success, const std::string& error);
 
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.update")
 };