Wrench menu reorg phase 2

chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc

 // Copyright 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/recent_tabs_sub_menu_model.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 152 matching lines @@
   scoped_ptr<sync_driver::LocalDeviceInfoProviderMock> local_device_;
 };
 
 // Test disabled "Recently closed" header with no foreign tabs.
 TEST_F(RecentTabsSubMenuModelTest, NoTabs) {
   TestRecentTabsSubMenuModel model(NULL, browser(), NULL);
 
   // Expected menu:
   // Menu index  Menu items
   // ---------------------------------------------
-  // 0           Recently closed header (disabled)
+  // 0           History
   // 1           <separator>
-  // 2           No tabs from other Devices
+  // 2           Recently closed header (disabled)
+  // 3           <separator>
+  // 4           No tabs from other Devices
 
   int num_items = model.GetItemCount();
-  EXPECT_EQ(3, num_items);
-  EXPECT_FALSE(model.IsEnabledAt(0));
+  EXPECT_EQ(5, num_items);
   EXPECT_FALSE(model.IsEnabledAt(2));
+  EXPECT_FALSE(model.IsEnabledAt(4));
   EXPECT_EQ(0, model.enable_count());
 
   EXPECT_EQ(NULL, model.GetLabelFontListAt(0));
   EXPECT_EQ(NULL, model.GetLabelFontListAt(1));
   EXPECT_EQ(NULL, model.GetLabelFontListAt(2));
+  EXPECT_EQ(NULL, model.GetLabelFontListAt(3));
+  EXPECT_EQ(NULL, model.GetLabelFontListAt(4));
 
   std::string url;
   base::string16 title;
   EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(0, &url, &title));
   EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(1, &url, &title));
   EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(2, &url, &title));
+  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(3, &url, &title));
+  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(4, &url, &title));
 }
 
 // Test enabled "Recently closed" header with no foreign tabs.
 TEST_F(RecentTabsSubMenuModelTest, RecentlyClosedTabsFromCurrentSession) {
   TabRestoreServiceFactory::GetInstance()->SetTestingFactory(
       profile(), RecentTabsSubMenuModelTest::GetTabRestoreService);
 
   // Add 2 tabs and close them.
   AddTab(browser(), GURL("http://foo/1"));
   AddTab(browser(), GURL("http://foo/2"));
   browser()->tab_strip_model()->CloseAllTabs();
 
   TestRecentTabsSubMenuModel model(NULL, browser(), NULL);
   // Expected menu:
   // Menu index  Menu items
   // --------------------------------------
-  // 0           Recently closed header
-  // 1           <tab for http://foo/2>
-  // 2           <tab for http://foo/1>
-  // 3           <separator>
-  // 4           No tabs from other Devices
+  // 0           History
+  // 1           <separator>
+  // 2           Recently closed header
+  // 3           <tab for http://foo/2>
+  // 4           <tab for http://foo/1>
+  // 5           <separator>
+  // 6           No tabs from other Devices
   int num_items = model.GetItemCount();
-  EXPECT_EQ(5, num_items);
-  EXPECT_FALSE(model.IsEnabledAt(0));
+  EXPECT_EQ(7, num_items);
+  EXPECT_TRUE(model.IsEnabledAt(0));
+  model.ActivatedAt(0);
   EXPECT_TRUE(model.IsEnabledAt(1));
-  EXPECT_TRUE(model.IsEnabledAt(2));
-  model.ActivatedAt(1);
-  model.ActivatedAt(2);
-  EXPECT_FALSE(model.IsEnabledAt(4));
-  EXPECT_EQ(2, model.enable_count());
-  EXPECT_EQ(2, model.execute_count());
+  EXPECT_FALSE(model.IsEnabledAt(2));
+  EXPECT_TRUE(model.IsEnabledAt(3));
+  EXPECT_TRUE(model.IsEnabledAt(4));
+  model.ActivatedAt(3);
+  model.ActivatedAt(4);
+  EXPECT_FALSE(model.IsEnabledAt(6));
+  EXPECT_EQ(3, model.enable_count());
+  EXPECT_EQ(3, model.execute_count());
 
-  EXPECT_TRUE(model.GetLabelFontListAt(0) != NULL);
+  EXPECT_EQ(NULL, model.GetLabelFontListAt(0));
   EXPECT_EQ(NULL, model.GetLabelFontListAt(1));
-  EXPECT_EQ(NULL, model.GetLabelFontListAt(2));
+  EXPECT_TRUE(model.GetLabelFontListAt(2) != NULL);
   EXPECT_EQ(NULL, model.GetLabelFontListAt(3));
   EXPECT_EQ(NULL, model.GetLabelFontListAt(4));
+  EXPECT_EQ(NULL, model.GetLabelFontListAt(5));
+  EXPECT_EQ(NULL, model.GetLabelFontListAt(6));
 
   std::string url;
   base::string16 title;
   EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(0, &url, &title));
