Allow requesting Automation tree by tabId

chrome/test/data/extensions/api_test/automation/tests/tabs/common.js

Index: chrome/test/data/extensions/api_test/automation/tests/tabs/common.js
diff --git a/chrome/test/data/extensions/api_test/automation/tests/tabs/common.js b/chrome/test/data/extensions/api_test/automation/tests/tabs/common.js
index fbbc918fd1d1a28778a2866b5d8768d1cea39c38..293485237c82bc9721cf86a009830e52ad1cfed5 100644
--- a/chrome/test/data/extensions/api_test/automation/tests/tabs/common.js
+++ b/chrome/test/data/extensions/api_test/automation/tests/tabs/common.js
@@ -10,30 +10,26 @@ var tree = null;
 
 function createTab(url, callback) {
   chrome.tabs.create({"url": url}, function(tab) {
-      chrome.runtime.onMessage.addListener(
-        function listener(message, sender) {
-          if (!sender.tab)
-            return;
-          assertEq(tab.id, sender.tab.id);
-          assertTrue(message['loaded']);
-          callback();
-          chrome.runtime.onMessage.removeListener(listener);
-        });
-      });
+    callback(tab);
+  });
 }
 
 function setUpAndRunTests(allTests) {
+  getUrlFromConfig(function(url) {
+    createTab(url, function(unused_tab) {
+      chrome.automation.getTree(function (returnedTree) {
+        tree = returnedTree;
+        chrome.test.runTests(allTests);
+      });
+    });
+  });
+}
+
+function getUrlFromConfig(callback) {
   chrome.test.getConfig(function(config) {
     assertTrue('testServer' in config, 'Expected testServer in config');
     var url = "http://a.com:PORT/index.html"
         .replace(/PORT/, config.testServer.port);
-    function gotTree(returnedTree) {
-      tree = returnedTree;
-      chrome.test.runTests(allTests);
-    }
-    createTab(url, function() {
-      chrome.automation.getTree(gotTree);
-    });
+    callback(url)
   });
 }
-