Make ToolbarActionsModel own ComponentToolbarActionsFactory

chrome/browser/ui/toolbar/media_router_action_controller.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/toolbar/media_router_action_controller.h"
 
 #include "chrome/browser/media/router/media_router_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h"
 #include "chrome/common/pref_names.h"
 
 MediaRouterActionController::MediaRouterActionController(Profile* profile)
     : MediaRouterActionController(
           profile,
           media_router::MediaRouterFactory::GetApiForBrowserContext(profile),
           ToolbarActionsModel::Get(profile),
-          ToolbarActionsModel::Get(profile)->component_migration_helper()) {
+          ToolbarActionsModel::Get(profile)->GetComponentMigrationHelper()) {
   DCHECK(component_action_delegate_);
   DCHECK(component_migration_helper_);
 }
 
 MediaRouterActionController::~MediaRouterActionController() {
   DCHECK_EQ(dialog_count_, 0u);
 }
 
 void MediaRouterActionController::OnIssue(const media_router::Issue& issue) {
   has_issue_ = true;
@@ skipping 61 matching lines @@
     component_action_delegate_->RemoveComponentAction(
         ComponentToolbarActionsFactory::kMediaRouterActionId);
   }
 }
 
 bool MediaRouterActionController::ShouldEnableAction() const {
   return has_local_display_route_ || has_issue_ || dialog_count_ ||
          component_migration_helper_->GetComponentActionPref(
              ComponentToolbarActionsFactory::kMediaRouterActionId);
 }