diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-15 00:02:40 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-15 00:02:40 +0000 |
| commit | b7a20d363af744159a2bb85bfe3db027d2d4819e (patch) | |
| tree | 14a363b284d4456d6c0a4888a6b944af3e10b490 /chrome/test/ui_test_utils.h | |
| parent | 3f58d855ccb7c29abd2fd73cb60e11089abe8dd1 (diff) | |
| download | chromium_src-b7a20d363af744159a2bb85bfe3db027d2d4819e.zip chromium_src-b7a20d363af744159a2bb85bfe3db027d2d4819e.tar.gz chromium_src-b7a20d363af744159a2bb85bfe3db027d2d4819e.tar.bz2 | |
Convert parts of errorpage_uitest.cc to be not flaky.
TEST=Covered by browser_tests.
http://crbug.com/19361, http://crbug.com/19395
Review URL: http://codereview.chromium.org/169002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23500 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui_test_utils.h')
| -rw-r--r-- | chrome/test/ui_test_utils.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/test/ui_test_utils.h b/chrome/test/ui_test_utils.h index 952cf5f..94e4235 100644 --- a/chrome/test/ui_test_utils.h +++ b/chrome/test/ui_test_utils.h @@ -31,6 +31,15 @@ void RunMessageLoop(); // Puts the current tab title in |title|. Returns true on success. bool GetCurrentTabTitle(const Browser* browser, string16* title); +// Waits for the current tab to complete the navigation. Returns true on +// success. +bool WaitForNavigationInCurrentTab(Browser* browser); + +// Waits for the current tab to complete the specified number of navigations. +// Returns true on success. +bool WaitForNavigationsInCurrentTab(Browser* browser, + int number_of_navigations); + // Waits for |controller| to complete a navigation. This blocks until // the navigation finishes. void WaitForNavigation(NavigationController* controller); @@ -44,10 +53,6 @@ void WaitForNavigations(NavigationController* controller, // navigation finishes. void NavigateToURL(Browser* browser, const GURL& url); -// Reloads current tab contents and waits for navigation to finish. -// Returns true on success. -bool ReloadCurrentTab(Browser* browser); - // Navigates the selected tab of |browser| to |url|, blocking until the // number of navigations specified complete. void NavigateToURLBlockUntilNavigationsComplete(Browser* browser, |