Extract executeScript-like functionality into a single ExtensionScriptExecutor class.

chrome/browser/extensions/extension_tabs_module.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_TABS_MODULE_H__
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_TABS_MODULE_H__
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #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;
 class Extension;
 class GURL;
 class SkBitmap;
 class TabContentsWrapper;
 namespace base {
 class DictionaryValue;
 }  // namespace base
@@ skipping 79 matching lines @@
 class CreateTabFunction : public SyncExtensionFunction {
   virtual ~CreateTabFunction() {}
   virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.create")
 };
 class HighlightTabsFunction : public SyncExtensionFunction {
   virtual ~HighlightTabsFunction() {}
   virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.highlight")
 };
-class UpdateTabFunction : public AsyncExtensionFunction,
-                          public content::WebContentsObserver {
+class UpdateTabFunction : public AsyncExtensionFunction {
  public:
   UpdateTabFunction();
 
  protected:
   virtual ~UpdateTabFunction() {}
   virtual bool UpdateURLIfPresent(base::DictionaryValue* update_props,
                                   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")
 };
 class MoveTabsFunction : public SyncExtensionFunction {
   virtual ~MoveTabsFunction() {}
   virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.move")
 };
 class ReloadTabFunction : public SyncExtensionFunction {
   virtual ~ReloadTabFunction() {}
@@ skipping 47 matching lines @@
   // The format (JPEG vs PNG) of the resulting image.  Set in RunImpl().
   ImageFormat image_format_;
 
   // Quality setting to use when encoding jpegs.  Set in RunImpl().
   int image_quality_;
 
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.captureVisibleTab")
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_TABS_MODULE_H__