Commit c49c8905 authored by David Bertoni's avatar David Bertoni Committed by Commit Bot

[Extensions] Run more browserAction tests in Service Worker mode.

This CL adds more tests to be run as Service Worker-based
extensions.

Bug: 1093066
Change-Id: Ib984bb47dfc16c1e7c5bca8838a5c6e71d0c9671
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2405552
Commit-Queue: David Bertoni <dbertoni@chromium.org>
Reviewed-by: default avatarIstiaque Ahmed <lazyboy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807506}
parent 5929f023
...@@ -498,7 +498,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiCanvasTest, InvisibleIconBrowserAction) { ...@@ -498,7 +498,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiCanvasTest, InvisibleIconBrowserAction) {
} }
} }
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TabSpecificBrowserActionState) { IN_PROC_BROWSER_TEST_P(BrowserActionApiLazyTest,
TabSpecificBrowserActionState) {
ASSERT_TRUE(RunExtensionTest("browser_action/tab_specific_state")) << ASSERT_TRUE(RunExtensionTest("browser_action/tab_specific_state")) <<
message_; message_;
const Extension* extension = GetSingleLoadedExtension(); const Extension* extension = GetSingleLoadedExtension();
...@@ -530,7 +531,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TabSpecificBrowserActionState) { ...@@ -530,7 +531,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TabSpecificBrowserActionState) {
// Test that calling chrome.browserAction.setPopup() can enable and change // Test that calling chrome.browserAction.setPopup() can enable and change
// a popup. // a popup.
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionAddPopup) { IN_PROC_BROWSER_TEST_P(BrowserActionApiLazyTest, BrowserActionAddPopup) {
ASSERT_TRUE(RunExtensionTest("browser_action/add_popup")) << message_; ASSERT_TRUE(RunExtensionTest("browser_action/add_popup")) << message_;
const Extension* extension = GetSingleLoadedExtension(); const Extension* extension = GetSingleLoadedExtension();
ASSERT_TRUE(extension) << message_; ASSERT_TRUE(extension) << message_;
...@@ -585,7 +586,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionAddPopup) { ...@@ -585,7 +586,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionAddPopup) {
} }
// Test that calling chrome.browserAction.setPopup() can remove a popup. // Test that calling chrome.browserAction.setPopup() can remove a popup.
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionRemovePopup) { IN_PROC_BROWSER_TEST_P(BrowserActionApiLazyTest, BrowserActionRemovePopup) {
// Load the extension, which has a browser action with a default popup. // Load the extension, which has a browser action with a default popup.
ASSERT_TRUE(RunExtensionTest("browser_action/remove_popup")) << message_; ASSERT_TRUE(RunExtensionTest("browser_action/remove_popup")) << message_;
const Extension* extension = GetSingleLoadedExtension(); const Extension* extension = GetSingleLoadedExtension();
...@@ -737,7 +738,7 @@ IN_PROC_BROWSER_TEST_P(BrowserActionApiLazyTest, IncognitoUpdate) { ...@@ -737,7 +738,7 @@ IN_PROC_BROWSER_TEST_P(BrowserActionApiLazyTest, IncognitoUpdate) {
// Tests that events are dispatched to the correct profile for split mode // Tests that events are dispatched to the correct profile for split mode
// extensions. // extensions.
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, IncognitoSplit) { IN_PROC_BROWSER_TEST_P(BrowserActionApiLazyTest, IncognitoSplit) {
ResultCatcher catcher; ResultCatcher catcher;
const Extension* extension = LoadExtensionWithFlags( const Extension* extension = LoadExtensionWithFlags(
test_data_dir_.AppendASCII("browser_action/split_mode"), test_data_dir_.AppendASCII("browser_action/split_mode"),
...@@ -817,7 +818,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, CloseBackgroundPage) { ...@@ -817,7 +818,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, CloseBackgroundPage) {
action->GetExplicitlySetBadgeText(ExtensionAction::kDefaultTabId)); action->GetExplicitlySetBadgeText(ExtensionAction::kDefaultTabId));
} }
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BadgeBackgroundColor) { IN_PROC_BROWSER_TEST_P(BrowserActionApiLazyTest, BadgeBackgroundColor) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_TRUE(RunExtensionTest("browser_action/color")) << message_; ASSERT_TRUE(RunExtensionTest("browser_action/color")) << message_;
const Extension* extension = GetSingleLoadedExtension(); const Extension* extension = GetSingleLoadedExtension();
...@@ -866,7 +867,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BadgeBackgroundColor) { ...@@ -866,7 +867,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BadgeBackgroundColor) {
action->GetBadgeBackgroundColor(ExtensionAction::kDefaultTabId)); action->GetBadgeBackgroundColor(ExtensionAction::kDefaultTabId));
} }
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Getters) { IN_PROC_BROWSER_TEST_P(BrowserActionApiLazyTest, Getters) {
ASSERT_TRUE(RunExtensionTest("browser_action/getters")) << message_; ASSERT_TRUE(RunExtensionTest("browser_action/getters")) << message_;
const Extension* extension = GetSingleLoadedExtension(); const Extension* extension = GetSingleLoadedExtension();
ASSERT_TRUE(extension) << message_; ASSERT_TRUE(extension) << message_;
...@@ -887,7 +888,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Getters) { ...@@ -887,7 +888,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Getters) {
} }
// Verify triggering browser action. // Verify triggering browser action.
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TestTriggerBrowserAction) { IN_PROC_BROWSER_TEST_P(BrowserActionApiLazyTest, TestTriggerBrowserAction) {
ASSERT_TRUE(embedded_test_server()->Start()); ASSERT_TRUE(embedded_test_server()->Start());
ASSERT_TRUE(RunExtensionTest("trigger_actions/browser_action")) << message_; ASSERT_TRUE(RunExtensionTest("trigger_actions/browser_action")) << message_;
...@@ -923,7 +924,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TestTriggerBrowserAction) { ...@@ -923,7 +924,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TestTriggerBrowserAction) {
EXPECT_EQ(result, "red"); EXPECT_EQ(result, "red");
} }
IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionWithRectangularIcon) { IN_PROC_BROWSER_TEST_P(BrowserActionApiLazyTest,
BrowserActionWithRectangularIcon) {
ExtensionTestMessageListener ready_listener("ready", true); ExtensionTestMessageListener ready_listener("ready", true);
const Extension* extension = LoadExtension( const Extension* extension = LoadExtension(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment