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

chrome/renderer/resources/extensions/test_custom_bindings.js

 // 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.
 
 // test_custom_bindings.js
 // mini-framework for ExtensionApiTest browser tests
 
 var binding = require('binding').Binding.create('test');
 
 var chrome = requireNative('chrome').GetChrome();
 var GetExtensionAPIDefinitions =
     requireNative('apiDefinitions').GetExtensionAPIDefinitions;
 var GetAvailability = requireNative('v8_context').GetAvailability;
+var json = require('json');
 
 binding.registerCustomHook(function(api) {
   var chromeTest = api.compiledApi;
   var apiFunctions = api.apiFunctions;
 
   chromeTest.tests = chromeTest.tests || [];
 
   var currentTest = null;
   var lastTest = null;
   var testsFailed = 0;
@@ skipping 150 matching lines @@
   });
 
   apiFunctions.setHandleRequest('assertEq',
                                 function(expected, actual, message) {
     var error_msg = "API Test Error in " + testName(currentTest);
     if (message)
       error_msg += ": " + message;
     if (typeof(expected) == 'object') {
       if (!chromeTest.checkDeepEq(expected, actual)) {
         chromeTest.fail(error_msg +
-                         "\nActual: " + JSON.stringify(actual) +
-                         "\nExpected: " + JSON.stringify(expected));
+                         "\nActual: " + json.stringify(actual) +
+                         "\nExpected: " + json.stringify(expected));
       }
       return;
     }
     if (expected != actual) {
       chromeTest.fail(error_msg +
                        "\nActual: " + actual + "\nExpected: " + expected);
     }
     if (typeof(expected) != typeof(actual)) {
       chromeTest.fail(error_msg +
                        " (type mismatch)\nActual Type: " + typeof(actual) +
@@ skipping 89 matching lines @@
   });
 
   apiFunctions.setHandleRequest('getApiDefinitions', function() {
     return GetExtensionAPIDefinitions().filter(function(api) {
       return GetAvailability(api.namespace).is_available;
     });
   });
 });
 
 exports.binding = binding.generate();