Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1402)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/extension_message_bubble_controller_unittest.cc

Issue 2076093004: [Extensions UI] Handle multiple warning bubbles racing to show (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix win tests Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_message_bubble_controller.cc ('k') | chrome/browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
index 6c8e4df846b7e168e6b15e56fed89d012b06acfc..846307200a5dd355ec7982152246ec37758ce5d4 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
@@ -323,6 +323,8 @@ class ExtensionMessageBubbleTest : public BrowserWithTestWindowTest {
SetTestingFactory(profile(), &BuildOverrideRegistrar);
extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance()->Get(
profile());
+ ToolbarActionsModelFactory::GetInstance()->SetTestingFactory(
+ profile(), &BuildToolbarModel);
}
~ExtensionMessageBubbleTest() override {}
@@ -366,6 +368,7 @@ TEST_F(ExtensionMessageBubbleTest, BubbleReshowsOnDeactivationDismissal) {
std::unique_ptr<TestExtensionMessageBubbleController> controller(
new TestExtensionMessageBubbleController(
new NtpOverriddenBubbleDelegate(browser()->profile()), browser()));
+ controller->SetIsActiveBubble();
// The list will contain one enabled unpacked extension (ext 2).
EXPECT_TRUE(controller->ShouldShow());
@@ -398,6 +401,7 @@ TEST_F(ExtensionMessageBubbleTest, BubbleReshowsOnDeactivationDismissal) {
FakeExtensionMessageBubble::BUBBLE_ACTION_DISMISS_DEACTIVATION);
controller.reset(new TestExtensionMessageBubbleController(
new NtpOverriddenBubbleDelegate(browser()->profile()), browser()));
+ controller->SetIsActiveBubble();
// The bubble shouldn't show again for the same profile (we don't want to
// be annoying).
EXPECT_FALSE(controller->ShouldShow());
@@ -436,6 +440,7 @@ TEST_F(ExtensionMessageBubbleTest, WipeoutControllerTest) {
new TestExtensionMessageBubbleController(
new SuspiciousExtensionBubbleDelegate(browser()->profile()),
browser()));
+ controller->SetIsActiveBubble();
FakeExtensionMessageBubble bubble;
bubble.set_action_on_show(
FakeExtensionMessageBubble::BUBBLE_ACTION_CLICK_DISMISS_BUTTON);
@@ -460,6 +465,7 @@ TEST_F(ExtensionMessageBubbleTest, WipeoutControllerTest) {
new TestExtensionMessageBubbleController(
new SuspiciousExtensionBubbleDelegate(browser()->profile()),
browser()));
+ controller->SetIsActiveBubble();
controller->ClearProfileListForTesting();
EXPECT_TRUE(controller->ShouldShow());
suspicious_extensions = controller->GetExtensionList();
@@ -485,6 +491,7 @@ TEST_F(ExtensionMessageBubbleTest, WipeoutControllerTest) {
new TestExtensionMessageBubbleController(
new SuspiciousExtensionBubbleDelegate(browser()->profile()),
browser()));
+ controller->SetIsActiveBubble();
controller->ClearProfileListForTesting();
EXPECT_TRUE(controller->ShouldShow());
suspicious_extensions = controller->GetExtensionList();
@@ -514,6 +521,7 @@ TEST_F(ExtensionMessageBubbleTest, DevModeControllerTest) {
std::unique_ptr<TestExtensionMessageBubbleController> controller(
new TestExtensionMessageBubbleController(
new DevModeBubbleDelegate(browser()->profile()), browser()));
+ controller->SetIsActiveBubble();
// The list will contain one enabled unpacked extension.
EXPECT_TRUE(controller->ShouldShow());
@@ -546,6 +554,7 @@ TEST_F(ExtensionMessageBubbleTest, DevModeControllerTest) {
new TestExtensionMessageBubbleController(
new DevModeBubbleDelegate(browser()->profile()),
browser()));
+ controller->SetIsActiveBubble();
// Most bubbles would want to show again as long as the extensions weren't
// acknowledged and the bubble wasn't dismissed due to deactivation. Since dev
// mode extensions can't be (persistently) acknowledged, this isn't the case
@@ -574,6 +583,7 @@ TEST_F(ExtensionMessageBubbleTest, DevModeControllerTest) {
new TestExtensionMessageBubbleController(
new DevModeBubbleDelegate(browser()->profile()),
browser()));
+ controller->SetIsActiveBubble();
controller->ClearProfileListForTesting();
EXPECT_TRUE(controller->ShouldShow());
dev_mode_extensions = controller->GetExtensionList();
@@ -594,6 +604,7 @@ TEST_F(ExtensionMessageBubbleTest, DevModeControllerTest) {
new TestExtensionMessageBubbleController(
new DevModeBubbleDelegate(browser()->profile()),
browser()));
+ controller->SetIsActiveBubble();
controller->ClearProfileListForTesting();
EXPECT_FALSE(controller->ShouldShow());
dev_mode_extensions = controller->GetExtensionList();
@@ -653,6 +664,7 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_SettingsApiControllerTest) {
new TestExtensionMessageBubbleController(
new SettingsApiBubbleDelegate(browser()->profile(), type),
browser()));
+ controller->SetIsActiveBubble();
// The list will contain one enabled unpacked extension (ext 2).
EXPECT_TRUE(controller->ShouldShow());
@@ -693,6 +705,7 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_SettingsApiControllerTest) {
new TestExtensionMessageBubbleController(
new SettingsApiBubbleDelegate(browser()->profile(), type),
browser()));
+ controller->SetIsActiveBubble();
bubble.set_controller(controller.get());
bubble.Show();
EXPECT_EQ(1U, controller->link_click_count());
@@ -716,6 +729,7 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_SettingsApiControllerTest) {
new TestExtensionMessageBubbleController(
new SettingsApiBubbleDelegate(browser()->profile(), type),
browser()));
+ controller->SetIsActiveBubble();
EXPECT_TRUE(controller->ShouldShow());
override_extensions = controller->GetExtensionList();
EXPECT_EQ(1U, override_extensions.size());
@@ -763,6 +777,7 @@ TEST_F(ExtensionMessageBubbleTest, NtpOverriddenControllerTest) {
std::unique_ptr<TestExtensionMessageBubbleController> controller(
new TestExtensionMessageBubbleController(
new NtpOverriddenBubbleDelegate(browser()->profile()), browser()));
+ controller->SetIsActiveBubble();
// The list will contain one enabled unpacked extension (ext 2).
EXPECT_TRUE(controller->ShouldShow());
@@ -804,6 +819,7 @@ TEST_F(ExtensionMessageBubbleTest, NtpOverriddenControllerTest) {
new TestExtensionMessageBubbleController(
new NtpOverriddenBubbleDelegate(browser()->profile()),
browser()));
+ controller->SetIsActiveBubble();
EXPECT_TRUE(controller->ShouldShow());
bubble.set_controller(controller.get());
bubble.Show();
@@ -828,6 +844,7 @@ TEST_F(ExtensionMessageBubbleTest, NtpOverriddenControllerTest) {
new TestExtensionMessageBubbleController(
new NtpOverriddenBubbleDelegate(browser()->profile()),
browser()));
+ controller->SetIsActiveBubble();
EXPECT_TRUE(controller->ShouldShow());
override_extensions = controller->GetExtensionList();
EXPECT_EQ(1U, override_extensions.size());
@@ -903,10 +920,10 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_ProxyOverriddenControllerTest) {
std::unique_ptr<TestExtensionMessageBubbleController> controller(
new TestExtensionMessageBubbleController(
new ProxyOverriddenBubbleDelegate(browser()->profile()), browser()));
+ controller->SetIsActiveBubble();
// The second extension is too new to warn about.
EXPECT_FALSE(controller->ShouldShow());
- EXPECT_FALSE(controller->ShouldShow());
// Lets make it old enough.
SetInstallTime(kId2, old_enough, prefs);
@@ -949,6 +966,7 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_ProxyOverriddenControllerTest) {
new TestExtensionMessageBubbleController(
new ProxyOverriddenBubbleDelegate(browser()->profile()),
browser()));
+ controller->SetIsActiveBubble();
EXPECT_TRUE(controller->ShouldShow());
bubble.set_controller(controller.get());
bubble.Show();
@@ -973,6 +991,7 @@ TEST_F(ExtensionMessageBubbleTest, MAYBE_ProxyOverriddenControllerTest) {
new TestExtensionMessageBubbleController(
new ProxyOverriddenBubbleDelegate(browser()->profile()),
browser()));
+ controller->SetIsActiveBubble();
EXPECT_TRUE(controller->ShouldShow());
override_extensions = controller->GetExtensionList();
EXPECT_EQ(1U, override_extensions.size());
@@ -1012,8 +1031,6 @@ TEST_F(ExtensionMessageBubbleTest, TestBubbleOutlivesBrowser) {
FeatureSwitch::ScopedOverride force_dev_mode_highlighting(
FeatureSwitch::force_dev_mode_highlighting(), true);
Init();
- ToolbarActionsModelFactory::GetInstance()->SetTestingFactory(
- profile(), &BuildToolbarModel);
ToolbarActionsModel* model = ToolbarActionsModel::Get(profile());
base::RunLoop().RunUntilIdle();
@@ -1022,6 +1039,7 @@ TEST_F(ExtensionMessageBubbleTest, TestBubbleOutlivesBrowser) {
std::unique_ptr<TestExtensionMessageBubbleController> controller(
new TestExtensionMessageBubbleController(
new DevModeBubbleDelegate(browser()->profile()), browser()));
+ controller->SetIsActiveBubble();
EXPECT_TRUE(controller->ShouldShow());
EXPECT_EQ(1u, model->toolbar_items().size());
controller->HighlightExtensionsIfNecessary();
« no previous file with comments | « chrome/browser/extensions/extension_message_bubble_controller.cc ('k') | chrome/browser/ui/cocoa/extensions/extension_message_bubble_browsertest_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698