tabId support to chrome.extensions.getViews()

chrome/test/data/extensions/api_test/get_views/test.js

Index: chrome/test/data/extensions/api_test/get_views/test.js
diff --git a/chrome/test/data/extensions/api_test/get_views/test.js b/chrome/test/data/extensions/api_test/get_views/test.js
index 765c4c0fb42605d6414f40e033c306b5609b3342..e615e764883d15421a10caa9198e644aaa1750dc 100644
--- a/chrome/test/data/extensions/api_test/get_views/test.js
+++ b/chrome/test/data/extensions/api_test/get_views/test.js
@@ -11,20 +11,47 @@ const assertTrue = chrome.test.assertTrue;
 // We need to remember the popupWindowId to be able to find it later.
 var popupWindowId = 0;
 
+// Updated and used later to check getViews() tabId tag for the options tab.
+var optionsTabId = 0;
+
 // This function is called by the popup during the test run.
 function popupCallback() {
-  // We have now added an popup so the total count goes up one.
+  // We have now added a popup so the total count goes up one.
   assertEq(2, chrome.extension.getViews().length);
-  assertEq(1, chrome.extension.getViews({"windowId": popupWindowId}).length);
-
-  chrome.tabs.create({"url": chrome.extension.getURL("options.html")});
+  assertEq(1, chrome.extension.getViews({windowId: popupWindowId}).length);
+  chrome.tabs.create({url: chrome.extension.getURL("options.html")},
+                     function(tab) {
+    optionsTabId = tab.id;
+  });
 }
 
 function optionsPageCallback() {
   assertEq(3, chrome.extension.getViews().length);
-  assertEq(1, chrome.extension.getViews({"windowId": popupWindowId}).length);
-  assertEq(2, chrome.extension.getViews(
-      {"type": "tab", "windowId": window.id}).length);
+  assertEq(1, chrome.extension.getViews({windowId: popupWindowId}).length);
+  assertEq(
+      2, chrome.extension.getViews({type: "tab", windowId: window.id}).length);
+
+  chrome.tabs.query({windowId: window.id}, function(tabs) {
+    // Assert 3 to account for new tab page, web popup, & new tab options.html.
+    assertEq(3, tabs.length);
+    // getViews() only returns views that run in the extension process, so
+    // this should only include the popup and options.html pages.
+    assertEq(2, chrome.extension.getViews({type: "tab"}).length);
+
+    for (var i = 0; i < tabs.length; i++) {
+      if (tabs[i].windowId == popupWindowId) {
+        assertEq(1, chrome.extension.getViews({tabId: tabs[i].id}).length);
+        // Test tabId tag with other parameters.
+        assertEq(1, chrome.extension.getViews({windowId: popupWindowId,
+                                               tabId: tabs[i].id}).length);
+        assertEq(1, chrome.extension.getViews({type: "tab",
+                                               tabId: tabs[i].id}).length);
+      } else if (tabs[i].id == optionsTabId) {
+        assertEq(1, chrome.extension.getViews({tabId: tabs[i].id}).length);
+      }
+    }
+  });
+
   chrome.test.notifyPass();
 }
 
@@ -32,15 +59,18 @@ var tests = [
   function getViews() {
     assertTrue(typeof(chrome.extension.getBackgroundPage()) != "undefined");
     assertEq(1, chrome.extension.getViews().length);
-    assertEq(0, chrome.extension.getViews({"type": "tab"}).length);
-    assertEq(0, chrome.extension.getViews({"type": "popup"}).length);
+    assertEq(0, chrome.extension.getViews({type: "tab"}).length);
+    assertEq(0, chrome.extension.getViews({type: "popup"}).length);
 
     chrome.windows.getAll({populate: true}, function(windows) {
       assertEq(1, windows.length);
 
       // Create a popup window.
-      chrome.windows.create({"url": chrome.extension.getURL("popup.html"),
-                             "type": "popup"}, function(window) {
+
+      // TODO (catmullings): Fix potential race condition when/if
+      // popupCallback() is called before popupWindowId is set below
+      chrome.windows.create({url: chrome.extension.getURL("popup.html"),
+                             type: "popup"}, function(window) {
         assertTrue(window.id > 0);
         popupWindowId = window.id;
         // The popup will call back to us through popupCallback (above).