Wrench menu reorg phase 2

chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc

 // Copyright (c) 2012 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/wrench_menu_model.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
@@ skipping 136 matching lines @@
   EXPECT_EQ(model.enable_count_, 2);
 
   model.execute_count_ = 0;
   model.enable_count_ = 0;
 
   // Choose something from the bookmark submenu and make sure it makes it back
   // to the delegate as well.
   int bookmarksModelIndex = -1;
   for (int i = 0; i < itemCount; ++i) {
     if (model.GetTypeAt(i) == ui::MenuModel::TYPE_SUBMENU) {
-      // Tabs is the first submenu item. Bookmarks submenu is under tabs.
-      bookmarksModelIndex = i + 1;
+      // Tabs is the first submenu item followed by downloads then the
+      // Bookmarks submenu.

[Peter Kasting, 2015/06/17 22:59:43]

Nit: "The bookmarks submenu comes after the Tabs and Downloads items."

[edwardjung, 2015/06/18 16:52:05]

Done.

+      bookmarksModelIndex = i + 2;
       break;
     }
   }
   EXPECT_GT(bookmarksModelIndex, -1);
   ui::MenuModel* bookmarksModel = model.GetSubmenuModelAt(bookmarksModelIndex);
   EXPECT_TRUE(bookmarksModel);
   // The bookmarks model may be empty until we tell it we're going to show it.
   bookmarksModel->MenuWillShow();
   EXPECT_GT(bookmarksModel->GetItemCount(), 1);
 
@@ skipping 38 matching lines @@
 
 class EncodingMenuModelTest : public BrowserWithTestWindowTest,
                               public MenuModelTest {
 };
 
 TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) {
   EncodingMenuModel model(browser());
   ASSERT_EQ(NULL, browser()->tab_strip_model()->GetActiveWebContents());
   EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_WINDOWS1252));
 }