Move most of ChromeV8Context to a base ScriptContext

chrome/renderer/extensions/chrome_v8_context.h

Index: chrome/renderer/extensions/chrome_v8_context.h
diff --git a/chrome/renderer/extensions/chrome_v8_context.h b/chrome/renderer/extensions/chrome_v8_context.h
index da08b8c72ba4fc7c92f470e19b486e02f3e8ef18..60b8c0f69b61a0834e9b95ac3aebf2402b7382e6 100644
--- a/chrome/renderer/extensions/chrome_v8_context.h
+++ b/chrome/renderer/extensions/chrome_v8_context.h
@@ -9,12 +9,13 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/renderer/extensions/module_system.h"
 #include "chrome/renderer/extensions/pepper_request_proxy.h"
-#include "chrome/renderer/extensions/request_sender.h"
-#include "chrome/renderer/extensions/safe_builtins.h"
 #include "extensions/common/features/feature.h"
+#include "extensions/renderer/module_system.h"
+#include "extensions/renderer/request_sender.h"
+#include "extensions/renderer/safe_builtins.h"
 #include "extensions/renderer/scoped_persistent.h"
+#include "extensions/renderer/script_context.h"
 #include "v8/include/v8.h"
 
 namespace blink {
@@ -29,130 +30,33 @@ namespace extensions {
 class Extension;
 
 // Chrome's wrapper for a v8 context.
-class ChromeV8Context : public RequestSender::Source {
+class ChromeV8Context : public ScriptContext {

[not at google - send to devlin, 2014/04/11 15:38:55]

I'm more positive about this change. It seems well-possible that the rest of the
functionality in here, with the right changes to how request sending is done,
could mean deleting this class entirely.

  public:
   ChromeV8Context(v8::Handle<v8::Context> context,
                   blink::WebFrame* frame,
                   const Extension* extension,
                   Feature::Context context_type);
-  virtual ~ChromeV8Context();
-
-  // Clears the WebFrame for this contexts and invalidates the associated
-  // ModuleSystem.
-  void Invalidate();
-
-  // Returns true if this context is still valid, false if it isn't.
-  // A context becomes invalid via Invalidate().
-  bool is_valid() const {
-    return !v8_context_.IsEmpty();
-  }
-
-  v8::Handle<v8::Context> v8_context() const {
-    return v8_context_.NewHandle(v8::Isolate::GetCurrent());
-  }
-
-  const Extension* extension() const {
-    return extension_.get();
-  }
-
-  blink::WebFrame* web_frame() const {
-    return web_frame_;
-  }
-
-  Feature::Context context_type() const {
-    return context_type_;
-  }
-
-  void set_module_system(scoped_ptr<ModuleSystem> module_system) {
-    module_system_ = module_system.Pass();
-  }
-
-  ModuleSystem* module_system() { return module_system_.get(); }
-
-  SafeBuiltins* safe_builtins() {
-    return &safe_builtins_;
-  }
-  const SafeBuiltins* safe_builtins() const {
-    return &safe_builtins_;
-  }
 
   PepperRequestProxy* pepper_request_proxy() {
     return &pepper_request_proxy_;
   }
 
-  // Returns the ID of the extension associated with this context, or empty
-  // string if there is no such extension.
-  std::string GetExtensionID() const;
-
-  // Returns the RenderView associated with this context. Can return NULL if the
-  // context is in the process of being destroyed.
-  content::RenderView* GetRenderView() const;
-
-  // Get the URL of this context's web frame.
-  GURL GetURL() const;
-
-  // Runs |function| with appropriate scopes. Doesn't catch exceptions, callers
-  // must do that if they want.
-  //
-  // USE THIS METHOD RATHER THAN v8::Function::Call WHEREVER POSSIBLE.
-  v8::Local<v8::Value> CallFunction(v8::Handle<v8::Function> function,
-                                    int argc,
-                                    v8::Handle<v8::Value> argv[]) const;
-
-  void DispatchEvent(const char* event_name, v8::Handle<v8::Array> args) const;
-
-  // Fires the onunload event on the unload_event module.
-  void DispatchOnUnloadEvent();
-
-  // Returns the availability of the API |api_name|.
-  Feature::Availability GetAvailability(const std::string& api_name);
-
-  // Returns whether the API |api| or any part of the API could be
-  // available in this context without taking into account the context's
-  // extension.
-  bool IsAnyFeatureAvailableToContext(const extensions::Feature& api);
-
-  // Returns a string description of the type of context this is.
-  std::string GetContextTypeDescription();
+  // ScriptContext implementation.
+  virtual GURL GetURL() const OVERRIDE;
+  virtual bool IsAnyFeatureAvailableToContext(const extensions::Feature& api)
+      OVERRIDE;
 
   // RequestSender::Source implementation.
-  virtual ChromeV8Context* GetContext() OVERRIDE;
   virtual void OnResponseReceived(const std::string& name,
                                   int request_id,
                                   bool success,
                                   const base::ListValue& response,
                                   const std::string& error) OVERRIDE;
 
-  v8::Isolate* isolate() const {
-    return isolate_;
-  }
-
  private:
-  // The v8 context the bindings are accessible to.
-  ScopedPersistent<v8::Context> v8_context_;
-
-  // The WebFrame associated with this context. This can be NULL because this
-  // object can outlive is destroyed asynchronously.
-  blink::WebFrame* web_frame_;
-
-  // The extension associated with this context, or NULL if there is none. This
-  // might be a hosted app in the case that this context is hosting a web URL.
-  scoped_refptr<const Extension> extension_;
-
-  // The type of context.
-  Feature::Context context_type_;
-
-  // Owns and structures the JS that is injected to set up extension bindings.
-  scoped_ptr<ModuleSystem> module_system_;
-
-  // Contains safe copies of builtin objects like Function.prototype.
-  SafeBuiltins safe_builtins_;
-
   // The proxy for this context for making API calls from Pepper via Javascript.
   PepperRequestProxy pepper_request_proxy_;
 
-  v8::Isolate* isolate_;
-
   DISALLOW_COPY_AND_ASSIGN(ChromeV8Context);
 };