Wrench menu reorg phase 2

chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

 // 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 "base/command_line.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
@@ skipping 180 matching lines @@
 
   [controller() setModel:fake_model_.get()];
   NSMenu* menu = [controller() menu];
   [controller() updateRecentTabsSubmenu];
 
   NSString* title = l10n_util::GetNSStringWithFixup(IDS_RECENT_TABS_MENU);
   NSMenu* recent_tabs_menu = [[menu itemWithTitle:title] submenu];
   EXPECT_TRUE(recent_tabs_menu);
   EXPECT_EQ(7, [recent_tabs_menu numberOfItems]);
 
-  // Index 0: restore tabs menu item.
-  NSString* restore_tab_label = l10n_util::FixUpWindowsStyleLabel(
-      recent_tabs_sub_menu_model.GetLabelAt(0));
-  EXPECT_NSEQ(restore_tab_label, [[recent_tabs_menu itemAtIndex:0] title]);
-
   // Item 1: separator.
   EXPECT_TRUE([[recent_tabs_menu itemAtIndex:1] isSeparatorItem]);
 
-  // Item 2: window title.
+  // Index 2: restore tabs menu item.
+  NSString* restore_tab_label = l10n_util::FixUpWindowsStyleLabel(
+      recent_tabs_sub_menu_model.GetLabelAt(2));
+  EXPECT_NSEQ(restore_tab_label, [[recent_tabs_menu itemAtIndex:2] title]);
+
+  // Item 3: separator.
+  EXPECT_TRUE([[recent_tabs_menu itemAtIndex:3] isSeparatorItem]);
+
+  // Item 4: window title.
   EXPECT_NSEQ(
-      base::SysUTF16ToNSString(recent_tabs_sub_menu_model.GetLabelAt(2)),
-      [[recent_tabs_menu itemAtIndex:2] title]);
+      base::SysUTF16ToNSString(recent_tabs_sub_menu_model.GetLabelAt(4)),
+      [[recent_tabs_menu itemAtIndex:4] title]);
 
-  // Item 3: short tab title.
+  // Item 5: short tab title.
   EXPECT_NSEQ(base::SysUTF16ToNSString(tab1_short_title),
-              [[recent_tabs_menu itemAtIndex:3] title]);
+              [[recent_tabs_menu itemAtIndex:5] title]);
 
-  // Item 4: long tab title.
-  NSString* tab2_actual_title = [[recent_tabs_menu itemAtIndex:4] title];
+  // Item 6: long tab title.
+  NSString* tab2_actual_title = [[recent_tabs_menu itemAtIndex:6] title];
   NSUInteger title_length = [tab2_actual_title length];
   EXPECT_GT(tab2_long_title.size(), title_length);
   NSString* actual_substring =
       [tab2_actual_title substringToIndex:title_length - 1];
   NSString* expected_substring = [base::SysUTF16ToNSString(tab2_long_title)
       substringToIndex:title_length - 1];
   EXPECT_NSEQ(expected_substring, actual_substring);
 
   controller_.reset();
   fake_model_.reset();
 }
 
 // Verify that |RecentTabsMenuModelDelegate| is deleted before the model
 // it's observing.
 TEST_F(WrenchMenuControllerTest, RecentTabDeleteOrder) {
   [controller_ menuNeedsUpdate:[controller_ menu]];
   // If the delete order is wrong then the test will crash on exit.
 }
 
 }  // namespace