-  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(1, &url, &title));
-  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(2, &url, &title));
-  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(3, &url, &title));
-  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(4, &url, &title));
+  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(1, &url, &title));
+  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(2, &url, &title));
+  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(3, &url, &title));
+  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(4, &url, &title));
+  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(5, &url, &title));
+  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(6, &url, &title));
 }
 
 // TODO(sail): enable this test when dynamic model is enabled in
 // RecentTabsSubMenuModel.
 #if defined(OS_MACOSX)
 #define MAYBE_RecentlyClosedTabsAndWindowsFromLastSession \
     DISABLED_RecentlyClosedTabsAndWindowsFromLastSession
 #else
 #define MAYBE_RecentlyClosedTabsAndWindowsFromLastSession \
     RecentlyClosedTabsAndWindowsFromLastSession
@@ skipping 39 matching lines @@
   // Let the shutdown of previous TabRestoreService run.
   content::RunAllBlockingPoolTasksUntilIdle();
 
   TestRecentTabsSubMenuModel model(NULL, browser(), NULL);
   TestRecentTabsMenuModelDelegate delegate(&model);
   EXPECT_FALSE(delegate.got_changes());
 
   // Expected menu before tabs/windows from last session are loaded:
   // Menu index  Menu items
   // ----------------------------------------------------------------
-  // 0           Recently closed header
+  // 0           History
   // 1           <separator>
-  // 2           No tabs from other Devices
+  // 2           Recently closed header
+  // 3           <separator>
+  // 4           No tabs from other Devices
 
   int num_items = model.GetItemCount();
-  EXPECT_EQ(3, num_items);
-  EXPECT_FALSE(model.IsEnabledAt(0));
+  EXPECT_EQ(5, num_items);
+  EXPECT_TRUE(model.IsEnabledAt(0));
   EXPECT_EQ(ui::MenuModel::TYPE_SEPARATOR, model.GetTypeAt(1));
   EXPECT_FALSE(model.IsEnabledAt(2));
-  EXPECT_EQ(0, model.enable_count());
+  EXPECT_EQ(ui::MenuModel::TYPE_SEPARATOR, model.GetTypeAt(3));
+  EXPECT_FALSE(model.IsEnabledAt(4));
+  EXPECT_EQ(1, model.enable_count());
 
   // Wait for tabs from last session to be loaded.
   WaitForLoadFromLastSession();
 
   // Expected menu after tabs/windows from last session are loaded:
   // Menu index  Menu items
   // --------------------------------------------------------------
-  // 0           Recently closed header
-  // 1           <window for the tab http://wnd1/tab0>
-  // 2           <tab for http://wnd0/tab1>
-  // 3           <tab for http://wnd0/tab0>
-  // 4           <separator>
-  // 5           No tabs from other Devices
+  // 0           History
+  // 1           <separator>
+  // 2           Recently closed header
+  // 3           <window for the tab http://wnd1/tab0>
+  // 4           <tab for http://wnd0/tab1>
+  // 5           <tab for http://wnd0/tab0>
+  // 6           <separator>
+  // 7           No tabs from other Devices
 
   EXPECT_TRUE(delegate.got_changes());
 
   num_items = model.GetItemCount();
-  EXPECT_EQ(6, num_items);
-  EXPECT_FALSE(model.IsEnabledAt(0));
+  EXPECT_EQ(8, num_items);
+
+  EXPECT_TRUE(model.IsEnabledAt(0));
+  model.ActivatedAt(0);
   EXPECT_TRUE(model.IsEnabledAt(1));
-  EXPECT_TRUE(model.IsEnabledAt(2));
+  EXPECT_EQ(ui::MenuModel::TYPE_SEPARATOR, model.GetTypeAt(1));
+  EXPECT_FALSE(model.IsEnabledAt(2));
   EXPECT_TRUE(model.IsEnabledAt(3));
-  model.ActivatedAt(1);
-  model.ActivatedAt(2);
+  EXPECT_TRUE(model.IsEnabledAt(4));
+  EXPECT_TRUE(model.IsEnabledAt(5));
   model.ActivatedAt(3);
