Index: chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc |
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc |
index dd0882290585707b7294663383ec0c9878a62127..8801cc6c7bbf1a11a78b5036545830c38f8e1844 100644 |
--- a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc |
+++ b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc |
@@ -132,8 +132,9 @@ TEST_F(WrenchMenuModelTest, Basics) { |
model.ActivatedAt(1); |
EXPECT_TRUE(model.IsEnabledAt(1)); |
// Make sure to use the index that is not separator in all configurations. |
- model.ActivatedAt(2); |
- EXPECT_TRUE(model.IsEnabledAt(2)); |
+ model.ActivatedAt(itemCount - 1); |
+ EXPECT_TRUE(model.IsEnabledAt(itemCount - 1)); |
+ |
EXPECT_EQ(model.execute_count_, 2); |
EXPECT_EQ(model.enable_count_, 2); |
@@ -145,7 +146,8 @@ TEST_F(WrenchMenuModelTest, Basics) { |
int bookmarksModelIndex = -1; |
for (int i = 0; i < itemCount; ++i) { |
if (model.GetTypeAt(i) == ui::MenuModel::TYPE_SUBMENU) { |
- bookmarksModelIndex = i; |
+ // Tabs is the first submenu item. Bookmarks submenu is under tabs. |
+ bookmarksModelIndex = i + 1; |
break; |
} |
} |
@@ -155,8 +157,10 @@ TEST_F(WrenchMenuModelTest, Basics) { |
// The bookmarks model may be empty until we tell it we're going to show it. |
bookmarksModel->MenuWillShow(); |
EXPECT_GT(bookmarksModel->GetItemCount(), 1); |
- bookmarksModel->ActivatedAt(1); |
- EXPECT_TRUE(bookmarksModel->IsEnabledAt(1)); |
+ |
+ // Bookmark manager item. |
+ bookmarksModel->ActivatedAt(4); |
+ EXPECT_TRUE(bookmarksModel->IsEnabledAt(4)); |
EXPECT_EQ(model.execute_count_, 1); |
EXPECT_EQ(model.enable_count_, 1); |
} |