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 fda3b2834aef58014ce56fca207d95c960fd762a..1c77345bbea40745a727ff99c9c251e938af09a7 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -230,6 +230,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;
@@ -3613,8 +3614,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);
   }