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

Side by Side Diff: chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc

Issue 2350733005: [Extensions] Fix a bug in the startup pages override bubble (Closed)
Patch Set: Trim includes Created 4 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/toolbar/toolbar_actions_bar_unittest.h" 5 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" 11 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
12 #include "chrome/browser/extensions/extension_action.h" 12 #include "chrome/browser/extensions/extension_action.h"
13 #include "chrome/browser/extensions/extension_action_manager.h" 13 #include "chrome/browser/extensions/extension_action_manager.h"
14 #include "chrome/browser/extensions/extension_service.h" 14 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/extensions/test_extension_system.h" 15 #include "chrome/browser/extensions/test_extension_system.h"
16 #include "chrome/browser/sessions/session_tab_helper.h" 16 #include "chrome/browser/sessions/session_tab_helper.h"
17 #include "chrome/browser/ui/layout_constants.h" 17 #include "chrome/browser/ui/layout_constants.h"
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" 18 #include "chrome/browser/ui/tabs/tab_strip_model.h"
19 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" 19 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
20 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" 20 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
21 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h" 21 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h"
22 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
23 #include "chrome/test/base/scoped_testing_local_state.h"
24 #include "chrome/test/base/testing_browser_process.h"
23 #include "extensions/browser/extension_prefs.h" 25 #include "extensions/browser/extension_prefs.h"
24 #include "extensions/browser/extension_system.h" 26 #include "extensions/browser/extension_system.h"
25 #include "extensions/common/extension.h" 27 #include "extensions/common/extension.h"
26 #include "extensions/common/feature_switch.h" 28 #include "extensions/common/feature_switch.h"
27 #include "ui/base/test/material_design_controller_test_api.h" 29 #include "ui/base/test/material_design_controller_test_api.h"
28 30
29 namespace { 31 namespace {
30 32
31 // Verifies that the toolbar order matches for the given |actions_bar|. If the 33 // Verifies that the toolbar order matches for the given |actions_bar|. If the
32 // order matches, the return value is empty; otherwise, it contains the error. 34 // order matches, the return value is empty; otherwise, it contains the error.
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 87
86 } // namespace 88 } // namespace
87 89
88 ToolbarActionsBarUnitTest::ToolbarActionsBarUnitTest() 90 ToolbarActionsBarUnitTest::ToolbarActionsBarUnitTest()
89 : toolbar_model_(nullptr) {} 91 : toolbar_model_(nullptr) {}
90 92
91 ToolbarActionsBarUnitTest::~ToolbarActionsBarUnitTest() {} 93 ToolbarActionsBarUnitTest::~ToolbarActionsBarUnitTest() {}
92 94
93 void ToolbarActionsBarUnitTest::SetUp() { 95 void ToolbarActionsBarUnitTest::SetUp() {
94 BrowserWithTestWindowTest::SetUp(); 96 BrowserWithTestWindowTest::SetUp();
97 local_state_.reset(
98 new ScopedTestingLocalState(TestingBrowserProcess::GetGlobal()));
99
95 // The toolbar typically displays extension icons, so create some extension 100 // The toolbar typically displays extension icons, so create some extension
96 // test infrastructure. 101 // test infrastructure.
97 extensions::TestExtensionSystem* extension_system = 102 extensions::TestExtensionSystem* extension_system =
98 static_cast<extensions::TestExtensionSystem*>( 103 static_cast<extensions::TestExtensionSystem*>(
99 extensions::ExtensionSystem::Get(profile())); 104 extensions::ExtensionSystem::Get(profile()));
100 extension_system->CreateExtensionService( 105 extension_system->CreateExtensionService(
101 base::CommandLine::ForCurrentProcess(), 106 base::CommandLine::ForCurrentProcess(),
102 base::FilePath(), 107 base::FilePath(),
103 false); 108 false);
104 toolbar_model_ = 109 toolbar_model_ =
(...skipping 11 matching lines...) Expand all
116 } 121 }
117 } 122 }
118 123
119 void ToolbarActionsBarUnitTest::TearDown() { 124 void ToolbarActionsBarUnitTest::TearDown() {
120 // Since the profile gets destroyed in BrowserWithTestWindowTest::TearDown(), 125 // Since the profile gets destroyed in BrowserWithTestWindowTest::TearDown(),
121 // we need to delete this now. 126 // we need to delete this now.
122 browser_action_test_util_.reset(); 127 browser_action_test_util_.reset();
123 overflow_browser_action_test_util_.reset(); 128 overflow_browser_action_test_util_.reset();
124 ToolbarActionsBar::disable_animations_for_testing_ = false; 129 ToolbarActionsBar::disable_animations_for_testing_ = false;
125 material_design_state_.reset(); 130 material_design_state_.reset();
131 local_state_.reset();
126 BrowserWithTestWindowTest::TearDown(); 132 BrowserWithTestWindowTest::TearDown();
127 } 133 }
128 134
129 void ToolbarActionsBarUnitTest::ActivateTab(int index) { 135 void ToolbarActionsBarUnitTest::ActivateTab(int index) {
130 ASSERT_NE(nullptr, browser()->tab_strip_model()->GetWebContentsAt(index)); 136 ASSERT_NE(nullptr, browser()->tab_strip_model()->GetWebContentsAt(index));
131 browser()->tab_strip_model()->ActivateTabAt(index, true); 137 browser()->tab_strip_model()->ActivateTabAt(index, true);
132 } 138 }
133 139
134 scoped_refptr<const extensions::Extension> 140 scoped_refptr<const extensions::Extension>
135 ToolbarActionsBarUnitTest::CreateAndAddExtension( 141 ToolbarActionsBarUnitTest::CreateAndAddExtension(
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 extensions::extension_action_test_util::BROWSER_ACTION); 575 extensions::extension_action_test_util::BROWSER_ACTION);
570 toolbar_model()->SetVisibleIconCount(0u); 576 toolbar_model()->SetVisibleIconCount(0u);
571 { 577 {
572 base::RunLoop run_loop; 578 base::RunLoop run_loop;
573 toolbar_actions_bar()->PopOutAction(action, true, run_loop.QuitClosure()); 579 toolbar_actions_bar()->PopOutAction(action, true, run_loop.QuitClosure());
574 run_loop.Run(); 580 run_loop.Run();
575 } 581 }
576 EXPECT_EQ(1u, toolbar_actions_bar()->GetIconCount()); 582 EXPECT_EQ(1u, toolbar_actions_bar()->GetIconCount());
577 EXPECT_TRUE(toolbar_actions_bar()->NeedsOverflow()); 583 EXPECT_TRUE(toolbar_actions_bar()->NeedsOverflow());
578 } 584 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698