Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Side by Side Diff: chrome/browser/ui/browser_tabrestore_browsertest.cc

Issue 325443002: Move about://-related constants from //content to //url (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Android ifx Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 close_observer.Wait(); 62 close_observer.Wait();
63 } 63 }
64 64
65 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, RecentTabsMenuTabDisposition) { 65 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, RecentTabsMenuTabDisposition) {
66 // Create tabs. 66 // Create tabs.
67 CreateTestTabs(browser()); 67 CreateTestTabs(browser());
68 EXPECT_EQ(3, browser()->tab_strip_model()->count()); 68 EXPECT_EQ(3, browser()->tab_strip_model()->count());
69 69
70 // Create a new browser. 70 // Create a new browser.
71 ui_test_utils::NavigateToURLWithDisposition( 71 ui_test_utils::NavigateToURLWithDisposition(
72 browser(), GURL(content::kAboutBlankURL), NEW_WINDOW, 72 browser(),
73 GURL(url::kAboutBlankURL),
74 NEW_WINDOW,
73 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); 75 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
74 BrowserList* active_browser_list = 76 BrowserList* active_browser_list =
75 BrowserList::GetInstance(browser()->host_desktop_type()); 77 BrowserList::GetInstance(browser()->host_desktop_type());
76 EXPECT_EQ(2u, active_browser_list->size()); 78 EXPECT_EQ(2u, active_browser_list->size());
77 79
78 // Close the first browser. 80 // Close the first browser.
79 CloseBrowser(browser()); 81 CloseBrowser(browser());
80 EXPECT_EQ(1u, active_browser_list->size()); 82 EXPECT_EQ(1u, active_browser_list->size());
81 83
82 // Restore tabs using the browser's recent tabs menu. 84 // Restore tabs using the browser's recent tabs menu.
(...skipping 13 matching lines...) Expand all
96 CheckVisbility(browser->tab_strip_model(), 1); 98 CheckVisbility(browser->tab_strip_model(), 1);
97 } 99 }
98 100
99 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, DelegateRestoreTabDisposition) { 101 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, DelegateRestoreTabDisposition) {
100 // Create tabs. 102 // Create tabs.
101 CreateTestTabs(browser()); 103 CreateTestTabs(browser());
102 EXPECT_EQ(3, browser()->tab_strip_model()->count()); 104 EXPECT_EQ(3, browser()->tab_strip_model()->count());
103 105
104 // Create a new browser. 106 // Create a new browser.
105 ui_test_utils::NavigateToURLWithDisposition( 107 ui_test_utils::NavigateToURLWithDisposition(
106 browser(), GURL(content::kAboutBlankURL), NEW_WINDOW, 108 browser(),
109 GURL(url::kAboutBlankURL),
110 NEW_WINDOW,
107 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); 111 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
108 BrowserList* active_browser_list = 112 BrowserList* active_browser_list =
109 BrowserList::GetInstance(browser()->host_desktop_type()); 113 BrowserList::GetInstance(browser()->host_desktop_type());
110 EXPECT_EQ(2u, active_browser_list->size()); 114 EXPECT_EQ(2u, active_browser_list->size());
111 115
112 // Close the first browser. 116 // Close the first browser.
113 CloseBrowser(browser()); 117 CloseBrowser(browser());
114 EXPECT_EQ(1u, active_browser_list->size()); 118 EXPECT_EQ(1u, active_browser_list->size());
115 119
116 // Check the browser has a delegated restore service. 120 // Check the browser has a delegated restore service.
(...skipping 15 matching lines...) Expand all
132 AwaitTabsReady(&queue, 2); 136 AwaitTabsReady(&queue, 2);
133 137
134 // There should be 3 restored tabs in the new browser. 138 // There should be 3 restored tabs in the new browser.
135 EXPECT_EQ(2u, active_browser_list->size()); 139 EXPECT_EQ(2u, active_browser_list->size());
136 browser = active_browser_list->get(1); 140 browser = active_browser_list->get(1);
137 EXPECT_EQ(3, browser->tab_strip_model()->count()); 141 EXPECT_EQ(3, browser->tab_strip_model()->count());
138 142
139 // The middle tab only should have visible disposition. 143 // The middle tab only should have visible disposition.
140 CheckVisbility(browser->tab_strip_model(), 1); 144 CheckVisbility(browser->tab_strip_model(), 1);
141 } 145 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_navigator_browsertest.cc ('k') | chrome/browser/ui/cocoa/view_id_util_browsertest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698