Fixes possible crash in showing bookmark menu. The problem occurred...

chrome/browser/views/bookmark_menu_controller_views.cc

 // Copyright (c) 2009 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/views/bookmark_menu_controller_views.h"
 
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
@@ skipping 238 matching lines @@
   int start_index;
   const BookmarkNode* node =
       bookmark_bar_->GetNodeForButtonAt(bookmark_bar_loc, &start_index);
   if (!node || !node->is_folder())
     return NULL;
 
   MenuItemView* alt_menu = node_to_menu_map_[node];
   if (!alt_menu)
     alt_menu = CreateMenu(node, start_index);
 
-  if (alt_menu)
-    menu_ = alt_menu;
+  menu_ = alt_menu;
 
   *button = bookmark_bar_->GetMenuButtonForNode(node);
   bookmark_bar_->GetAnchorPositionAndStartIndexForButton(
       *button, anchor, &start_index);
   *has_mnemonics = false;
   return alt_menu;
 }
 
 void BookmarkMenuController::BookmarkModelChanged() {
   menu_->Cancel();
 }
 
 void BookmarkMenuController::BookmarkNodeFavIconLoaded(
     BookmarkModel* model, const BookmarkNode* node) {
-  if (node_to_menu_id_map_.find(node) != node_to_menu_id_map_.end())
-    menu_->SetIcon(model->GetFavIcon(node), node_to_menu_id_map_[node]);
+  std::map<const BookmarkNode*, int>::iterator menu_pair =
+      node_to_menu_id_map_.find(node);
+  if (menu_pair == node_to_menu_id_map_.end())
+    return;  // We're not showing a menu item for the node.
+
+  // Iterate through the menus looking for the menu containing node.
+  for (NodeToMenuMap::iterator i = node_to_menu_map_.begin();
+       i != node_to_menu_map_.end(); ++i) {
+    MenuItemView* menu_item = i->second->GetMenuItemByID(menu_pair->second);
+    if (menu_item) {
+      menu_item->SetIcon(model->GetFavIcon(node));
+      return;
+    }
+  }
 }
 
 MenuItemView* BookmarkMenuController::CreateMenu(const BookmarkNode* parent,
                                                  int start_child_index) {
   MenuItemView* menu = new MenuItemView(this);
   menu->SetCommand(next_menu_id_++);
   menu_id_to_node_map_[menu->GetCommand()] = parent;
   menu->set_has_icons(true);
   BuildMenu(parent, start_child_index, menu, &next_menu_id_);
   if (show_other_folder_)
@@ skipping 46 matching lines @@
     menu_id_to_node_map_[id] = node;
   }
 }
 
 BookmarkMenuController::~BookmarkMenuController() {
   profile_->GetBookmarkModel()->RemoveObserver(this);
   if (observer_)
     observer_->BookmarkMenuDeleted(this);
   STLDeleteValues(&node_to_menu_map_);
 }