Make ToolbarActionsModel own ComponentToolbarActionsFactory

chrome/browser/policy/policy_browsertest.cc

Index: chrome/browser/policy/policy_browsertest.cc
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 292b004e65a0ea7e4edcf91a74d61ebaa901b0d7..50ca3f8a702a98b94adf9c85541430c433dfff7b 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -228,6 +228,7 @@
 #if defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID)
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/media_router_action_controller.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #endif  // defined(ENABLE_MEDIA_ROUTER) && !defined(OS_ANDROID)
 
 using content::BrowserThread;
@@ -3611,8 +3612,10 @@ class MediaRouterActionPolicyTest : public PolicyTest {
  protected:
   bool HasMediaRouterActionAtInit() const {
     const std::set<std::string>& component_ids =
-        ComponentToolbarActionsFactory::GetInstance()->GetInitialComponentIds(
-            browser()->profile());
+        ToolbarActionsModel::Get(browser()->profile())
+            ->component_actions_factory()
+            ->GetInitialComponentIds();
+
     return base::ContainsKey(
         component_ids, ComponentToolbarActionsFactory::kMediaRouterActionId);
   }