Views: Rebuild wrench menu if error is added or removed

chrome/browser/ui/views/toolbar_view.cc

Index: chrome/browser/ui/views/toolbar_view.cc
===================================================================
--- chrome/browser/ui/views/toolbar_view.cc	(revision 104036)
+++ chrome/browser/ui/views/toolbar_view.cc	(working copy)
@@ -133,7 +133,6 @@
       browser_, BackForwardMenuModel::BACKWARD_MENU));
   forward_menu_model_.reset(new BackForwardMenuModel(
       browser_, BackForwardMenuModel::FORWARD_MENU));
-  wrench_menu_model_.reset(new WrenchMenuModel(this, browser_));
   back_ = new views::ButtonDropDown(this, back_menu_model_.get());
   back_->set_triggerable_event_flags(ui::EF_LEFT_BUTTON_DOWN |
                                      ui::EF_MIDDLE_BUTTON_DOWN);
@@ -336,12 +335,13 @@
 void ToolbarView::RunMenu(views::View* source, const gfx::Point& /* pt */) {
   DCHECK_EQ(VIEW_ID_APP_MENU, source->id());
 
-  wrench_menu_.reset(new WrenchMenu(browser_));
-  wrench_menu_->Init(wrench_menu_model_.get());
+  WrenchMenu wrench_menu(browser_);
+  WrenchMenuModel model(this, browser_);
+  wrench_menu.Init(&model);
 
   FOR_EACH_OBSERVER(views::MenuListener, menu_listeners_, OnMenuOpened());
 
-  wrench_menu_->RunMenu(app_menu_);
+  wrench_menu.RunMenu(app_menu_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////