Use the new ChromeV8ContextSet in ExtensionProcessBindings::StartRequestCommon()

chrome/renderer/extensions/extension_process_bindings.cc

 // Copyright (c) 2011 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 "chrome/renderer/extensions/extension_process_bindings.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 418 matching lines @@
     return page_action_vector;
   }
 
   // Common code for starting an API request to the browser. |value_args|
   // contains the request's arguments.
   // Steals value_args contents for efficiency.
   static v8::Handle<v8::Value> StartRequestCommon(
       const v8::Arguments& args, ListValue* value_args) {
     ExtensionImpl* v8_extension = GetFromArguments<ExtensionImpl>(args);
 
+    const ChromeV8ContextSet& contexts =
+        v8_extension->extension_dispatcher()->v8_context_set();
+    ChromeV8Context* current_context = contexts.GetCurrent();
+    if (!current_context)
+      return v8::Undefined();
+
     // Get the current RenderView so that we can send a routed IPC message from
     // the correct source.
-    content::RenderView* renderview = GetCurrentRenderView();
+    content::RenderView* renderview = current_context->GetRenderView();
     if (!renderview)
       return v8::Undefined();
 
     std::string name = *v8::String::AsciiValue(args[0]);
     const std::set<std::string>& function_names =
         v8_extension->extension_dispatcher_->function_names();
     if (function_names.find(name) == function_names.end()) {
       NOTREACHED() << "Unexpected function " << name;
       return v8::Undefined();
     }
 
+    // TODO: add this to ChromeV8Context.

[Aaron Boodman, 2011/10/28 23:29:46]

TODO(aa)

[Tessa MacDuff, 2011/10/29 00:06:54]

Done.

     if (!v8_extension->CheckPermissionForCurrentRenderView(name))
       return v8::Undefined();
 
     GURL source_url;
-    WebFrame* webframe = WebFrame::frameForCurrentContext();
+    WebFrame* webframe = current_context->web_frame();
     if (webframe)
       source_url = webframe->document().url();
 
     int request_id = args[2]->Int32Value();
     bool has_callback = args[3]->BooleanValue();
     bool for_io_thread = args[4]->BooleanValue();
 
-    v8::Persistent<v8::Context> current_context =
+    v8::Persistent<v8::Context> persistent_context =

[Aaron Boodman, 2011/10/28 23:29:46]

Better name is v8_context to distinguish from "normal" or "chrome" context.

[Tessa MacDuff, 2011/10/29 00:06:54]

Done.

         v8::Persistent<v8::Context>::New(v8::Context::GetCurrent());
-    DCHECK(!current_context.IsEmpty());
+    DCHECK(!persistent_context.IsEmpty());
     g_pending_requests.Get()[request_id].reset(new PendingRequest(
-        current_context, name));
+        persistent_context, name));
 
     ExtensionHostMsg_Request_Params params;
     params.name = name;
     params.arguments.Swap(value_args);
     params.source_url = source_url;
     params.request_id = request_id;
     params.has_callback = has_callback;
     params.user_gesture =
         webframe ? webframe->isProcessingUserGesture() : false;
     if (for_io_thread) {
@@ skipping 152 matching lines @@
   if (!retval.IsEmpty() && !retval->IsUndefined()) {
     std::string error = *v8::String::AsciiValue(retval);
     DCHECK(false) << error;
   }
 #endif
 
   request->second->context.Dispose();
   request->second->context.Clear();
   g_pending_requests.Get().erase(request);
 }