Update ExtensionApiTest.Tabs and re-enable

chrome/renderer/resources/extension_apitest.js

 // extension_apitest.js
 // mini-framework for ExtensionApiTest browser tests
 
 var chrome = chrome || {};
 (function() {
   chrome.test = chrome.test || {};
 
   chrome.test.tests = chrome.test.tests || [];
 
   var completed = false;
@@ skipping 32 matching lines @@
 
   function allTestsSucceeded() {
     console.log("All tests succeeded");
     if (completed) throw "completed";
 
     chrome.test.notifyPass();
     complete();
   }
 
   var pendingCallbacks = 0;
-  var totalCallbacks = 0;
-  
+
   function callbackAdded() {
     pendingCallbacks++;
-    chrome.test.assertEq(totalCallbacks, 0);
   };
-  
+
   function callbackCompleted() {
-    if (!totalCallbacks)
-      totalCallbacks = pendingCallbacks;
     pendingCallbacks--;
     if (pendingCallbacks == 0) {
-      //chrome.test.log("  " + totalCallbacks + " callbacks ran");
-      totalCallbacks = 0;
       chrome.test.succeed();
     }
   };
 
   chrome.test.runNextTest = function() {
     chrome.test.assertEq(pendingCallbacks, 0);
     lastTest = currentTest;
     currentTest = chrome.test.tests.shift();
     if (!currentTest) {
       allTestsSucceeded();
@@ skipping 42 matching lines @@
                        "\nExpected Type:" + typeof(expected));
     }
   };
 
   chrome.test.assertNoLastError = function() {
     if (chrome.extension.lastError != undefined) {
       chrome.test.fail("lastError.message == " +
                        chrome.extension.lastError.message);
     }
   };
-  
+
   function safeFunctionApply(func, arguments) {
     try {
       if (func) {
         func.apply(null, arguments);
       }
     } catch (e) {
       var stack = null;
       if (typeof(e.stack) != "undefined") {
         stack = e.stack.toString();
       }
       var msg = "Exception during execution of callback in " +
                 currentTest.name;
       if (stack) {
         msg += "\n" + stack;
       } else {
         msg += "\n(no stack available)";
       }
       chrome.test.fail(msg);
     }
   };
 
   // Wrapper for generating test functions, that takes care of calling
   // assertNoLastError() and (optionally) succeed() for you.
   chrome.test.callback = function(func, expectedError) {
     if (func) {
       chrome.test.assertEq(typeof(func), 'function');
     }
-
     callbackAdded();
 
     return function() {
       if (expectedError == null) {
         chrome.test.assertNoLastError();
       } else {
         chrome.test.assertEq(typeof(expectedError), 'string');
         chrome.test.assertEq(expectedError, chrome.extension.lastError.message);
       }
       
       if (func) {
         safeFunctionApply(func, arguments);
       }
 
       callbackCompleted();
     };
   };
-  
+
   chrome.test.listenOnce = function(event, func) {
     callbackAdded();
     var listener = function() {
       event.removeListener(listener);
-      safeFunctionApply(func, arguments);      
+      safeFunctionApply(func, arguments);
       callbackCompleted();
     };
     event.addListener(listener);
   };
   
+  chrome.test.listenForever = function(event, func) {
+    callbackAdded();
+    
+    var listener = function() {
+      safeFunctionApply(func, arguments);
+    };
+
+    var done = {};
+    done.doneListening = function() {
+      event.removeListener(listener);
+      callbackCompleted();
+    };
+ 
+    event.addListener(listener);
+    return done;
+  };
+
   chrome.test.callbackPass = function(func) {
     return chrome.test.callback(func);
   };
 
   chrome.test.callbackFail = function(expectedError) {
     return chrome.test.callback(null, expectedError);
   };
 
-  // TODO(erikkay) This is deprecated and should be removed.
-  chrome.test.testCallback = function(succeedWhenDone, func) {
-    return chrome.test.callback(func);
-  };
-  
   chrome.test.runTests = function(tests) {
     chrome.test.tests = tests;
     chrome.test.runNextTest();
   };
-
 })();