-  EXPECT_EQ(ui::MenuModel::TYPE_SEPARATOR, model.GetTypeAt(4));
-  EXPECT_FALSE(model.IsEnabledAt(5));
-  EXPECT_EQ(3, model.enable_count());
-  EXPECT_EQ(3, model.execute_count());
+  model.ActivatedAt(4);
+  model.ActivatedAt(5);
+  EXPECT_EQ(ui::MenuModel::TYPE_SEPARATOR, model.GetTypeAt(6));
+  EXPECT_FALSE(model.IsEnabledAt(7));
+  EXPECT_EQ(5, model.enable_count());
+  EXPECT_EQ(4, model.execute_count());
 
-  EXPECT_TRUE(model.GetLabelFontListAt(0) != NULL);
+  EXPECT_EQ(NULL, model.GetLabelFontListAt(0));
   EXPECT_EQ(NULL, model.GetLabelFontListAt(1));
-  EXPECT_EQ(NULL, model.GetLabelFontListAt(2));
+  EXPECT_TRUE(model.GetLabelFontListAt(2) != NULL);
   EXPECT_EQ(NULL, model.GetLabelFontListAt(3));
   EXPECT_EQ(NULL, model.GetLabelFontListAt(4));
   EXPECT_EQ(NULL, model.GetLabelFontListAt(5));
+  EXPECT_EQ(NULL, model.GetLabelFontListAt(6));
+  EXPECT_EQ(NULL, model.GetLabelFontListAt(7));
 
   std::string url;
   base::string16 title;
   EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(0, &url, &title));
   EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(1, &url, &title));
-  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(2, &url, &title));
-  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(3, &url, &title));
-  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(4, &url, &title));
-  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(5, &url, &title));
+  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(2, &url, &title));
+  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(3, &url, &title));
+  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(4, &url, &title));
+  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(5, &url, &title));
+  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(6, &url, &title));
+  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(7, &url, &title));
 }
 
 // Test disabled "Recently closed" header with multiple sessions, multiple
 // windows, and multiple enabled tabs from other devices.
 TEST_F(RecentTabsSubMenuModelTest, OtherDevices) {
   // Tabs are populated in decreasing timestamp.
   base::Time timestamp = base::Time::Now();
   const base::TimeDelta time_delta = base::TimeDelta::FromMinutes(10);
 
   RecentTabsBuilderTestHelper recent_tabs_builder;
@@ skipping 17 matching lines @@
   timestamp -= time_delta;
   recent_tabs_builder.AddTabWithInfo(1, 1, timestamp, base::string16());
 
   RegisterRecentTabs(&recent_tabs_builder);
 
   // Verify that data is populated correctly in RecentTabsSubMenuModel.
   // Expected menu:
   // - first inserted tab is most recent and hence is top
   // Menu index  Menu items
   // -----------------------------------------------------
-  // 0           Recently closed header (disabled)
+  // 0           History
   // 1           <separator>
-  // 2           <section header for 1st session>
-  // 3-5         <3 tabs of the only window of session 0>
-  // 6           <separator>
-  // 7           <section header for 2nd session>
-  // 8           <the only tab of window 0 of session 1>
-  // 9-10        <2 tabs of window 1 of session 2>
-  // 11          <separator>
-  // 12          More...
+  // 2           Recently closed header (disabled)
+  // 3           <separator>
+  // 4           <section header for 1st session>
+  // 5-7         <3 tabs of the only window of session 0>
+  // 8           <separator>
+  // 9           <section header for 2nd session>
+  // 10          <the only tab of window 0 of session 1>
+  // 11-12       <2 tabs of window 1 of session 2>
 
   TestRecentTabsSubMenuModel model(NULL, browser(), GetOpenTabsDelegate());
   int num_items = model.GetItemCount();
   EXPECT_EQ(13, num_items);
   model.ActivatedAt(0);
-  EXPECT_FALSE(model.IsEnabledAt(0));
+  EXPECT_TRUE(model.IsEnabledAt(0));
+  model.ActivatedAt(1);
+  EXPECT_TRUE(model.IsEnabledAt(1));
+  model.ActivatedAt(2);
+  EXPECT_FALSE(model.IsEnabledAt(2));
   model.ActivatedAt(3);
   EXPECT_TRUE(model.IsEnabledAt(3));
-  model.ActivatedAt(4);
-  EXPECT_TRUE(model.IsEnabledAt(4));
   model.ActivatedAt(5);
   EXPECT_TRUE(model.IsEnabledAt(5));
-  model.ActivatedAt(8);
-  EXPECT_TRUE(model.IsEnabledAt(8));
-  model.ActivatedAt(9);
-  EXPECT_TRUE(model.IsEnabledAt(9));
+  model.ActivatedAt(6);
+  EXPECT_TRUE(model.IsEnabledAt(6));
+  model.ActivatedAt(7);
+  EXPECT_TRUE(model.IsEnabledAt(7));
   model.ActivatedAt(10);
   EXPECT_TRUE(model.IsEnabledAt(10));
+  model.ActivatedAt(11);
+  EXPECT_TRUE(model.IsEnabledAt(11));
+  model.ActivatedAt(12);
   EXPECT_TRUE(model.IsEnabledAt(12));
+
   EXPECT_EQ(7, model.enable_count());
-  EXPECT_EQ(7, model.execute_count());
+  EXPECT_EQ(10, model.execute_count());
 
   EXPECT_EQ(NULL, model.GetLabelFontListAt(0));
   EXPECT_EQ(NULL, model.GetLabelFontListAt(1));
-  EXPECT_TRUE(model.GetLabelFontListAt(2) != NULL);
+  EXPECT_EQ(NULL, model.GetLabelFontListAt(2));
   EXPECT_EQ(NULL, model.GetLabelFontListAt(3));
-  EXPECT_EQ(NULL, model.GetLabelFontListAt(4));
+  EXPECT_TRUE(model.GetLabelFontListAt(4) != NULL);
   EXPECT_EQ(NULL, model.GetLabelFontListAt(5));
   EXPECT_EQ(NULL, model.GetLabelFontListAt(6));
-  EXPECT_TRUE(model.GetLabelFontListAt(7) != NULL);
+  EXPECT_EQ(NULL, model.GetLabelFontListAt(7));
   EXPECT_EQ(NULL, model.GetLabelFontListAt(8));
-  EXPECT_EQ(NULL, model.GetLabelFontListAt(9));
+  EXPECT_TRUE(model.GetLabelFontListAt(9) != NULL);
   EXPECT_EQ(NULL, model.GetLabelFontListAt(10));
   EXPECT_EQ(NULL, model.GetLabelFontListAt(11));
   EXPECT_EQ(NULL, model.GetLabelFontListAt(12));
 
   std::string url;
   base::string16 title;
   EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(0, &url, &title));
   EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(1, &url, &title));
   EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(2, &url, &title));
