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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2105393002: [Extensions UI] Handle multiple warning bubbles racing to show (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: 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 f57d7756526f1d5192f2a3762728cf3341ccbbd2..3b27ebc16904b5387d4f3e56b9c66f66c618e7a2 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
@@ -321,6 +321,8 @@ class ExtensionMessageBubbleTest : public BrowserWithTestWindowTest {
SetTestingFactory(profile(), &BuildOverrideRegistrar);
extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance()->Get(
profile());
+ ToolbarActionsModelFactory::GetInstance()->SetTestingFactory(
+ profile(), &BuildToolbarModel);
}
~ExtensionMessageBubbleTest() override {}
@@ -364,6 +366,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());
@@ -396,6 +399,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());
@@ -434,6 +438,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);
@@ -458,6 +463,7 @@ TEST_F(ExtensionMessageBubbleTest, WipeoutControllerTest) {
new TestExtensionMessageBubbleController(
new SuspiciousExtensionBubbleDelegate(browser()->profile()),
browser()));
+ controller->SetIsActiveBubble();
controller->ClearProfileListForTesting();
EXPECT_TRUE(controller->ShouldShow());
suspicious_extensions = controller->GetExtensionList();
@@ -483,6 +489,7 @@ TEST_F(ExtensionMessageBubbleTest, WipeoutControllerTest) {
new TestExtensionMessageBubbleController(
new SuspiciousExtensionBubbleDelegate(browser()->profile()),
browser()));
+ controller->SetIsActiveBubble();
controller->ClearProfileListForTesting();
EXPECT_TRUE(controller->ShouldShow());
suspicious_extensions = controller->GetExtensionList();
@@ -512,6 +519,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());
@@ -544,6 +552,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
@@ -572,6 +581,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();
@@ -592,6 +602,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();
@@ -646,6 +657,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());
@@ -686,6 +698,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());
@@ -709,6 +722,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());
@@ -756,6 +770,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());
@@ -797,6 +812,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();
@@ -821,6 +837,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());
@@ -891,10 +908,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);
@@ -937,6 +954,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();
@@ -961,6 +979,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());
@@ -1000,8 +1019,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();
@@ -1010,6 +1027,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