Split V8Proxy::retrieveActiveFrame() into two methods.

chrome/renderer/extensions/extension_process_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/extension_process_bindings.h"
 
 #include "base/singleton.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
 #include "chrome/renderer/extensions/event_bindings.h"
@@ skipping 51 matching lines @@
   static std::set<std::string>* GetFunctionNameSet() {
     return &Singleton<SingletonData>()->function_names_;
   }
 
   static v8::Handle<v8::Value> GetNextCallbackId(const v8::Arguments& args) {
     static int next_callback_id = 0;
     return v8::Integer::New(next_callback_id++);
   }
 
   static v8::Handle<v8::Value> StartRequest(const v8::Arguments& args) {
-    WebFrame* webframe = WebFrame::RetrieveActiveFrame();
-    RenderView* renderview = GetActiveRenderView();
+    // Get the current RenderView so that we can send a routed IPC message from
+    // the correct source.
+    WebFrame* webframe = WebFrame::RetrieveFrameForCurrentContext();
+    RenderView* renderview = GetRenderViewForCurrentContext();
     if (!webframe || !renderview)
       return v8::Undefined();
 
     if (args.Length() != 2 || !args[0]->IsString() || !args[1]->IsInt32())
       return v8::Undefined();
 
     int callback_id = args[1]->Int32Value();
     renderview->SendExtensionRequest(
         std::string(*v8::String::AsciiValue(args.Data())),
         std::string(*v8::String::Utf8Value(args[0])),
@@ skipping 21 matching lines @@
   code += ", '";
 
   size_t offset = code.length();
   code += response;
   ReplaceSubstringsAfterOffset(&code, offset, "\\", "\\\\");
   ReplaceSubstringsAfterOffset(&code, offset, "'", "\\'");
   code += "')";
 
   frame->ExecuteScript(WebScriptSource(WebString::fromUTF8(code)));
 }