diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-15 13:42:56 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-15 13:42:56 +0000 |
| commit | 2a42e0ead82dc2f556e1c3ac598e6a9b3afd0f77 (patch) | |
| tree | d2750bc72d747180a118b174eda80b507114f1bb /chrome/browser/tab_restore_uitest.cc | |
| parent | 5532776735c3b4b10950a31729e99b8015be28df (diff) | |
| download | chromium_src-2a42e0ead82dc2f556e1c3ac598e6a9b3afd0f77.zip chromium_src-2a42e0ead82dc2f556e1c3ac598e6a9b3afd0f77.tar.gz chromium_src-2a42e0ead82dc2f556e1c3ac598e6a9b3afd0f77.tar.bz2 | |
Remove action_timeout_ms and fix all the callers.
(This was a TODO for phajdan.jr).
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/6282002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71558 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_restore_uitest.cc')
| -rw-r--r-- | chrome/browser/tab_restore_uitest.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index af7e6c0..5ea98eb 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -1,10 +1,11 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #include "base/basictypes.h" #include "base/command_line.h" #include "base/file_path.h" +#include "base/test/test_timeouts.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" @@ -598,14 +599,16 @@ TEST_F(TabRestoreUITest, MAYBE_RestoreWindow) { scoped_refptr<TabProxy> restored_tab_proxy( browser_proxy->GetTab(initial_tab_count)); ASSERT_TRUE(restored_tab_proxy.get()); - ASSERT_TRUE(restored_tab_proxy->WaitForTabToBeRestored(action_timeout_ms())); + ASSERT_TRUE(restored_tab_proxy->WaitForTabToBeRestored( + TestTimeouts::action_timeout_ms())); GURL url; ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url)); EXPECT_TRUE(url == url1_); restored_tab_proxy = browser_proxy->GetTab(initial_tab_count + 1); ASSERT_TRUE(restored_tab_proxy.get()); - ASSERT_TRUE(restored_tab_proxy->WaitForTabToBeRestored(action_timeout_ms())); + ASSERT_TRUE(restored_tab_proxy->WaitForTabToBeRestored( + TestTimeouts::action_timeout_ms())); ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url)); EXPECT_TRUE(url == url2_); } @@ -630,7 +633,7 @@ TEST_F(TabRestoreUITest, RestoreTabWithSpecialURL) { RestoreTab(0, 1); tab = browser->GetTab(1); ASSERT_TRUE(tab.get()); - ASSERT_TRUE(tab->WaitForTabToBeRestored(action_timeout_ms())); + ASSERT_TRUE(tab->WaitForTabToBeRestored(TestTimeouts::action_timeout_ms())); // See if content is as expected. EXPECT_TRUE(tab->FindInPage(std::wstring(L"webkit"), FWD, IGNORE_CASE, false, @@ -666,7 +669,7 @@ TEST_F(TabRestoreUITest, RestoreTabWithSpecialURLOnBack) { RestoreTab(0, 1); tab = browser->GetTab(1); ASSERT_TRUE(tab.get()); - ASSERT_TRUE(tab->WaitForTabToBeRestored(action_timeout_ms())); + ASSERT_TRUE(tab->WaitForTabToBeRestored(TestTimeouts::action_timeout_ms())); GURL url; ASSERT_TRUE(tab->GetCurrentURL(&url)); ASSERT_EQ(http_url, url); |