Make ToolbarActionsModel own ComponentToolbarActionsFactory

chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc

Index: chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc
diff --git a/chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc b/chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc
index 85d6a96c3bd2dfc981f31c031c607f332dff12d9..b3f00cb04521817619297edd0518e822a711af0c 100644
--- a/chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc
+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc
@@ -20,22 +20,20 @@ class ComponentToolbarActionsBrowserTest : public InProcessBrowserTest {
   ComponentToolbarActionsBrowserTest() {}
   ~ComponentToolbarActionsBrowserTest() override {}
 
-  void SetUpCommandLine(base::CommandLine* command_line) override {
-    InProcessBrowserTest::SetUpCommandLine(command_line);
-    enable_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(
-        extensions::FeatureSwitch::extension_action_redesign(), true));
-    mock_actions_factory_.reset(new MockComponentToolbarActionsFactory(
-        browser()));
-  }
+  void SetUpOnMainThread() override {
+    InProcessBrowserTest::SetUpOnMainThread();
 
-  MockComponentToolbarActionsFactory* mock_factory() {
-    return mock_actions_factory_.get();
+    // Replace the actions factory with a mock one.
+    toolbar_model_ = ToolbarActionsModel::Get(browser()->profile());
+    toolbar_model_->SetMockActionsFactoryForTest(
+        base::MakeUnique<MockComponentToolbarActionsFactory>(
+            browser()->profile()));
   }
 
- private:
-  std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;
-  std::unique_ptr<MockComponentToolbarActionsFactory> mock_actions_factory_;
+ protected:
+  ToolbarActionsModel* toolbar_model_ = nullptr;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(ComponentToolbarActionsBrowserTest);
 };
 
@@ -44,6 +42,8 @@ class ComponentToolbarActionsBrowserTest : public InProcessBrowserTest {
 IN_PROC_BROWSER_TEST_F(ComponentToolbarActionsBrowserTest,
                        ComponentToolbarActionsShowUpAndRespondToClicks) {
   BrowserActionTestUtil browser_actions_bar(browser());
+  toolbar_model_->AddComponentAction(
+      MockComponentToolbarActionsFactory::kActionIdForTesting);
 
   // There should be only one component action view.
   ASSERT_EQ(1, browser_actions_bar.NumberOfBrowserActions());
@@ -53,11 +53,6 @@ IN_PROC_BROWSER_TEST_F(ComponentToolbarActionsBrowserTest,
   EXPECT_EQ(MockComponentToolbarActionsFactory::kActionIdForTesting,
             browser_actions_bar.GetExtensionId(0));
 
-  // There should only have been one created component action.
-  EXPECT_EQ(1u, ComponentToolbarActionsFactory::GetInstance()
-                    ->GetInitialComponentIds(browser()->profile())
-                    .size());
-
   const std::vector<ToolbarActionViewController*>& actions =
       browser_actions_bar.GetToolbarActionsBar()->GetActions();
   TestToolbarActionViewController* mock_component_action =