summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/app_controller_mac_browsertest.mm20
-rw-r--r--chrome/browser/policy/policy_browsertest.cc8
-rw-r--r--chrome/browser/sessions/session_restore_browsertest.cc49
-rw-r--r--chrome/browser/sessions/tab_restore_browsertest.cc39
4 files changed, 56 insertions, 60 deletions
diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm
index 8b87dcb..11f2c98 100644
--- a/chrome/browser/app_controller_mac_browsertest.mm
+++ b/chrome/browser/app_controller_mac_browsertest.mm
@@ -22,7 +22,7 @@ namespace {
class AppControllerPlatformAppBrowserTest : public InProcessBrowserTest {
protected:
AppControllerPlatformAppBrowserTest()
- : native_browser_list(BrowserList::GetInstance(
+ : active_browser_list_(BrowserList::GetInstance(
chrome::GetActiveDesktop())) {
}
@@ -31,8 +31,7 @@ class AppControllerPlatformAppBrowserTest : public InProcessBrowserTest {
"1234");
}
- // Mac only has the native desktop.
- const BrowserList* native_browser_list;
+ const BrowserList* active_browser_list_;
};
// Test that if only a platform app window is open and no browser windows are
@@ -41,18 +40,18 @@ IN_PROC_BROWSER_TEST_F(AppControllerPlatformAppBrowserTest,
PlatformAppReopenWithWindows) {
base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
NSUInteger old_window_count = [[NSApp windows] count];
- EXPECT_EQ(1u, native_browser_list->size());
+ EXPECT_EQ(1u, active_browser_list_->size());
BOOL result = [ac applicationShouldHandleReopen:NSApp hasVisibleWindows:YES];
EXPECT_TRUE(result);
EXPECT_EQ(old_window_count, [[NSApp windows] count]);
- EXPECT_EQ(1u, native_browser_list->size());
+ EXPECT_EQ(1u, active_browser_list_->size());
}
class AppControllerWebAppBrowserTest : public InProcessBrowserTest {
protected:
AppControllerWebAppBrowserTest()
- : native_browser_list(BrowserList::GetInstance(
+ : active_browser_list_(BrowserList::GetInstance(
chrome::GetActiveDesktop())) {
}
@@ -64,21 +63,20 @@ class AppControllerWebAppBrowserTest : public InProcessBrowserTest {
return "http://example.com/";
}
- // Mac only has the native desktop.
- const BrowserList* native_browser_list;
+ const BrowserList* active_browser_list_;
};
// Test that in web app mode a reopen event opens the app URL.
IN_PROC_BROWSER_TEST_F(AppControllerWebAppBrowserTest,
WebAppReopenWithNoWindows) {
base::scoped_nsobject<AppController> ac([[AppController alloc] init]);
- EXPECT_EQ(1u, native_browser_list->size());
+ EXPECT_EQ(1u, active_browser_list_->size());
BOOL result = [ac applicationShouldHandleReopen:NSApp hasVisibleWindows:NO];
EXPECT_FALSE(result);
- EXPECT_EQ(2u, native_browser_list->size());
+ EXPECT_EQ(2u, active_browser_list_->size());
- Browser* browser = native_browser_list->get(0);
+ Browser* browser = active_browser_list_->get(0);
GURL current_url =
browser->tab_strip_model()->GetActiveWebContents()->GetURL();
EXPECT_EQ(GetAppURL(), current_url.spec());
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 83670ec..7b48485 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -1499,19 +1499,19 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, HomepageLocation) {
IN_PROC_BROWSER_TEST_F(PolicyTest, IncognitoEnabled) {
// Verifies that incognito windows can't be opened when disabled by policy.
- const BrowserList* native_browser_list =
+ const BrowserList* active_browser_list =
BrowserList::GetInstance(chrome::GetActiveDesktop());
// Disable incognito via policy and verify that incognito windows can't be
// opened.
- EXPECT_EQ(1u, native_browser_list->size());
+ EXPECT_EQ(1u, active_browser_list->size());
EXPECT_FALSE(BrowserList::IsOffTheRecordSessionActive());
PolicyMap policies;
policies.Set(key::kIncognitoEnabled, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
UpdateProviderPolicy(policies);
EXPECT_FALSE(chrome::ExecuteCommand(browser(), IDC_NEW_INCOGNITO_WINDOW));
- EXPECT_EQ(1u, native_browser_list->size());
+ EXPECT_EQ(1u, active_browser_list->size());
EXPECT_FALSE(BrowserList::IsOffTheRecordSessionActive());
// Enable via policy and verify that incognito windows can be opened.
@@ -1519,7 +1519,7 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, IncognitoEnabled) {
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
UpdateProviderPolicy(policies);
EXPECT_TRUE(chrome::ExecuteCommand(browser(), IDC_NEW_INCOGNITO_WINDOW));
- EXPECT_EQ(2u, native_browser_list->size());
+ EXPECT_EQ(2u, active_browser_list->size());
EXPECT_TRUE(BrowserList::IsOffTheRecordSessionActive());
}
diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc
index 81790e8..bd5a790 100644
--- a/chrome/browser/sessions/session_restore_browsertest.cc
+++ b/chrome/browser/sessions/session_restore_browsertest.cc
@@ -53,8 +53,8 @@ using sessions::SerializedNavigationEntryTestHelper;
class SessionRestoreTest : public InProcessBrowserTest {
public:
SessionRestoreTest()
- : native_browser_list(BrowserList::GetInstance(
- chrome::HOST_DESKTOP_TYPE_NATIVE)) {
+ : active_browser_list_(BrowserList::GetInstance(
+ chrome::GetActiveDesktop())) {
}
protected:
@@ -165,7 +165,7 @@ class SessionRestoreTest : public InProcessBrowserTest {
}
void AssertOneWindowWithOneTab(Browser* browser) {
- ASSERT_EQ(1u, native_browser_list->size());
+ ASSERT_EQ(1u, active_browser_list_->size());
ASSERT_EQ(1, browser->tab_strip_model()->count());
}
@@ -185,8 +185,7 @@ class SessionRestoreTest : public InProcessBrowserTest {
GURL url2_;
GURL url3_;
- // The SessionRestore browser tests only uses the native desktop for now.
- const BrowserList* native_browser_list;
+ const BrowserList* active_browser_list_;
};
#if defined(OS_CHROMEOS)
@@ -582,7 +581,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreForeignSession) {
profile, browser()->host_desktop_type(), session.begin(), session.end());
Browser* new_browser = window_observer.WaitForSingleNewBrowser();
ASSERT_TRUE(new_browser);
- ASSERT_EQ(2u, native_browser_list->size());
+ ASSERT_EQ(2u, active_browser_list_->size());
ASSERT_EQ(2, new_browser->tab_strip_model()->count());
content::WebContents* web_contents_1 =
@@ -615,7 +614,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, Basic) {
ui_test_utils::NavigateToURL(browser(), url2_);
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, native_browser_list->size());
+ ASSERT_EQ(1u, active_browser_list_->size());
ASSERT_EQ(url2_,
new_browser->tab_strip_model()->GetActiveWebContents()->GetURL());
GoBack(new_browser);
@@ -632,7 +631,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreWebUI) {
old_tab->GetRenderViewHost()->GetEnabledBindings());
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, native_browser_list->size());
+ ASSERT_EQ(1u, active_browser_list_->size());
const content::WebContents* new_tab =
new_browser->tab_strip_model()->GetActiveWebContents();
EXPECT_EQ(webui_url, new_tab->GetURL());
@@ -649,7 +648,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreWebUISettings) {
old_tab->GetRenderViewHost()->GetEnabledBindings());
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, native_browser_list->size());
+ ASSERT_EQ(1u, active_browser_list_->size());
const content::WebContents* new_tab =
new_browser->tab_strip_model()->GetActiveWebContents();
EXPECT_EQ(webui_url, new_tab->GetURL());
@@ -664,7 +663,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoresForwardAndBackwardNavs) {
GoBack(browser());
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, native_browser_list->size());
+ ASSERT_EQ(1u, active_browser_list_->size());
ASSERT_EQ(url2_,
new_browser->tab_strip_model()->GetActiveWebContents()->GetURL());
GoForward(new_browser);
@@ -698,7 +697,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest,
GoBack(browser());
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, native_browser_list->size());
+ ASSERT_EQ(1u, active_browser_list_->size());
ASSERT_EQ(1, new_browser->tab_strip_model()->count());
// Check that back and forward work as expected.
@@ -729,7 +728,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TwoTabsSecondSelected) {
Browser* new_browser = QuitBrowserAndRestore(browser(), 2);
- ASSERT_EQ(1u, native_browser_list->size());
+ ASSERT_EQ(1u, active_browser_list_->size());
ASSERT_EQ(2, new_browser->tab_strip_model()->count());
ASSERT_EQ(1, new_browser->tab_strip_model()->active_index());
ASSERT_EQ(url2_,
@@ -811,7 +810,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, NormalAndPopup) {
Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile(),
browser()->host_desktop_type()));
popup->window()->Show();
- ASSERT_EQ(2u, native_browser_list->size());
+ ASSERT_EQ(2u, active_browser_list_->size());
ui_test_utils::NavigateToURL(popup, url1_);
@@ -823,10 +822,10 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, NormalAndPopup) {
// Restart and make sure we have two windows.
QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(2u, native_browser_list->size());
+ ASSERT_EQ(2u, active_browser_list_->size());
- Browser* browser1 = native_browser_list->get(0);
- Browser* browser2 = native_browser_list->get(1);
+ Browser* browser1 = active_browser_list_->get(0);
+ Browser* browser2 = active_browser_list_->get(1);
Browser::Type type1 = browser1->type();
Browser::Type type2 = browser2->type();
@@ -862,7 +861,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest,
base::LaunchProcess(app_launch_arguments, base::LaunchOptions(), NULL);
Browser* app_window = window_observer.WaitForSingleNewBrowser();
- ASSERT_EQ(2u, native_browser_list->size());
+ ASSERT_EQ(2u, active_browser_list_->size());
// Close the first window. The only window left is the App window.
CloseBrowserSynchronously(browser());
@@ -887,10 +886,10 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TwoWindowsCloseOneRestoreOnlyOne) {
browser(), GURL(content::kAboutBlankURL), NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
- ASSERT_EQ(2u, native_browser_list->size());
+ ASSERT_EQ(2u, active_browser_list_->size());
// Close it.
- Browser* new_window = native_browser_list->get(1);
+ Browser* new_window = active_browser_list_->get(1);
CloseBrowserSynchronously(new_window);
// Restart and make sure we have only one window with one tab and the url
@@ -949,7 +948,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, PersistAndRestoreUserAgentOverride) {
// Kill the original browser then open a new one to trigger a restore.
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, native_browser_list->size());
+ ASSERT_EQ(1u, active_browser_list_->size());
ASSERT_EQ(2, new_browser->tab_strip_model()->count());
ASSERT_EQ(1, new_browser->tab_strip_model()->active_index());
@@ -983,7 +982,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestorePinnedSelectedTab) {
// This will also initiate a session restore, but we're not interested in it.
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, native_browser_list->size());
+ ASSERT_EQ(1u, active_browser_list_->size());
ASSERT_EQ(2, new_browser->tab_strip_model()->count());
ASSERT_EQ(0, new_browser->tab_strip_model()->active_index());
// Close the pinned tab.
@@ -1021,7 +1020,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreWithNavigateSelectedTab) {
// Restore the session by calling chrome::Navigate().
Browser* new_browser = QuitBrowserAndRestoreWithURL(browser(), 3, url3_);
- ASSERT_EQ(1u, native_browser_list->size());
+ ASSERT_EQ(1u, active_browser_list_->size());
ASSERT_EQ(3, new_browser->tab_strip_model()->count());
// Navigated url should be the active tab.
ASSERT_EQ(url3_,
@@ -1042,7 +1041,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, ClobberRestoreTest) {
// This will also initiate a session restore, but we're not interested in it.
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, native_browser_list->size());
+ ASSERT_EQ(1u, active_browser_list_->size());
ASSERT_EQ(2, new_browser->tab_strip_model()->count());
ASSERT_EQ(1, new_browser->tab_strip_model()->active_index());
// Close the first tab.
@@ -1077,7 +1076,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, SessionStorage) {
std::string session_storage_persistent_id =
controller->GetDefaultSessionStorageNamespace()->persistent_id();
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, native_browser_list->size());
+ ASSERT_EQ(1u, active_browser_list_->size());
ASSERT_EQ(url1_,
new_browser->tab_strip_model()->GetActiveWebContents()->GetURL());
content::NavigationController* new_controller =
@@ -1122,6 +1121,6 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, SessionStorageAfterTabReplace) {
// Quit and restore. Check that no extra tabs were created.
Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
- ASSERT_EQ(1u, native_browser_list->size());
+ ASSERT_EQ(1u, active_browser_list_->size());
EXPECT_EQ(1, new_browser->tab_strip_model()->count());
}
diff --git a/chrome/browser/sessions/tab_restore_browsertest.cc b/chrome/browser/sessions/tab_restore_browsertest.cc
index 9d9389c..346f04f 100644
--- a/chrome/browser/sessions/tab_restore_browsertest.cc
+++ b/chrome/browser/sessions/tab_restore_browsertest.cc
@@ -34,8 +34,8 @@
class TabRestoreTest : public InProcessBrowserTest {
public:
TabRestoreTest()
- : native_browser_list(BrowserList::GetInstance(
- chrome::HOST_DESKTOP_TYPE_NATIVE)) {
+ : active_browser_list_(BrowserList::GetInstance(
+ chrome::GetActiveDesktop())) {
url1_ = ui_test_utils::GetTestUrl(
base::FilePath().AppendASCII("session_history"),
base::FilePath().AppendASCII("bot1.html"));
@@ -47,8 +47,8 @@ class TabRestoreTest : public InProcessBrowserTest {
protected:
Browser* GetBrowser(int index) {
- CHECK(static_cast<int>(native_browser_list->size()) > index);
- return native_browser_list->get(index);
+ CHECK(static_cast<int>(active_browser_list_->size()) > index);
+ return active_browser_list_->get(index);
}
// Adds tabs to the given browser, all navigated to url1_. Returns
@@ -83,14 +83,14 @@ class TabRestoreTest : public InProcessBrowserTest {
// window (since the index is 0-based).
void RestoreTab(int expected_window_index,
int expected_tabstrip_index) {
- int window_count = static_cast<int>(native_browser_list->size());
+ int window_count = static_cast<int>(active_browser_list_->size());
ASSERT_GT(window_count, 0);
bool expect_new_window = (expected_window_index == window_count);
Browser* browser;
if (expect_new_window) {
- browser = native_browser_list->get(0);
+ browser = active_browser_list_->get(0);
} else {
browser = GetBrowser(expected_window_index);
}
@@ -109,7 +109,7 @@ class TabRestoreTest : public InProcessBrowserTest {
tab_loaded_observer.Wait();
if (expect_new_window) {
- int new_window_count = static_cast<int>(native_browser_list->size());
+ int new_window_count = static_cast<int>(active_browser_list_->size());
EXPECT_EQ(++window_count, new_window_count);
browser = GetBrowser(expected_window_index);
} else {
@@ -147,8 +147,7 @@ class TabRestoreTest : public InProcessBrowserTest {
GURL url1_;
GURL url2_;
- // The TabRestore browser tests only uses the native desktop for now.
- const BrowserList* native_browser_list;
+ const BrowserList* active_browser_list_;
private:
DISALLOW_COPY_AND_ASSIGN(TabRestoreTest);
@@ -208,7 +207,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreToDifferentWindow) {
ui_test_utils::NavigateToURLWithDisposition(
browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
- EXPECT_EQ(2u, native_browser_list->size());
+ EXPECT_EQ(2u, active_browser_list_->size());
// Restore tab into original browser.
ASSERT_NO_FATAL_FAILURE(RestoreTab(0, closed_tab_index));
@@ -232,7 +231,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, DISABLED_BasicRestoreFromClosedWindow) {
ui_test_utils::NavigateToURLWithDisposition(
browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
- EXPECT_EQ(2u, native_browser_list->size());
+ EXPECT_EQ(2u, active_browser_list_->size());
// Close the final tab in the first browser.
content::WindowedNotificationObserver window_observer(
@@ -295,7 +294,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindowAndTab) {
ui_test_utils::NavigateToURLWithDisposition(
browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
- EXPECT_EQ(2u, native_browser_list->size());
+ EXPECT_EQ(2u, active_browser_list_->size());
// Close the first browser.
content::WindowedNotificationObserver observer(
@@ -303,7 +302,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindowAndTab) {
content::NotificationService::AllSources());
chrome::CloseWindow(browser());
observer.Wait();
- EXPECT_EQ(1u, native_browser_list->size());
+ EXPECT_EQ(1u, active_browser_list_->size());
// Restore the first window. The expected_tabstrip_index (second argument)
// indicates the expected active tab.
@@ -333,7 +332,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreIntoSameWindow) {
ui_test_utils::NavigateToURLWithDisposition(
browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
- EXPECT_EQ(2u, native_browser_list->size());
+ EXPECT_EQ(2u, active_browser_list_->size());
// Close all but one tab in the first browser, left to right.
while (browser()->tab_strip_model()->count() > 1)
@@ -345,7 +344,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreIntoSameWindow) {
content::NotificationService::AllSources());
CloseTab(0);
observer.Wait();
- EXPECT_EQ(1u, native_browser_list->size());
+ EXPECT_EQ(1u, active_browser_list_->size());
// Restore the last-closed tab into a new window.
ASSERT_NO_FATAL_FAILURE(RestoreTab(1, 0));
@@ -477,11 +476,11 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest,
IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindow) {
// Create a new window.
- size_t window_count = native_browser_list->size();
+ size_t window_count = active_browser_list_->size();
ui_test_utils::NavigateToURLWithDisposition(
browser(), GURL(chrome::kChromeUINewTabURL), NEW_WINDOW,
ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER);
- EXPECT_EQ(++window_count, native_browser_list->size());
+ EXPECT_EQ(++window_count, active_browser_list_->size());
// Create two more tabs, one with url1, the other url2.
int initial_tab_count = browser()->tab_strip_model()->count();
@@ -498,7 +497,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindow) {
content::NotificationService::AllSources());
chrome::CloseWindow(browser());
close_window_observer.Wait();
- EXPECT_EQ(window_count - 1, native_browser_list->size());
+ EXPECT_EQ(window_count - 1, active_browser_list_->size());
// Restore the window.
content::WindowedNotificationObserver open_window_observer(
@@ -507,9 +506,9 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindow) {
content::WindowedNotificationObserver load_stop_observer(
content::NOTIFICATION_LOAD_STOP,
content::NotificationService::AllSources());
- chrome::RestoreTab(native_browser_list->get(0));
+ chrome::RestoreTab(active_browser_list_->get(0));
open_window_observer.Wait();
- EXPECT_EQ(window_count, native_browser_list->size());
+ EXPECT_EQ(window_count, active_browser_list_->size());
Browser* browser = GetBrowser(1);
EXPECT_EQ(initial_tab_count + 2, browser->tab_strip_model()->count());
generated by cgit v1.1 at 2025-05-19 13:19:14 +0000