[Extensions] Convert more tabs API tests to run as service workers. (2)

This CL creates separate extensions for the affected tests. Test
files that are shared remain in the parent directory and are
referenced through the pageUrl utility function.

Bug: 1093066
Change-Id: Ie7bfa8c355782a76a8c5e04c7b56decf2914e90d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4234087
Auto-Submit: David Bertoni <dbertoni@chromium.org>
Commit-Queue: Emilia Paz <emiliapaz@chromium.org>
Reviewed-by: Emilia Paz <emiliapaz@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1103374}

chrome/browser/extensions/api/tabs/tabs_apitest.cc

@@ -120,20 +120,17 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabAudible) {
       << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabMuted) {
-  ASSERT_TRUE(RunExtensionTest("tabs/basics", {.extension_url = "muted.html"}))
-      << message_;
+IN_PROC_BROWSER_TEST_P(ExtensionApiTabTestWithContextType, Muted) {
+  ASSERT_TRUE(RunExtensionTest("tabs/basics/muted")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, Tabs2) {
   ASSERT_TRUE(RunExtensionTest("tabs/basics", {.extension_url = "crud2.html"}))
       << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabDuplicate) {
-  ASSERT_TRUE(
-      RunExtensionTest("tabs/basics", {.extension_url = "duplicate.html"}))
-      << message_;
+IN_PROC_BROWSER_TEST_P(ExtensionApiTabTestWithContextType, Duplicate) {
+  ASSERT_TRUE(RunExtensionTest("tabs/basics/duplicate")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_P(ExtensionApiTabTestWithContextType, Size) {
@@ -162,10 +159,8 @@ IN_PROC_BROWSER_TEST_P(ExtensionApiTabTestWithContextType, Events) {
   ASSERT_TRUE(RunExtensionTest("tabs/basics/events")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabRelativeURLs) {
-  ASSERT_TRUE(
-      RunExtensionTest("tabs/basics", {.extension_url = "relative_urls.html"}))
-      << message_;
+IN_PROC_BROWSER_TEST_P(ExtensionApiTabTestWithContextType, RelativeURLs) {
+  ASSERT_TRUE(RunExtensionTest("tabs/basics/relative_urls")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_P(ExtensionApiTabTestWithContextType, Query) {
@@ -188,15 +183,12 @@ IN_PROC_BROWSER_TEST_P(ExtensionApiTabTestWithContextType, Opener) {
   ASSERT_TRUE(RunExtensionTest("tabs/basics/opener")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabRemove) {
-  ASSERT_TRUE(RunExtensionTest("tabs/basics", {.extension_url = "remove.html"}))
-      << message_;
+IN_PROC_BROWSER_TEST_P(ExtensionApiTabTestWithContextType, Remove) {
+  ASSERT_TRUE(RunExtensionTest("tabs/basics/remove")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabRemoveMultiple) {
-  ASSERT_TRUE(RunExtensionTest("tabs/basics",
-                               {.extension_url = "remove-multiple.html"}))
-      << message_;
+IN_PROC_BROWSER_TEST_P(ExtensionApiTabTestWithContextType, RemoveMultiple) {
+  ASSERT_TRUE(RunExtensionTest("tabs/basics/remove_multiple")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabGetCurrent) {

chrome/test/data/extensions/api_test/tabs/basics/duplicate.js → chrome/test/data/extensions/api_test/tabs/basics/duplicate/duplicate.js

@@ -5,6 +5,10 @@
 var firstTabId;
 var firstWindowId;
 
+const scriptUrl = '_test_resources/api_test/tabs/basics/tabs_util.js';
+let loadScript = chrome.test.loadScript(scriptUrl);
+
+loadScript.then(async function() {
 chrome.test.runTests([
   function setupWindow() {
     createWindow([pageUrl("a")], {},
@@ -51,4 +55,4 @@ chrome.test.runTests([
     });
   }
  */
-]);
+])});

chrome/test/data/extensions/api_test/tabs/basics/duplicate/manifest.json

@@ -0,0 +1,11 @@
+{
+  "name": "chrome.tabs",
+  "version": "0.1",
+  "manifest_version": 2,
+  "description": "end-to-end browser test for chrome.tabs API",
+  "permissions": ["tabs"],
+  "background": {
+    "scripts": ["duplicate.js"],
+    "persistent": true
+  }
+}

chrome/test/data/extensions/api_test/tabs/basics/manifest.json

@@ -3,5 +3,5 @@
   "version": "0.1",
   "manifest_version": 2,
   "description": "end-to-end browser test for chrome.tabs API",
-  "permissions": ["storage", "tabs"]
+  "permissions": ["tabs"]
 }

chrome/test/data/extensions/api_test/tabs/basics/muted/manifest.json

@@ -0,0 +1,11 @@
+{
+  "name": "chrome.tabs",
+  "version": "0.1",
+  "manifest_version": 2,
+  "description": "end-to-end browser test for chrome.tabs API",
+  "permissions": ["tabs"],
+  "background": {
+    "scripts": ["muted.js"],
+    "persistent": true
+  }
+}

chrome/test/data/extensions/api_test/tabs/basics/muted.js → chrome/test/data/extensions/api_test/tabs/basics/muted/muted.js

@@ -4,9 +4,13 @@
 
 var testTabId_;
 
+const scriptUrl = '_test_resources/api_test/tabs/basics/tabs_util.js';
+let loadScript = chrome.test.loadScript(scriptUrl);
+
+loadScript.then(async function() {
 chrome.test.runTests([
-  function setupWindow() {
-    chrome.tabs.getCurrent(pass(function(tab) {
+  function createTab() {
+    chrome.tabs.create({}, pass(function(tab) {
       testTabId_ = tab.id;
     }));
   },
@@ -72,4 +76,4 @@ chrome.test.runTests([
     chrome.tabs.update(testTabId_, {muted: false});
   }
 
-]);
+])});

chrome/test/data/extensions/api_test/tabs/basics/relative_urls/manifest.json

@@ -0,0 +1,11 @@
+{
+  "name": "chrome.tabs",
+  "version": "0.1",
+  "manifest_version": 2,
+  "description": "end-to-end browser test for chrome.tabs API",
+  "permissions": ["tabs"],
+  "background": {
+    "scripts": ["relative_urls.js"],
+    "persistent": true
+  }
+}

chrome/test/data/extensions/api_test/tabs/basics/relative_urls.js → chrome/test/data/extensions/api_test/tabs/basics/relative_urls/relative_urls.js

@@ -5,6 +5,10 @@
 var firstWindowId;
 var testTabId;
 
+const scriptUrl = '_test_resources/api_test/tabs/basics/tabs_util.js';
+let loadScript = chrome.test.loadScript(scriptUrl);
+
+loadScript.then(async function() {
 function resolveOnMessage(resolve) {
   chrome.runtime.onMessage.addListener(function local(message) {
     chrome.runtime.onMessage.removeListener(local);
@@ -61,4 +65,4 @@ chrome.test.runTests([
     Promise.all([onMessagePromise, createPromise]).then(chrome.test.succeed);
   }
 
-]);
+])});

chrome/test/data/extensions/api_test/tabs/basics/remove/manifest.json

@@ -0,0 +1,11 @@
+{
+  "name": "chrome.tabs",
+  "version": "0.1",
+  "manifest_version": 2,
+  "description": "end-to-end browser test for chrome.tabs API",
+  "permissions": ["storage", "tabs"],
+  "background": {
+    "scripts": ["remove.js"],
+    "persistent": true
+  }
+}

chrome/test/data/extensions/api_test/tabs/basics/remove.js → chrome/test/data/extensions/api_test/tabs/basics/remove/remove.js

@@ -12,10 +12,15 @@ function resolveOnStorageChanged(resolve) {
 }
 
 var secondTabId;
+const scriptUrl = '_test_resources/api_test/tabs/basics/tabs_util.js';
+let loadScript = chrome.test.loadScript(scriptUrl);
+
+loadScript.then(async function() {
 chrome.test.runTests([
   function createSecondTab() {
     // Create and switch to a second tab that has an unload handler.
-    chrome.tabs.create({index: 1, active: true, url: 'unload-storage-1.html'},
+    chrome.tabs.create({index: 1, active: true,
+                        url: pageUrl('unload-storage-1')},
       (tab) => {
         secondTabId = tab.id;
         assertTrue(tab.active);
@@ -42,4 +47,4 @@ chrome.test.runTests([
 
     Promise.all([onStoragePromise, removePromise]).then(chrome.test.succeed);
   }
-]);
+])});

chrome/test/data/extensions/api_test/tabs/basics/remove_multiple/manifest.json

@@ -0,0 +1,11 @@
+{
+  "name": "chrome.tabs",
+  "version": "0.1",
+  "manifest_version": 2,
+  "description": "end-to-end browser test for chrome.tabs API",
+  "permissions": ["storage", "tabs"],
+  "background": {
+    "scripts": ["remove-multiple.js"],
+    "persistent": true
+  }
+}

chrome/test/data/extensions/api_test/tabs/basics/remove-multiple.js → chrome/test/data/extensions/api_test/tabs/basics/remove_multiple/remove-multiple.js

@@ -33,6 +33,10 @@ function createTab(createParams) {
   });
 }
 
+const scriptUrl = '_test_resources/api_test/tabs/basics/tabs_util.js';
+let loadScript = chrome.test.loadScript(scriptUrl);
+
+loadScript.then(async function() {
 chrome.test.runTests([
   function getFirstTabId() {
     chrome.tabs.query({ windowId: chrome.windows.WINDOW_ID_CURRENT },
@@ -45,14 +49,14 @@ chrome.test.runTests([
   },
   function createTabs() {
     // Create a second tab that has an unload handler.
-    createTab({index: 1, active: false, url: 'unload-storage-1.html'})
+    createTab({index: 1, active: false, url: pageUrl('unload-storage-1')})
       .then((tab) => {
         secondTabId = tab.id;
         assertFalse(tab.active);
         assertEq(1, tab.index);
         // Create and switch to a third tab that has an unload handler.
         return createTab(
-          {index: 2, active: true, url: 'unload-storage-2.html'});
+            {index: 2, active: true, url: pageUrl('unload-storage-2')});
       }).then((tab) => {
         thirdTabId = tab.id;
         assertTrue(tab.active);
@@ -89,4 +93,4 @@ chrome.test.runTests([
     Promise.all([onStorageChangedPromise1, onStorageChangedPromise2,
                  removePromise]).then(chrome.test.succeed);
   }
-]);
+])});