In extension messaging, use the sender frame's URL as the sender URL rather

chrome/renderer/extensions/runtime_custom_bindings.cc

 // Copyright (c) 2012 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/runtime_custom_bindings.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 36 matching lines @@
   // the correct source.
   content::RenderView* renderview = GetRenderView();
   if (!renderview)
     return;
 
   // The Javascript code should validate/fill the arguments.
   CHECK_EQ(2, args.Length());
   CHECK(args[0]->IsString() && args[1]->IsString());
 
   ExtensionMsg_ExternalConnectionInfo info;
-  info.source_id = context()->extension() ? context()->extension()->id() : "";
+  info.source_id = context()->GetExtensionID();
   info.target_id = *v8::String::Utf8Value(args[0]->ToString());
-  info.source_url = renderview->GetWebView()->mainFrame()->document().url();
+  info.source_url = context()->GetURL();
   std::string channel_name = *v8::String::Utf8Value(args[1]->ToString());
   int port_id = -1;
   renderview->Send(new ExtensionHostMsg_OpenChannelToExtension(
       renderview->GetRoutingID(), info, channel_name, &port_id));
   args.GetReturnValue().Set(static_cast<int32_t>(port_id));
 }
 
 void RuntimeCustomBindings::OpenChannelToNativeApp(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   // Verify that the extension has permission to use native messaging.
@@ skipping 37 matching lines @@
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   CHECK(context()->extension());
 
   scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
   args.GetReturnValue().Set(
       converter->ToV8Value(context()->extension()->manifest()->value(),
                            context()->v8_context()));
 }
 
 }  // namespace extensions