Make ToolbarActionsModel ignore calls to AddComponentAction() before initialization

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"
@@ skipping 43 matching lines @@
   DCHECK(component_action_delegate_);
   RegisterObserver();  // media_router::IssuesObserver.
   pref_change_registrar_.Init(profile->GetPrefs());
   pref_change_registrar_.Add(
       prefs::kToolbarMigratedComponentActionStatus,
       base::Bind(&MediaRouterActionController::MaybeAddOrRemoveAction,
                  base::Unretained(this)));
 }
 
 void MediaRouterActionController::MaybeAddOrRemoveAction() {
+  if (!component_action_delegate_->ActionsInitialized())

[Devlin, 2016/10/25 22:12:13]

I'd have a slight preference to put this check in
ToolbarActionsModel::AddComponentAction().

[takumif, 2016/10/26 01:22:01]

Yeah, that would be simpler.

I thought about adding the check to RemoveComponentAction() as well, but I think
it doesn't need it because if the model isn't initialized, HasAction() wouldn't
return true, in which case Remove shouldn't be called anyways.

+    return;
+
   if (ShouldEnableAction()) {
     if (!component_action_delegate_->HasComponentAction(
             ComponentToolbarActionsFactory::kMediaRouterActionId))
       component_action_delegate_->AddComponentAction(
           ComponentToolbarActionsFactory::kMediaRouterActionId);
   } else if (component_action_delegate_->HasComponentAction(
                  ComponentToolbarActionsFactory::kMediaRouterActionId)) {
     component_action_delegate_->RemoveComponentAction(
         ComponentToolbarActionsFactory::kMediaRouterActionId);
   }
 }
 
 bool MediaRouterActionController::ShouldEnableAction() const {
   return has_local_display_route_ || has_issue_ ||
          component_migration_helper_->GetComponentActionPref(
              ComponentToolbarActionsFactory::kMediaRouterActionId);
 }