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

Side by Side Diff: chrome/browser/ui/extensions/extension_message_bubble_browsertest.cc

Issue 1881773002: [Extensions UI] Convert ExtensionMessageBubbles to ToolbarActionsBarBubbles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/extensions/extension_message_bubble_browsertest.h" 5 #include "chrome/browser/ui/extensions/extension_message_bubble_browsertest.h"
6 6
7 #include "base/bind_helpers.h" 7 #include "base/bind_helpers.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "chrome/browser/extensions/extension_action_test_util.h" 9 #include "chrome/browser/extensions/extension_action_test_util.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/ui/extensions/extension_message_bubble_factory.h" 11 #include "chrome/browser/ui/extensions/extension_message_bubble_factory.h"
12 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
12 #include "extensions/common/feature_switch.h" 13 #include "extensions/common/feature_switch.h"
13 #include "extensions/test/extension_test_message_listener.h" 14 #include "extensions/test/extension_test_message_listener.h"
14 15
15 ExtensionMessageBubbleBrowserTest::ExtensionMessageBubbleBrowserTest() { 16 ExtensionMessageBubbleBrowserTest::ExtensionMessageBubbleBrowserTest() {
16 } 17 }
17 18
18 ExtensionMessageBubbleBrowserTest::~ExtensionMessageBubbleBrowserTest() { 19 ExtensionMessageBubbleBrowserTest::~ExtensionMessageBubbleBrowserTest() {
19 } 20 }
20 21
21 void ExtensionMessageBubbleBrowserTest::SetUpCommandLine( 22 void ExtensionMessageBubbleBrowserTest::SetUpCommandLine(
22 base::CommandLine* command_line) { 23 base::CommandLine* command_line) {
23 BrowserActionsBarBrowserTest::SetUpCommandLine(command_line); 24 BrowserActionsBarBrowserTest::SetUpCommandLine(command_line);
24 // The dev mode warning bubble is an easy one to trigger, so we use that for 25 // The dev mode warning bubble is an easy one to trigger, so we use that for
25 // our testing purposes. 26 // our testing purposes.
26 dev_mode_bubble_override_.reset( 27 dev_mode_bubble_override_.reset(
27 new extensions::FeatureSwitch::ScopedOverride( 28 new extensions::FeatureSwitch::ScopedOverride(
28 extensions::FeatureSwitch::force_dev_mode_highlighting(), 29 extensions::FeatureSwitch::force_dev_mode_highlighting(),
29 true)); 30 true));
30 ExtensionMessageBubbleFactory::set_override_for_tests( 31 ExtensionMessageBubbleFactory::set_override_for_tests(
31 ExtensionMessageBubbleFactory::OVERRIDE_ENABLED); 32 ExtensionMessageBubbleFactory::OVERRIDE_ENABLED);
33 ToolbarActionsBar::set_extension_bubble_appearance_wait_time_for_testing(0);
32 } 34 }
33 35
34 void ExtensionMessageBubbleBrowserTest::TearDownOnMainThread() { 36 void ExtensionMessageBubbleBrowserTest::TearDownOnMainThread() {
35 ExtensionMessageBubbleFactory::set_override_for_tests( 37 ExtensionMessageBubbleFactory::set_override_for_tests(
36 ExtensionMessageBubbleFactory::NO_OVERRIDE); 38 ExtensionMessageBubbleFactory::NO_OVERRIDE);
37 BrowserActionsBarBrowserTest::TearDownOnMainThread(); 39 BrowserActionsBarBrowserTest::TearDownOnMainThread();
38 } 40 }
39 41
40 void ExtensionMessageBubbleBrowserTest::TestBubbleAnchoredToExtensionAction() { 42 void ExtensionMessageBubbleBrowserTest::TestBubbleAnchoredToExtensionAction() {
41 scoped_refptr<const extensions::Extension> action_extension = 43 scoped_refptr<const extensions::Extension> action_extension =
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 115
114 void ExtensionMessageBubbleBrowserTest::PreBubbleShowsOnStartup() { 116 void ExtensionMessageBubbleBrowserTest::PreBubbleShowsOnStartup() {
115 LoadExtension(test_data_dir_.AppendASCII("good_unpacked")); 117 LoadExtension(test_data_dir_.AppendASCII("good_unpacked"));
116 } 118 }
117 119
118 void ExtensionMessageBubbleBrowserTest::TestBubbleShowsOnStartup() { 120 void ExtensionMessageBubbleBrowserTest::TestBubbleShowsOnStartup() {
119 base::RunLoop().RunUntilIdle(); 121 base::RunLoop().RunUntilIdle();
120 CheckBubble(browser(), ANCHOR_BROWSER_ACTION); 122 CheckBubble(browser(), ANCHOR_BROWSER_ACTION);
121 CloseBubble(browser()); 123 CloseBubble(browser());
122 } 124 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698