| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chrome_notification_types.h" | 5 #include "chrome/browser/chrome_notification_types.h" |
| 6 #include "chrome/browser/sessions/tab_restore_service.h" | 6 #include "chrome/browser/sessions/tab_restore_service.h" |
| 7 #include "chrome/browser/sessions/tab_restore_service_delegate.h" | 7 #include "chrome/browser/sessions/tab_restore_service_delegate.h" |
| 8 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 8 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_commands.h" | 10 #include "chrome/browser/ui/browser_commands.h" |
| 11 #include "chrome/browser/ui/browser_list.h" | 11 #include "chrome/browser/ui/browser_list.h" |
| 12 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 12 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 13 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" | 13 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" |
| 14 #include "chrome/test/base/in_process_browser_test.h" | 14 #include "chrome/test/base/in_process_browser_test.h" |
| 15 #include "chrome/test/base/interactive_test_utils.h" | 15 #include "chrome/test/base/interactive_test_utils.h" |
| 16 #include "content/public/browser/web_contents.h" | 16 #include "content/public/browser/web_contents.h" |
| 17 #include "content/public/common/url_constants.h" |
| 17 #include "content/public/test/browser_test_utils.h" | 18 #include "content/public/test/browser_test_utils.h" |
| 18 | 19 |
| 19 typedef InProcessBrowserTest BrowserTabRestoreTest; | 20 typedef InProcessBrowserTest BrowserTabRestoreTest; |
| 20 | 21 |
| 21 void AwaitTabsReady(content::DOMMessageQueue* message_queue, int tabs) { | 22 void AwaitTabsReady(content::DOMMessageQueue* message_queue, int tabs) { |
| 22 for (int i = 0; i < tabs; ++i) { | 23 for (int i = 0; i < tabs; ++i) { |
| 23 std::string message; | 24 std::string message; |
| 24 EXPECT_TRUE(message_queue->WaitForMessage(&message)); | 25 EXPECT_TRUE(message_queue->WaitForMessage(&message)); |
| 25 EXPECT_EQ("\"READY\"", message); | 26 EXPECT_EQ("\"READY\"", message); |
| 26 } | 27 } |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 close_observer.Wait(); | 62 close_observer.Wait(); |
| 62 } | 63 } |
| 63 | 64 |
| 64 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, RecentTabsMenuTabDisposition) { | 65 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, RecentTabsMenuTabDisposition) { |
| 65 // Create tabs. | 66 // Create tabs. |
| 66 CreateTestTabs(browser()); | 67 CreateTestTabs(browser()); |
| 67 EXPECT_EQ(3, browser()->tab_strip_model()->count()); | 68 EXPECT_EQ(3, browser()->tab_strip_model()->count()); |
| 68 | 69 |
| 69 // Create a new browser. | 70 // Create a new browser. |
| 70 ui_test_utils::NavigateToURLWithDisposition( | 71 ui_test_utils::NavigateToURLWithDisposition( |
| 71 browser(), GURL(), NEW_WINDOW, | 72 browser(), GURL(content::kAboutBlankURL), NEW_WINDOW, |
| 72 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); | 73 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); |
| 73 BrowserList* active_browser_list = | 74 BrowserList* active_browser_list = |
| 74 BrowserList::GetInstance(browser()->host_desktop_type()); | 75 BrowserList::GetInstance(browser()->host_desktop_type()); |
| 75 EXPECT_EQ(2u, active_browser_list->size()); | 76 EXPECT_EQ(2u, active_browser_list->size()); |
| 76 | 77 |
| 77 // Close the first browser. | 78 // Close the first browser. |
| 78 CloseBrowser(browser()); | 79 CloseBrowser(browser()); |
| 79 EXPECT_EQ(1u, active_browser_list->size()); | 80 EXPECT_EQ(1u, active_browser_list->size()); |
| 80 | 81 |
| 81 // Restore tabs using the browser's recent tabs menu. | 82 // Restore tabs using the browser's recent tabs menu. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 95 CheckVisbility(browser->tab_strip_model(), 1); | 96 CheckVisbility(browser->tab_strip_model(), 1); |
| 96 } | 97 } |
| 97 | 98 |
| 98 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, DelegateRestoreTabDisposition) { | 99 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, DelegateRestoreTabDisposition) { |
| 99 // Create tabs. | 100 // Create tabs. |
| 100 CreateTestTabs(browser()); | 101 CreateTestTabs(browser()); |
| 101 EXPECT_EQ(3, browser()->tab_strip_model()->count()); | 102 EXPECT_EQ(3, browser()->tab_strip_model()->count()); |
| 102 | 103 |
| 103 // Create a new browser. | 104 // Create a new browser. |
| 104 ui_test_utils::NavigateToURLWithDisposition( | 105 ui_test_utils::NavigateToURLWithDisposition( |
| 105 browser(), GURL(), NEW_WINDOW, | 106 browser(), GURL(content::kAboutBlankURL), NEW_WINDOW, |
| 106 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); | 107 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); |
| 107 BrowserList* active_browser_list = | 108 BrowserList* active_browser_list = |
| 108 BrowserList::GetInstance(browser()->host_desktop_type()); | 109 BrowserList::GetInstance(browser()->host_desktop_type()); |
| 109 EXPECT_EQ(2u, active_browser_list->size()); | 110 EXPECT_EQ(2u, active_browser_list->size()); |
| 110 | 111 |
| 111 // Close the first browser. | 112 // Close the first browser. |
| 112 CloseBrowser(browser()); | 113 CloseBrowser(browser()); |
| 113 EXPECT_EQ(1u, active_browser_list->size()); | 114 EXPECT_EQ(1u, active_browser_list->size()); |
| 114 | 115 |
| 115 // Check the browser has a delegated restore service. | 116 // Check the browser has a delegated restore service. |
| (...skipping 15 matching lines...) Expand all Loading... |
| 131 AwaitTabsReady(&queue, 2); | 132 AwaitTabsReady(&queue, 2); |
| 132 | 133 |
| 133 // There should be 3 restored tabs in the new browser. | 134 // There should be 3 restored tabs in the new browser. |
| 134 EXPECT_EQ(2u, active_browser_list->size()); | 135 EXPECT_EQ(2u, active_browser_list->size()); |
| 135 browser = active_browser_list->get(1); | 136 browser = active_browser_list->get(1); |
| 136 EXPECT_EQ(3, browser->tab_strip_model()->count()); | 137 EXPECT_EQ(3, browser->tab_strip_model()->count()); |
| 137 | 138 |
| 138 // The middle tab only should have visible disposition. | 139 // The middle tab only should have visible disposition. |
| 139 CheckVisbility(browser->tab_strip_model(), 1); | 140 CheckVisbility(browser->tab_strip_model(), 1); |
| 140 } | 141 } |
| OLD | NEW |