Restructure the wrench menu into an action based order

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/prefs/browser_prefs.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 114 matching lines @@
   // the exact number.
   EXPECT_GT(itemCount, 10);
 
   // Execute a couple of the items and make sure it gets back to our delegate.
   // We can't use CountEnabledExecutable() here because the encoding menu's
   // delegate is internal, it doesn't use the one we pass in.
   // Note: The new menu has a spacing separator at the first slot.
   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);
 
   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) {
-      bookmarksModelIndex = i;
+      // Tabs is the first submenu item. Bookmarks submenu is under tabs.
+      bookmarksModelIndex = i + 1;
       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);
-  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);
 }
 
 // Tests global error menu items in the wrench menu.
 TEST_F(WrenchMenuModelTest, GlobalError) {
   // Make sure services required for tests are initialized.
   GlobalErrorService* service =
       GlobalErrorServiceFactory::GetForProfile(browser()->profile());
   ProfileOAuth2TokenServiceFactory::GetForProfile(browser()->profile());
@@ skipping 25 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));
 }