diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 21:43:53 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 21:43:53 +0000 |
| commit | 982921f1ba1f442e8b4ccd04093a5c6bd796c2fb (patch) | |
| tree | 3f816852334bd7789121c991408b775f09125e0d /chrome/browser/tab_restore_uitest.cc | |
| parent | 7cd2afd1788641996735e7742aff93029bb112b9 (diff) | |
| download | chromium_src-982921f1ba1f442e8b4ccd04093a5c6bd796c2fb.zip chromium_src-982921f1ba1f442e8b4ccd04093a5c6bd796c2fb.tar.gz chromium_src-982921f1ba1f442e8b4ccd04093a5c6bd796c2fb.tar.bz2 | |
Take 2 at this. The only change between this and the first is to add the GetType message to the end of the list and to keep the old message for
creating a new browser as well as adding one that takes the type. To change the params of the message requires updating the reference build. That's best done on a weekend when I'm bored.
Makes session restore on Chrome OS restore popups.
BUG=18862
TEST=none
Review URL: http://codereview.chromium.org/329040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30255 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, 10 insertions, 5 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index 491ba8a..0f99ad5 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -226,7 +226,8 @@ TEST_F(TabRestoreUITest, FLAKY_RestoreToDifferentWindow) { EXPECT_EQ(starting_tab_count + 2, tab_count); // Create a new browser. - ASSERT_TRUE(automation()->OpenNewBrowserWindow(false)); + ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL, + false)); int window_count; ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); EXPECT_EQ(2, window_count); @@ -268,7 +269,8 @@ TEST_F(TabRestoreUITest, MAYBE_BasicRestoreFromClosedWindow) { tab_proxy->NavigateToURL(url2_); // Create a new browser. - ASSERT_TRUE(automation()->OpenNewBrowserWindow(false)); + ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL, + false)); int window_count; ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); EXPECT_EQ(2, window_count); @@ -358,7 +360,8 @@ TEST_F(TabRestoreUITest, FLAKY_RestoreWindowAndTab) { EXPECT_EQ(starting_tab_count + 2, tab_count); // Create a new browser. - ASSERT_TRUE(automation()->OpenNewBrowserWindow(false)); + ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL, + false)); int window_count; ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); EXPECT_EQ(2, window_count); @@ -406,7 +409,8 @@ TEST_F(TabRestoreUITest, RestoreIntoSameWindow) { tab_proxy->NavigateToURL(url2_); // Create a new browser. - ASSERT_TRUE(automation()->OpenNewBrowserWindow(false)); + ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL, + false)); int window_count; ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); EXPECT_EQ(2, window_count); @@ -548,7 +552,8 @@ TEST_F(TabRestoreUITest, RestoreWindow) { // Create a new window. int window_count; ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); - ASSERT_TRUE(automation()->OpenNewBrowserWindow(false)); + ASSERT_TRUE(automation()->OpenNewBrowserWindow(BrowserProxy::TYPE_NORMAL, + false)); int new_window_count = 0; ASSERT_TRUE(automation()->GetBrowserWindowCount(&new_window_count)); EXPECT_EQ(++window_count, new_window_count); |