-  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(3, &url, &title));
-  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(4, &url, &title));
+  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(3, &url, &title));
+  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(4, &url, &title));
   EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(5, &url, &title));
-  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(6, &url, &title));
-  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(7, &url, &title));
-  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(8, &url, &title));
-  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(9, &url, &title));
+  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(6, &url, &title));
+  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(7, &url, &title));
+  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(8, &url, &title));
+  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(9, &url, &title));
   EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(10, &url, &title));
-  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(11, &url, &title));
-  EXPECT_FALSE(model.GetURLAndTitleForItemAtIndex(12, &url, &title));
+  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(11, &url, &title));
+  EXPECT_TRUE(model.GetURLAndTitleForItemAtIndex(12, &url, &title));
 }
 
 TEST_F(RecentTabsSubMenuModelTest, MaxSessionsAndRecency) {
   // Create 4 sessions : each session has 1 window with 1 tab each.
   RecentTabsBuilderTestHelper recent_tabs_builder;
   for (int s = 0; s < 4; ++s) {
     recent_tabs_builder.AddSession();
     recent_tabs_builder.AddWindow(s);
     recent_tabs_builder.AddTab(s, 0);
   }
   RegisterRecentTabs(&recent_tabs_builder);
 
   // Verify that data is populated correctly in RecentTabsSubMenuModel.
   // Expected menu:
   // - max sessions is 3, so only 3 most-recent sessions will show.
   // Menu index  Menu items
   // ----------------------------------------------------------
-  // 0           Recently closed header (disabled)
+  // 0           History
   // 1           <separator>
-  // 2           <section header for 1st session>
-  // 3           <the only tab of the only window of session 3>
-  // 4           <separator>
-  // 5           <section header for 2nd session>
-  // 6           <the only tab of the only window of session 2>
-  // 7           <separator>
-  // 8           <section header for 3rd session>
-  // 9           <the only tab of the only window of session 1>
-  // 10          <separator>
-  // 11          More...
+  // 2           Recently closed header (disabled)
+  // 3           <separator>
+  // 4           <section header for 1st session>
+  // 5           <the only tab of the only window of session 3>
+  // 6           <separator>
+  // 7           <section header for 2nd session>
+  // 8           <the only tab of the only window of session 2>
+  // 9           <separator>
+  // 10          <section header for 3rd session>
+  // 11          <the only tab of the only window of session 1>
 
   TestRecentTabsSubMenuModel model(NULL, browser(), GetOpenTabsDelegate());
   int num_items = model.GetItemCount();
   EXPECT_EQ(12, num_items);
 
   std::vector<base::string16> tab_titles =
       recent_tabs_builder.GetTabTitlesSortedByRecency();
-  EXPECT_EQ(tab_titles[0], model.GetLabelAt(3));
-  EXPECT_EQ(tab_titles[1], model.GetLabelAt(6));
-  EXPECT_EQ(tab_titles[2], model.GetLabelAt(9));
+  EXPECT_EQ(tab_titles[0], model.GetLabelAt(5));
+  EXPECT_EQ(tab_titles[1], model.GetLabelAt(8));
+  EXPECT_EQ(tab_titles[2], model.GetLabelAt(11));
 }
 
 TEST_F(RecentTabsSubMenuModelTest, MaxTabsPerSessionAndRecency) {
   // Create a session: 2 windows with 5 tabs each.
   RecentTabsBuilderTestHelper recent_tabs_builder;
   recent_tabs_builder.AddSession();
   for (int w = 0; w < 2; ++w) {
     recent_tabs_builder.AddWindow(0);
     for (int t = 0; t < 5; ++t)
       recent_tabs_builder.AddTab(0, w);
   }
   RegisterRecentTabs(&recent_tabs_builder);
 
   // Verify that data is populated correctly in RecentTabsSubMenuModel.
   // Expected menu:
   // - max tabs per session is 4, so only 4 most-recent tabs will show,
   //   independent of which window they came from.
   // Menu index  Menu items
   // ---------------------------------------------
-  // 0           Recently closed header (disabled)
+  // 0           History
   // 1           <separator>
-  // 2           <section header for session>
-  // 3-6         <4 most-recent tabs of session>
-  // 7           <separator>
-  // 8           More...
+  // 2           Recently closed header (disabled)
+  // 3           <separator>
+  // 4           <section header for session>
+  // 5-8         <4 most-recent tabs of session>
 
   TestRecentTabsSubMenuModel model(NULL, browser(), GetOpenTabsDelegate());
   int num_items = model.GetItemCount();
   EXPECT_EQ(9, num_items);
 
   std::vector<base::string16> tab_titles =
       recent_tabs_builder.GetTabTitlesSortedByRecency();
   for (int i = 0; i < 4; ++i)
-    EXPECT_EQ(tab_titles[i], model.GetLabelAt(i + 3));
+    EXPECT_EQ(tab_titles[i], model.GetLabelAt(i + 5));
 }
 
 TEST_F(RecentTabsSubMenuModelTest, MaxWidth) {
   // Create 1 session with 1 window and 1 tab.
   RecentTabsBuilderTestHelper recent_tabs_builder;
   recent_tabs_builder.AddSession();
   recent_tabs_builder.AddWindow(0);
   recent_tabs_builder.AddTab(0, 0);
   RegisterRecentTabs(&recent_tabs_builder);
 
   // Menu index  Menu items
   // ----------------------------------------------------------
-  // 0           Recently closed header (disabled)
+  // 0           History
   // 1           <separator>
-  // 2           <section header for 1st session>
-  // 3           <the only tab of the only window of session 1>
-  // 4           <separator>
-  // 5           More...
+  // 2           Recently closed header (disabled)
+  // 3           <separator>
+  // 4           <section header for 1st session>
+  // 5           <the only tab of the only window of session 1>
 
   TestRecentTabsSubMenuModel model(NULL, browser(), GetOpenTabsDelegate());
   EXPECT_EQ(6, model.GetItemCount());
-  EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(0));
-  EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(1));
-  EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(2));
+  EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(2));
   EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(3));
+  EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(4));
+  EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(5));
 }
 
 TEST_F(RecentTabsSubMenuModelTest, MaxWidthNoDevices) {
   // Expected menu:
   // Menu index  Menu items
   // --------------------------------------------
-  // 0           Recently closed heaer (disabled)
+  // 0           History
   // 1           <separator>
-  // 2           No tabs from other Devices
+  // 2           Recently closed heaer (disabled)
+  // 3           <separator>
+  // 4           No tabs from other Devices
 
   TestRecentTabsSubMenuModel model(NULL, browser(), NULL);
-  EXPECT_EQ(3, model.GetItemCount());
-  EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(0));
-  EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(1));
+  EXPECT_EQ(5, model.GetItemCount());
   EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(2));
+  EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(3));
+  EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(4));
 }