Split out the extensions gin::Runner implementation into a separate class.

extensions/renderer/script_context.cc

 // Copyright 2014 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.
 
 #include "extensions/renderer/script_context.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 38 matching lines @@
       return "BLESSED_WEB_PAGE";
     case Feature::WEBUI_CONTEXT:
       return "WEBUI";
   }
   NOTREACHED();
   return std::string();
 }
 
 }  // namespace
 
+// A gin::Runner that delegates to its ScriptContext.
+class ScriptContext::Runner : public gin::Runner {
+ public:
+  explicit Runner(ScriptContext* context);
+
+  // gin::Runner overrides.
+  void Run(const std::string& source,
+           const std::string& resource_name) override;
+  v8::Handle<v8::Value> Call(v8::Handle<v8::Function> function,
+                             v8::Handle<v8::Value> receiver,
+                             int argc,
+                             v8::Handle<v8::Value> argv[]) override;
+  gin::ContextHolder* GetContextHolder() override;
+
+ private:
+  ScriptContext* context_;
+};
+
 ScriptContext::ScriptContext(const v8::Handle<v8::Context>& v8_context,
                              blink::WebFrame* web_frame,
                              const Extension* extension,
                              Feature::Context context_type,
                              const Extension* effective_extension,
                              Feature::Context effective_context_type)
     : v8_context_(v8_context),
       web_frame_(web_frame),
       extension_(extension),
       context_type_(context_type),
       effective_extension_(effective_extension),
       effective_context_type_(effective_context_type),
       safe_builtins_(this),
       isolate_(v8_context->GetIsolate()),
-      url_(web_frame_ ? GetDataSourceURLForFrame(web_frame_) : GURL()) {
+      url_(web_frame_ ? GetDataSourceURLForFrame(web_frame_) : GURL()),
+      runner_(new Runner(this)) {
   VLOG(1) << "Created context:\n"
           << "  extension id: " << GetExtensionID() << "\n"
           << "  frame:        " << web_frame_ << "\n"
           << "  URL:          " << GetURL() << "\n"
           << "  context type: " << GetContextTypeDescription() << "\n"
           << "  effective extension id: "
           << (effective_extension_.get() ? effective_extension_->id() : "")
           << "  effective context type: "
           << GetEffectiveContextTypeDescription();
-  gin::PerContextData::From(v8_context)->set_runner(this);
+  gin::PerContextData::From(v8_context)->set_runner(runner_.get());
 }
 
 ScriptContext::~ScriptContext() {
   VLOG(1) << "Destroyed context for extension\n"
           << "  extension id: " << GetExtensionID() << "\n"
           << "  effective extension id: "
           << (effective_extension_.get() ? effective_extension_->id() : "");
   Invalidate();
 }
 
 void ScriptContext::Invalidate() {
   if (!is_valid())
     return;
   if (module_system_)
     module_system_->Invalidate();
   web_frame_ = NULL;
   v8_context_.reset();
+  runner_.reset();
 }
 
 const std::string& ScriptContext::GetExtensionID() const {
   return extension_.get() ? extension_->id() : base::EmptyString();
 }
 
 content::RenderView* ScriptContext::GetRenderView() const {
   if (web_frame_ && web_frame_->view())
     return content::RenderView::FromWebView(web_frame_->view());
   return NULL;
@@ skipping 139 matching lines @@
 
   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
   // string if a validation error has occured.
   DCHECK(retval.IsEmpty() || retval->IsUndefined())
       << *v8::String::Utf8Value(retval);
 }
 
-void ScriptContext::Run(const std::string& source,
-                        const std::string& resource_name) {
-  module_system_->RunString(source, resource_name);
-}
-
-v8::Handle<v8::Value> ScriptContext::Call(v8::Handle<v8::Function> function,
-                                          v8::Handle<v8::Value> receiver,
-                                          int argc,
-                                          v8::Handle<v8::Value> argv[]) {
-  return CallFunction(function, argc, argv);
-}
-
-gin::ContextHolder* ScriptContext::GetContextHolder() {
-  v8::HandleScope handle_scope(isolate());
-  return gin::PerContextData::From(v8_context())->context_holder();
-}
-
 void ScriptContext::SetContentCapabilities(
     const APIPermissionSet& permissions) {
   content_capabilities_ = permissions;
 }
 
 bool ScriptContext::HasAPIPermission(APIPermission::ID permission) const {
   if (effective_extension_.get()) {
     return effective_extension_->permissions_data()->HasAPIPermission(
         permission);
   } else if (context_type() == Feature::WEB_PAGE_CONTEXT) {
     // Only web page contexts may be granted content capabilities. Other
     // contexts are either privileged WebUI or extensions with their own set of
     // permissions.
     if (content_capabilities_.find(permission) != content_capabilities_.end())
       return true;
   }
   return false;
 }
 
+ScriptContext::Runner::Runner(ScriptContext* context) : context_(context) {
+}
+void ScriptContext::Runner::Run(const std::string& source,
+                                const std::string& resource_name) {
+  context_->module_system()->RunString(source, resource_name);
+}
+
+v8::Handle<v8::Value> ScriptContext::Runner::Call(
+    v8::Handle<v8::Function> function,
+    v8::Handle<v8::Value> receiver,
+    int argc,
+    v8::Handle<v8::Value> argv[]) {
+  return context_->CallFunction(function, argc, argv);
+}
+
+gin::ContextHolder* ScriptContext::Runner::GetContextHolder() {
+  v8::HandleScope handle_scope(context_->isolate());
+  return gin::PerContextData::From(context_->v8_context())->context_holder();
+}
+
 }  // namespace extensions