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..5cf57f15070127f3a0aaf12c0c218b6f7fbd0c23 100644
--- a/chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc
+++ b/chrome/browser/ui/toolbar/component_toolbar_actions_browsertest.cc
@@ -20,22 +20,17 @@ 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();
+    // Swap out the actions factory for a mock one.
+    ToolbarActionsModel::Get(browser()->profile())

[msw, 2017/01/10 23:23:59]

optional nit: cache a local profile pointer

[takumif, 2017/02/17 03:22:51]

Done.

+        ->SetMockActionsFactory(new MockComponentToolbarActionsFactory(
+            browser()->profile(),
+            ToolbarActionsModel::Get(browser()->profile())));
   }
 
  private:
-  std::unique_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;

[msw, 2017/01/10 23:23:59]

Is this no longer needed?

[takumif, 2017/02/17 03:22:51]

No, removing.

-  std::unique_ptr<MockComponentToolbarActionsFactory> mock_actions_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(ComponentToolbarActionsBrowserTest);
 };
 
@@ -45,6 +40,10 @@ IN_PROC_BROWSER_TEST_F(ComponentToolbarActionsBrowserTest,
                        ComponentToolbarActionsShowUpAndRespondToClicks) {
   BrowserActionTestUtil browser_actions_bar(browser());
 
+  ToolbarActionsModel::Get(browser()->profile())
+      ->AddComponentAction(
+          MockComponentToolbarActionsFactory::kActionIdForTesting);
+
   // There should be only one component action view.
   ASSERT_EQ(1, browser_actions_bar.NumberOfBrowserActions());
 
@@ -53,11 +52,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()

[msw, 2017/01/10 23:23:59]

Should GetInitialComponentIds still be checked in this test?

[takumif, 2017/02/17 03:22:51]

This was just to make sure that the MockComponentToolbarActionsFactory returns a
test action as expected. I've changed to explicitly adding the action by calling
AddComponentAction() above, so this is no longer necessary.

-                    ->GetInitialComponentIds(browser()->profile())
-                    .size());
-
   const std::vector<ToolbarActionViewController*>& actions =
       browser_actions_bar.GetToolbarActionsBar()->GetActions();
   TestToolbarActionViewController* mock_component_action =