| Index: chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
|
| diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
|
| index 26fd42f270eb5a82ebefc732df91782288524999..a89e2b32da66ce6ff8344146430b4e7579f70507 100644
|
| --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
|
| +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
|
| @@ -77,14 +77,14 @@ class RecentTabsSubMenuModelTest : public BrowserWithTestWindowTest {
|
| browser_sync::SessionModelAssociator associator_;
|
| };
|
|
|
| -// Test disabled "Reopen closed tab" with no foreign tabs.
|
| +// 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 Reopen closed tab
|
| + // ---------------------------------------------
|
| + // 0 Recently closed header (disabled)
|
| // 1 <separator>
|
| // 2 No tabs from other Devices
|
|
|
| @@ -95,7 +95,7 @@ TEST_F(RecentTabsSubMenuModelTest, NoTabs) {
|
| EXPECT_EQ(0, model.enable_count_);
|
| }
|
|
|
| -// Test enabled "Reopen closed tab" with no foreign tabs.
|
| +// Test enabled "Recently closed" header with no foreign tabs.
|
| TEST_F(RecentTabsSubMenuModelTest, ReopenClosedTab) {
|
| TabRestoreServiceFactory::GetInstance()->SetTestingFactory(
|
| browser()->profile(), RecentTabsSubMenuModelTest::GetTabRestoreService);
|
| @@ -110,7 +110,7 @@ TEST_F(RecentTabsSubMenuModelTest, ReopenClosedTab) {
|
| // Expected menu:
|
| // Menu index Menu items
|
| // --------------------------------------
|
| - // 0 Recently Closed Header
|
| + // 0 Recently closed header
|
| // 1 Single entry to restore
|
| // 2 <separator>
|
| // 3 No tabs from other Devices
|
| @@ -124,8 +124,8 @@ TEST_F(RecentTabsSubMenuModelTest, ReopenClosedTab) {
|
| EXPECT_EQ(1, model.execute_count_);
|
| }
|
|
|
| -// Test enabled "Reopen closed tab" with multiple sessions, multiple windows,
|
| -// and multiple enabled tabs from other devices.
|
| +// 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();
|
| @@ -158,8 +158,8 @@ TEST_F(RecentTabsSubMenuModelTest, OtherDevices) {
|
| // Expected menu:
|
| // - first inserted tab is most recent and hence is top
|
| // Menu index Menu items
|
| - // --------------------------------------
|
| - // 0 Reopen closed tab
|
| + // -----------------------------------------------------
|
| + // 0 Recently closed header (disabled)
|
| // 1 <separator>
|
| // 2 <section header for 1st session>
|
| // 3-5 <3 tabs of the only window of session 0>
|
| @@ -206,8 +206,8 @@ TEST_F(RecentTabsSubMenuModelTest, MaxSessionsAndRecency) {
|
| // Expected menu:
|
| // - max sessions is 3, so only 3 most-recent sessions will show.
|
| // Menu index Menu items
|
| - // --------------------------------------
|
| - // 0 Reopen closed tab
|
| + // ----------------------------------------------------------
|
| + // 0 Recently closed header (disabled)
|
| // 1 <separator>
|
| // 2 <section header for 1st session>
|
| // 3 <the only tab of the only window of session 3>
|
| @@ -247,8 +247,8 @@ TEST_F(RecentTabsSubMenuModelTest, MaxTabsPerSessionAndRecency) {
|
| // - 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 Reopen closed tab
|
| + // ---------------------------------------------
|
| + // 0 Recently closed header (disabled)
|
| // 1 <separator>
|
| // 2 <section header for session>
|
| // 3-6 <4 most-recent tabs of session>
|
| @@ -274,8 +274,8 @@ TEST_F(RecentTabsSubMenuModelTest, MaxWidth) {
|
| recent_tabs_builder.RegisterRecentTabs(&associator_);
|
|
|
| // Menu index Menu items
|
| - // --------------------------------------
|
| - // 0 Reopen closed tab
|
| + // ----------------------------------------------------------
|
| + // 0 Recently closed header (disabled)
|
| // 1 <separator>
|
| // 2 <section header for 1st session>
|
| // 3 <the only tab of the only window of session 1>
|
| @@ -293,8 +293,8 @@ TEST_F(RecentTabsSubMenuModelTest, MaxWidth) {
|
| TEST_F(RecentTabsSubMenuModelTest, MaxWidthNoDevices) {
|
| // Expected menu:
|
| // Menu index Menu items
|
| - // --------------------------------------
|
| - // 0 Reopen closed tab
|
| + // --------------------------------------------
|
| + // 0 Recently closed heaer (disabled)
|
| // 1 <separator>
|
| // 2 No tabs from other Devices
|
|
|
|
|