[Extensions] Fix hiding browser actions without the toolbar redesign

chrome/browser/ui/views/toolbar/chevron_menu_button.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/views/toolbar/chevron_menu_button.h"
 
 #include "base/location.h"
 #include "base/memory/scoped_vector.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 194 matching lines @@
   if (!for_drop_) {
     // Give the context menu (if any) a chance to execute the user-selected
     // command.
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(&ChevronMenuButton::MenuDone,
                               owner_->weak_factory_.GetWeakPtr()));
   }
 }
 
 void ChevronMenuButton::MenuController::CloseMenu() {
+  icon_updaters_.clear();

[Devlin, 2015/10/27 21:15:02]

Note: added this so that updaters were cleared when the menu's closed, since it
might be closed as a part of removing an action.

   menu_->Cancel();
 }
 
 bool ChevronMenuButton::MenuController::IsCommandEnabled(int id) const {
   ToolbarActionView* view =
       browser_actions_container_->GetToolbarActionViewAt(start_index_ + id - 1);
   return view->view_controller()->IsEnabled(view->GetCurrentWebContents());
 }
 
 void ChevronMenuButton::MenuController::ExecuteCommand(int id) {
@@ skipping 215 matching lines @@
   // We should never try to show an overflow menu when one is already visible.
   DCHECK(!menu_controller_);
   menu_controller_.reset(new MenuController(
       this, browser_actions_container_, for_drop));
   menu_controller_->RunMenu(GetWidget());
 }
 
 void ChevronMenuButton::MenuDone() {
   menu_controller_.reset();
 }