Move most of ChromeV8Context to a base ScriptContext

chrome/renderer/extensions/chrome_v8_context.cc

Index: chrome/renderer/extensions/chrome_v8_context.cc
diff --git a/chrome/renderer/extensions/chrome_v8_context.cc b/chrome/renderer/extensions/chrome_v8_context.cc
index 24fad4aacb8d05736f40f6b7aa52ba9794a6edce..d220aa81329149bdd8d4e5df19d9eb1e50f28bfb 100644
--- a/chrome/renderer/extensions/chrome_v8_context.cc
+++ b/chrome/renderer/extensions/chrome_v8_context.cc
@@ -4,22 +4,16 @@
 
 #include "chrome/renderer/extensions/chrome_v8_context.h"
 
-#include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/values.h"
-#include "chrome/renderer/extensions/chrome_v8_extension.h"
-#include "chrome/renderer/extensions/module_system.h"
 #include "chrome/renderer/extensions/user_script_slave.h"
-#include "content/public/renderer/render_view.h"
 #include "content/public/renderer/v8_value_converter.h"
-#include "extensions/common/extension.h"
 #include "extensions/common/extension_api.h"
 #include "extensions/common/extension_urls.h"
 #include "extensions/common/features/base_feature_provider.h"
+#include "extensions/renderer/module_system.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
-#include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
-#include "third_party/WebKit/public/web/WebView.h"
 #include "v8/include/v8.h"
 
 using content::V8ValueConverter;
@@ -30,126 +24,20 @@ ChromeV8Context::ChromeV8Context(v8::Handle<v8::Context> v8_context,
                                  blink::WebFrame* web_frame,
                                  const Extension* extension,
                                  Feature::Context context_type)
-    : v8_context_(v8_context),
-      web_frame_(web_frame),
-      extension_(extension),
-      context_type_(context_type),
-      safe_builtins_(this),
-      pepper_request_proxy_(this),
-      isolate_(v8_context->GetIsolate()) {
-  VLOG(1) << "Created context:\n"
-          << "  extension id: " << GetExtensionID() << "\n"
-          << "  frame:        " << web_frame_ << "\n"
-          << "  context type: " << GetContextTypeDescription();
-}
-
-ChromeV8Context::~ChromeV8Context() {
-  VLOG(1) << "Destroyed context for extension\n"
-          << "  extension id: " << GetExtensionID();
-  Invalidate();
-}
-
-void ChromeV8Context::Invalidate() {
-  if (!is_valid())
-    return;
-  if (module_system_)
-    module_system_->Invalidate();
-  web_frame_ = NULL;
-  v8_context_.reset();
-}
-
-std::string ChromeV8Context::GetExtensionID() const {
-  return extension_.get() ? extension_->id() : std::string();
-}
-
-content::RenderView* ChromeV8Context::GetRenderView() const {
-  if (web_frame_ && web_frame_->view())
-    return content::RenderView::FromWebView(web_frame_->view());
-  else
-    return NULL;
-}
+    : ScriptContext(v8_context, web_frame, extension, context_type),
+      pepper_request_proxy_(this) {}
 
 GURL ChromeV8Context::GetURL() const {
-  return web_frame_ ?
-      UserScriptSlave::GetDataSourceURLForFrame(web_frame_) : GURL();
-}
-
-v8::Local<v8::Value> ChromeV8Context::CallFunction(
-    v8::Handle<v8::Function> function,
-    int argc,
-    v8::Handle<v8::Value> argv[]) const {
-  v8::EscapableHandleScope handle_scope(isolate());
-  v8::Context::Scope scope(v8_context());
-
-  blink::WebScopedMicrotaskSuppression suppression;
-  if (!is_valid()) {
-    return handle_scope.Escape(
-        v8::Local<v8::Primitive>(v8::Undefined(isolate())));
-  }
-
-  v8::Handle<v8::Object> global = v8_context()->Global();
-  if (!web_frame_)
-    return handle_scope.Escape(function->Call(global, argc, argv));
-  return handle_scope.Escape(
-      v8::Local<v8::Value>(web_frame_->callFunctionEvenIfScriptDisabled(
-          function, global, argc, argv)));
+  return web_frame() ? UserScriptSlave::GetDataSourceURLForFrame(web_frame())
+                     : GURL();
 }
 
 bool ChromeV8Context::IsAnyFeatureAvailableToContext(const Feature& api) {
   return ExtensionAPI::GetSharedInstance()->IsAnyFeatureAvailableToContext(
       api,
-      extension_.get(),
-      context_type_,
-      UserScriptSlave::GetDataSourceURLForFrame(web_frame_));
-}
-
-Feature::Availability ChromeV8Context::GetAvailability(
-    const std::string& api_name) {
-  // Hack: Hosted apps should have the availability of messaging APIs based on
-  // the URL of the page (which might have access depending on some extension
-  // with externally_connectable), not whether the app has access to messaging
-  // (which it won't).
-  const Extension* extension = extension_.get();
-  if (extension && extension->is_hosted_app() &&
-      (api_name == "runtime.connect" || api_name == "runtime.sendMessage")) {
-    extension = NULL;
-  }
-  return ExtensionAPI::GetSharedInstance()->IsAvailable(api_name,
-                                                        extension,
-                                                        context_type_,
-                                                        GetURL());
-}
-
-void ChromeV8Context::DispatchEvent(const char* event_name,
-                                    v8::Handle<v8::Array> args) const {
-  v8::HandleScope handle_scope(isolate());
-  v8::Context::Scope context_scope(v8_context());
-
-  v8::Handle<v8::Value> argv[] = {
-      v8::String::NewFromUtf8(isolate(), event_name), args};
-  module_system_->CallModuleMethod(
-      kEventBindings, "dispatchEvent", arraysize(argv), argv);
-}
-
-void ChromeV8Context::DispatchOnUnloadEvent() {
-  module_system_->CallModuleMethod("unload_event", "dispatch");
-}
-
-std::string ChromeV8Context::GetContextTypeDescription() {
-  switch (context_type_) {
-    case Feature::UNSPECIFIED_CONTEXT:         return "UNSPECIFIED";
-    case Feature::BLESSED_EXTENSION_CONTEXT:   return "BLESSED_EXTENSION";
-    case Feature::UNBLESSED_EXTENSION_CONTEXT: return "UNBLESSED_EXTENSION";
-    case Feature::CONTENT_SCRIPT_CONTEXT:      return "CONTENT_SCRIPT";
-    case Feature::WEB_PAGE_CONTEXT:            return "WEB_PAGE";
-    case Feature::BLESSED_WEB_PAGE_CONTEXT:    return "BLESSED_WEB_PAGE";
-  }
-  NOTREACHED();
-  return std::string();
-}
-
-ChromeV8Context* ChromeV8Context::GetContext() {
-  return this;
+      extension(),
+      context_type(),
+      UserScriptSlave::GetDataSourceURLForFrame(web_frame()));
 }
 
 void ChromeV8Context::OnResponseReceived(const std::string& name,
@@ -168,7 +56,7 @@ void ChromeV8Context::OnResponseReceived(const std::string& name,
     v8::String::NewFromUtf8(isolate(), error.c_str())
   };
 
-  v8::Handle<v8::Value> retval = module_system_->CallModuleMethod(
+  v8::Handle<v8::Value> retval = module_system()->CallModuleMethod(
       "sendRequest", "handleResponse", arraysize(argv), argv);
 
   // In debug, the js will validate the callback parameters and return a