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

chrome/test/data/extensions/api_test/messaging/connect/test.js

 // 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.
 
 JSON.parse = function() {
   return "JSON.parse clobbered by extension.";
 };
 
 JSON.stringify = function() {
   return "JSON.stringify clobbered by extension.";
@@ skipping 10 matching lines @@
 // Keep track of the tab that we're running tests in, for simplicity.
 var testTab = null;
 
 chrome.test.getConfig(function(config) {
   chrome.test.runTests([
     function setupTestTab() {
       chrome.test.log("Creating tab...");
       chrome.tabs.create({
         url: "http://localhost:PORT/files/extensions/test_file.html"
                  .replace(/PORT/, config.testServer.port)
-      }, function(tab) {
-        chrome.tabs.onUpdated.addListener(function listener(tabid, info) {
-          if (tab.id == tabid && info.status == 'complete') {
+      }, function(newTab) {
+        chrome.tabs.onUpdated.addListener(function listener(_, info, tab) {
+          if (tab.id == newTab.id && info.status == 'complete') {
             chrome.test.log("Created tab: " + tab.url);
             chrome.tabs.onUpdated.removeListener(listener);
             testTab = tab;
             chrome.test.succeed();
           }
         });
       });
     },
 
     // Tests that postMessage to the tab and its response works.
@@ skipping 14 matching lines @@
       port.onMessage.addListener(function(msg) {
         chrome.test.assertEq(msg.portName, portName);
         port.disconnect();
         chrome.test.succeed();
       });
     },
 
     // Tests that postMessage from the tab and its response works.
     function postMessageFromTab() {
       chrome.runtime.onConnect.addListener(function(port) {
-        chrome.test.assertTrue(Boolean(port.sender.tab.url));
-        chrome.test.assertTrue(Boolean(port.sender.tab.title));
-        chrome.test.assertTrue(Boolean(port.sender.tab.id));
+        chrome.test.assertEq({
+          tab: testTab,
+          url: testTab.url,
+           id: chrome.runtime.id
+        }, port.sender);
         port.onMessage.addListener(function(msg) {
           chrome.test.assertTrue(msg.testPostMessageFromTab);
           port.postMessage({success: true, portName: port.name});
           chrome.test.log("postMessageFromTab: got message from tab");
         });
       });
 
       var port = chrome.tabs.connect(testTab.id);
       port.postMessage({testPostMessageFromTab: true});
       chrome.test.log("postMessageFromTab: sent first message to tab");
       port.onMessage.addListener(function(msg) {
         port.disconnect();
         chrome.test.succeed();
       });
     },
 
     // Tests receiving a request from a content script and responding.
     function sendMessageFromTab() {
       var doneListening = chrome.test.listenForever(
         chrome.runtime.onMessage,
         function(request, sender, sendResponse) {
-          chrome.test.assertTrue("url" in sender.tab, "no tab available.");
-          chrome.test.assertEq(sender.id, location.host);
+          chrome.test.assertEq({
+            tab: testTab,
+            url: testTab.url,
+             id: chrome.runtime.id
+          }, sender);
           if (request.step == 1) {
             // Step 1: Page should send another request for step 2.
             chrome.test.log("sendMessageFromTab: got step 1");
             sendResponse({nextStep: true});
           } else {
             // Step 2.
             chrome.test.assertEq(request.step, 2);
             sendResponse();
             doneListening();
           }
@@ skipping 82 matching lines @@
       } catch(e) {
         error = e;
       }
       chrome.test.assertTrue(error != undefined);
 
       chrome.test.succeed();
     },
 
   ]);
 });