Split V8Proxy::retrieveActiveFrame() into two methods.

chrome/renderer/extensions/renderer_extension_bindings.cc

 // Copyright (c) 2009 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/renderer_extension_bindings.h"
 
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
@@ skipping 31 matching lines @@
       return v8::FunctionTemplate::New(OpenChannelToExtension);
     } else if (name->Equals(v8::String::New("PostMessage"))) {
       return v8::FunctionTemplate::New(PostMessage);
     }
     return v8::Handle<v8::FunctionTemplate>();
   }
 
   // Creates a new messaging channel to the given extension.
   static v8::Handle<v8::Value> OpenChannelToExtension(
       const v8::Arguments& args) {
-    RenderView* renderview = GetActiveRenderView();
+    // Get the current RenderView so that we can send a routed IPC message from
+    // the correct source.
+    RenderView* renderview = GetRenderViewForCurrentContext();
     if (!renderview)
       return v8::Undefined();
 
     if (args.Length() >= 1 && args[0]->IsString()) {
       std::string id = *v8::String::Utf8Value(args[0]->ToString());
       int port_id = -1;
       renderview->Send(new ViewHostMsg_OpenChannelToExtension(
           renderview->routing_id(), id, &port_id));
       return v8::Integer::New(port_id);
     }
     return v8::Undefined();
   }
 
   // Sends a message along the given channel.
   static v8::Handle<v8::Value> PostMessage(const v8::Arguments& args) {
-    RenderView* renderview = GetActiveRenderView();
+    RenderView* renderview = GetRenderViewForCurrentContext();
     if (!renderview)
       return v8::Undefined();
 
     if (args.Length() >= 2 && args[0]->IsInt32() && args[1]->IsString()) {
       int port_id = args[0]->Int32Value();
       std::string message = *v8::String::Utf8Value(args[1]->ToString());
       renderview->Send(new ViewHostMsg_ExtensionPostMessage(
           renderview->routing_id(), port_id, message));
     }
     return v8::Undefined();
@@ skipping 32 matching lines @@
 void RendererExtensionBindings::HandleEvent(const std::string& event_name,
                                             const std::string& args) {
   v8::HandleScope handle_scope;
   v8::Handle<v8::Value> argv[2];
   argv[0] = v8::String::New(event_name.c_str());
   argv[1] = v8::String::New(args.c_str());
 
   EventBindings::CallFunction("chrome.Event.dispatchJSON_",
                               arraysize(argv), argv);
 }