diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 16:21:34 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 16:21:34 +0000 |
| commit | 6a5670d2fa75f36a9a51eef48e1ed2bd710f36f8 (patch) | |
| tree | ed4e2c28b39cf87b8dd73fc113ab4d35a7136e91 /chrome/browser/tab_restore_uitest.cc | |
| parent | e1048992f130a71c329bd988048e103f5d5781e5 (diff) | |
| download | chromium_src-6a5670d2fa75f36a9a51eef48e1ed2bd710f36f8.zip chromium_src-6a5670d2fa75f36a9a51eef48e1ed2bd710f36f8.tar.gz chromium_src-6a5670d2fa75f36a9a51eef48e1ed2bd710f36f8.tar.bz2 | |
Revert 30194 - Makes session restore on Chrome OS restore popups.
BUG=18862
TEST=none
Review URL: http://codereview.chromium.org/337030
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/335047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_restore_uitest.cc')
| -rw-r--r-- | chrome/browser/tab_restore_uitest.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index 0f99ad5..491ba8a 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -226,8 +226,7 @@ TEST_F(TabRestoreUITest, FLAKY_RestoreToDifferentWindow) { EXPECT_EQ(starting_tab_count + 2, tab_count); // Create a new browser. - ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL, - false)); + ASSERT_TRUE(automation()->OpenNewBrowserWindow(false)); int window_count; ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); EXPECT_EQ(2, window_count); @@ -269,8 +268,7 @@ TEST_F(TabRestoreUITest, MAYBE_BasicRestoreFromClosedWindow) { tab_proxy->NavigateToURL(url2_); // Create a new browser. - ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL, - false)); + ASSERT_TRUE(automation()->OpenNewBrowserWindow(false)); int window_count; ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); EXPECT_EQ(2, window_count); @@ -360,8 +358,7 @@ TEST_F(TabRestoreUITest, FLAKY_RestoreWindowAndTab) { EXPECT_EQ(starting_tab_count + 2, tab_count); // Create a new browser. - ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL, - false)); + ASSERT_TRUE(automation()->OpenNewBrowserWindow(false)); int window_count; ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); EXPECT_EQ(2, window_count); @@ -409,8 +406,7 @@ TEST_F(TabRestoreUITest, RestoreIntoSameWindow) { tab_proxy->NavigateToURL(url2_); // Create a new browser. - ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL, - false)); + ASSERT_TRUE(automation()->OpenNewBrowserWindow(false)); int window_count; ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); EXPECT_EQ(2, window_count); @@ -552,8 +548,7 @@ TEST_F(TabRestoreUITest, RestoreWindow) { // Create a new window. int window_count; ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); - ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL, - false)); + ASSERT_TRUE(automation()->OpenNewBrowserWindow(false)); int new_window_count = 0; ASSERT_TRUE(automation()->GetBrowserWindowCount(&new_window_count)); EXPECT_EQ(++window_count, new_window_count); |