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

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

Issue 2952163002: Remove InProcessBrowserTest::SetUpOnMainThread() calls. (Closed)
Patch Set: rebase Created 3 years, 5 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 <memory> 5 #include <memory>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "chrome/browser/extensions/browser_action_test_util.h" 8 #include "chrome/browser/extensions/browser_action_test_util.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" 10 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
11 #include "chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h" 11 #include "chrome/browser/ui/toolbar/mock_component_toolbar_actions_factory.h"
12 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h" 12 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h"
13 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" 13 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
14 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" 14 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
15 #include "chrome/test/base/in_process_browser_test.h" 15 #include "chrome/test/base/in_process_browser_test.h"
16 #include "extensions/common/feature_switch.h" 16 #include "extensions/common/feature_switch.h"
17 17
18 class ComponentToolbarActionsBrowserTest : public InProcessBrowserTest { 18 class ComponentToolbarActionsBrowserTest : public InProcessBrowserTest {
19 protected: 19 protected:
20 ComponentToolbarActionsBrowserTest() {} 20 ComponentToolbarActionsBrowserTest() {}
21 ~ComponentToolbarActionsBrowserTest() override {} 21 ~ComponentToolbarActionsBrowserTest() override {}
22 22
23 void SetUpOnMainThread() override { 23 void SetUpOnMainThread() override {
24 InProcessBrowserTest::SetUpOnMainThread();
25
26 // Replace the actions factory with a mock one. 24 // Replace the actions factory with a mock one.
27 toolbar_model_ = ToolbarActionsModel::Get(browser()->profile()); 25 toolbar_model_ = ToolbarActionsModel::Get(browser()->profile());
28 toolbar_model_->SetMockActionsFactoryForTest( 26 toolbar_model_->SetMockActionsFactoryForTest(
29 base::MakeUnique<MockComponentToolbarActionsFactory>( 27 base::MakeUnique<MockComponentToolbarActionsFactory>(
30 browser()->profile())); 28 browser()->profile()));
31 } 29 }
32 30
33 protected: 31 protected:
34 ToolbarActionsModel* toolbar_model_ = nullptr; 32 ToolbarActionsModel* toolbar_model_ = nullptr;
35 33
(...skipping 21 matching lines...) Expand all
57 browser_actions_bar.GetToolbarActionsBar()->GetActions(); 55 browser_actions_bar.GetToolbarActionsBar()->GetActions();
58 TestToolbarActionViewController* mock_component_action = 56 TestToolbarActionViewController* mock_component_action =
59 static_cast<TestToolbarActionViewController* const>(actions[0]); 57 static_cast<TestToolbarActionViewController* const>(actions[0]);
60 ASSERT_TRUE(mock_component_action); 58 ASSERT_TRUE(mock_component_action);
61 59
62 // Test that clicking on the component action works. 60 // Test that clicking on the component action works.
63 EXPECT_EQ(0, mock_component_action->execute_action_count()); 61 EXPECT_EQ(0, mock_component_action->execute_action_count());
64 browser_actions_bar.Press(0); 62 browser_actions_bar.Press(0);
65 EXPECT_EQ(1, mock_component_action->execute_action_count()); 63 EXPECT_EQ(1, mock_component_action->execute_action_count());
66 } 64 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698