Close wrench menu when Media Router Action clicked in Views.

chrome/browser/ui/toolbar/toolbar_actions_bar.cc

 // Copyright 2014 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/toolbar_actions_bar.h"
 
 #include "base/auto_reset.h"
 #include "base/location.h"
 #include "base/profiler/scoped_tracker.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 251 matching lines @@
     size_t num_extension_actions = 0u;
     for (ToolbarActionViewController* action : toolbar_actions_) {
       // No component action should ever have a valid extension id, so we can
       // use this to check the extension amount.
       if (crx_file::id_util::IdIsValid(action->GetId()))
         ++num_extension_actions;
     }
 
     int num_component_actions =
         ComponentToolbarActionsFactory::GetInstance()->
-            GetNumComponentActions();
+            GetNumComponentActions(browser_);
     size_t num_total_actions = num_extension_actions + num_component_actions;
 
     DCHECK_LE(visible_icons, num_total_actions);
     DCHECK_EQ(model_->toolbar_items().size(), num_extension_actions);
   }
 #endif
 
   return visible_icons;
 }
 
@@ skipping 52 matching lines @@
     // actions are being highlighted.
     if (!model_->is_highlighting()) {
       // TODO(robliao): Remove ScopedTracker below once https://crbug.com/463337
       // is fixed.
       tracked_objects::ScopedTracker tracking_profile2(
           FROM_HERE_WITH_EXPLICIT_FUNCTION(
               "ToolbarActionsBar::CreateActions2"));
 
       ScopedVector<ToolbarActionViewController> component_actions =
           ComponentToolbarActionsFactory::GetInstance()->
-              GetComponentToolbarActions();
+              GetComponentToolbarActions(browser_);
       DCHECK(component_actions.empty() ||
           extensions::FeatureSwitch::extension_action_redesign()->IsEnabled());
       toolbar_actions_.insert(toolbar_actions_.end(),
                               component_actions.begin(),
                               component_actions.end());
       component_actions.weak_clear();
     }
 
     if (!toolbar_actions_.empty()) {
       // TODO(robliao): Remove ScopedTracker below once https://crbug.com/463337
@@ skipping 382 matching lines @@
   for (ToolbarActionViewController* action : toolbar_actions_) {
     if (action->GetId() == id)
       return action;
   }
   return nullptr;
 }
 
 content::WebContents* ToolbarActionsBar::GetCurrentWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }