Fix a couple of bugs relating to sending Tab info with chrome.runtime.connect and

chrome/renderer/extensions/miscellaneous_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/miscellaneous_bindings.h"
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
+#include "base/values.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/message_bundle.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/extensions/chrome_v8_context.h"
 #include "chrome/renderer/extensions/chrome_v8_context_set.h"
 #include "chrome/renderer/extensions/chrome_v8_extension.h"
 #include "chrome/renderer/extensions/dispatcher.h"
 #include "chrome/renderer/extensions/event_bindings.h"
 #include "chrome/renderer/extensions/scoped_persistent.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
+#include "content/public/renderer/v8_value_converter.h"
 #include "grit/renderer_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScopedMicrotaskSuppression.h"
 #include "v8/include/v8.h"
 
 // Message passing API example (in a content script):
 // var extension =
 //    new chrome.Extension('00123456789abcdef0123456789abcdef0123456');
 // var port = runtime.connect();
 // port.postMessage('Can you hear me now?');
 // port.onmessage.addListener(function(msg, port) {
 //   alert('response=' + msg);
 //   port.postMessage('I got your reponse');
 // });
 
 using content::RenderThread;
+using content::V8ValueConverter;
 
 namespace {
 
 struct ExtensionData {
   struct PortData {
     int ref_count;  // how many contexts have a handle to this port
     PortData() : ref_count(0) {}
   };
   std::map<int, PortData> ports;  // port ID -> data
 };
@@ skipping 145 matching lines @@
     Dispatcher* dispatcher,
     v8::Handle<v8::Context> context) {
   return new ExtensionImpl(dispatcher, context);
 }
 
 // static
 void MiscellaneousBindings::DispatchOnConnect(
     const ChromeV8ContextSet::ContextSet& contexts,
     int target_port_id,
     const std::string& channel_name,
-    const std::string& tab_json,
+    const base::DictionaryValue& source_tab,
     const std::string& source_extension_id,
     const std::string& target_extension_id,
+    const GURL& source_url,
     content::RenderView* restrict_to_render_view) {
   v8::HandleScope handle_scope;
 
+  scoped_ptr<V8ValueConverter> converter(V8ValueConverter::create());
+
   bool port_created = false;
+  std::string source_url_spec = source_url.spec();
 
   for (ChromeV8ContextSet::ContextSet::const_iterator it = contexts.begin();
        it != contexts.end(); ++it) {
     if (restrict_to_render_view &&
         restrict_to_render_view != (*it)->GetRenderView()) {
       continue;
     }
 
-    std::vector<v8::Handle<v8::Value> > arguments;
-    arguments.push_back(v8::Integer::New(target_port_id));
-    arguments.push_back(v8::String::New(channel_name.c_str(),
-                                        channel_name.size()));
-    arguments.push_back(v8::String::New(tab_json.c_str(),
-                                        tab_json.size()));
-    arguments.push_back(v8::String::New(source_extension_id.c_str(),
-                                        source_extension_id.size()));
-    arguments.push_back(v8::String::New(target_extension_id.c_str(),
-                                        target_extension_id.size()));
+    v8::Handle<v8::Value> tab = v8::Null();
+    if (!source_tab.empty())
+      tab = converter->ToV8Value(&source_tab, (*it)->v8_context());
+
+    v8::Handle<v8::Value> arguments[] = {
+      v8::Integer::New(target_port_id),
+      v8::String::New(channel_name.c_str(), channel_name.size()),
+      tab,
+      v8::String::New(source_extension_id.c_str(), source_extension_id.size()),
+      v8::String::New(target_extension_id.c_str(), target_extension_id.size()),
+      v8::String::New(source_url_spec.c_str(), source_url_spec.size())
+    };
+
     v8::Handle<v8::Value> retval;
     v8::TryCatch try_catch;
     if (!(*it)->CallChromeHiddenMethod("Port.dispatchOnConnect",
-                                      arguments.size(), &arguments[0],
+                                      arraysize(arguments), arguments,
                                       &retval)) {
       continue;
     }
 
     if (try_catch.HasCaught()) {
       LOG(ERROR) << "Exception caught when calling Port.dispatchOnConnect.";
       continue;
     }
 
     if (retval.IsEmpty()) {
@@ skipping 81 matching lines @@
     } else {
       arguments.push_back(v8::Null());
     }
     (*it)->CallChromeHiddenMethod("Port.dispatchOnDisconnect",
                                   arguments.size(), &arguments[0],
                                   NULL);
   }
 }
 
 }  // namespace extensions