diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 15:22:45 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-30 15:22:45 +0000 |
| commit | 076bf500c06a2ec9ce9f5accc0eaad7c0b0b2666 (patch) | |
| tree | 90c75e38f905641cda5eff21273c76e9f80b4ca5 /chrome/browser/sessions | |
| parent | 09247ce046ae7fa18a868d7f07ad292899b3798c (diff) | |
| download | chromium_src-076bf500c06a2ec9ce9f5accc0eaad7c0b0b2666.zip chromium_src-076bf500c06a2ec9ce9f5accc0eaad7c0b0b2666.tar.gz chromium_src-076bf500c06a2ec9ce9f5accc0eaad7c0b0b2666.tar.bz2 | |
Cleanup in automation. Remove WaitForTabCountToChange.
WaitForTabCountToBecome is easier to use and more reliable.
Also removed Windows2000-specific code from accessibility unit tests.
Review URL: http://codereview.chromium.org/45070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
| -rw-r--r-- | chrome/browser/sessions/session_restore_uitest.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index 431b66e..58bee39 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -377,23 +377,24 @@ TEST_F(SessionRestoreUITest, DISABLED_ShareProcessesOnRestore) { ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count)); // Create two new tabs. - int new_tab_count; ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_NEW_TAB)); - ASSERT_TRUE(browser_proxy->WaitForTabCountToChange(tab_count, &new_tab_count, + ASSERT_TRUE(browser_proxy->WaitForTabCountToBecome(tab_count + 1, action_timeout_ms())); - scoped_ptr<TabProxy> last_tab(browser_proxy->GetTab(new_tab_count - 1)); + ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count)); + scoped_ptr<TabProxy> last_tab(browser_proxy->GetTab(tab_count - 1)); ASSERT_TRUE(last_tab.get() != NULL); // Do a reload to ensure new tab page has loaded. ASSERT_TRUE(last_tab->Reload()); - tab_count = new_tab_count; ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_NEW_TAB)); - ASSERT_TRUE(browser_proxy->WaitForTabCountToChange(tab_count, &new_tab_count, + ASSERT_TRUE(browser_proxy->WaitForTabCountToBecome(tab_count + 1, action_timeout_ms())); - last_tab.reset(browser_proxy->GetTab(new_tab_count - 1)); + ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count)); + last_tab.reset(browser_proxy->GetTab(tab_count - 1)); ASSERT_TRUE(last_tab.get() != NULL); // Do a reload to ensure new tab page has loaded. ASSERT_TRUE(last_tab->Reload()); int expected_process_count = GetBrowserProcessCount(); + int expected_tab_count = tab_count; // Restart. browser_proxy.reset(); @@ -404,14 +405,13 @@ TEST_F(SessionRestoreUITest, DISABLED_ShareProcessesOnRestore) { // count matches. browser_proxy.reset(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser_proxy.get() != NULL); - int restored_tab_count; - ASSERT_TRUE(browser_proxy->GetTabCount(&restored_tab_count)); - ASSERT_EQ(new_tab_count, restored_tab_count); + ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count)); + ASSERT_EQ(expected_tab_count, tab_count); - scoped_ptr<TabProxy> tab_proxy(browser_proxy->GetTab(restored_tab_count - 2)); + scoped_ptr<TabProxy> tab_proxy(browser_proxy->GetTab(tab_count - 2)); ASSERT_TRUE(tab_proxy.get() != NULL); ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_timeout_ms())); - tab_proxy.reset(browser_proxy->GetTab(restored_tab_count - 1)); + tab_proxy.reset(browser_proxy->GetTab(tab_count - 1)); ASSERT_TRUE(tab_proxy.get() != NULL); ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_timeout_ms())); |