diff options
Diffstat (limited to 'chrome/test/ui/ui_test.h')
| -rw-r--r-- | chrome/test/ui/ui_test.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h index a8d252e..47a3917 100644 --- a/chrome/test/ui/ui_test.h +++ b/chrome/test/ui/ui_test.h @@ -67,9 +67,7 @@ class UITestBase { void ConnectToRunningBrowser(); // Only for pyauto. - base::TimeDelta action_timeout(); int action_timeout_ms(); - void set_action_timeout(base::TimeDelta timeout); void set_action_timeout_ms(int timeout); // Overridable so that derived classes can provide their own ProxyLauncher. @@ -379,7 +377,7 @@ class UITest : public UITestBase, public PlatformTest { const std::string &id, const GURL &url, const std::string& test_complete_cookie, const std::string& expected_cookie_value, - const base::TimeDelta wait_time); + const int wait_time); // Wrapper around EvictFileFromSystemCache to retry 10 times in case of // error. @@ -399,7 +397,7 @@ class UITest : public UITestBase, public PlatformTest { bool WaitUntilJavaScriptCondition(TabProxy* tab, const std::wstring& frame_xpath, const std::wstring& jscript, - base::TimeDelta timeout); + int timeout_ms); // Polls the tab for the cookie_name cookie and returns once one of the // following conditions hold true: @@ -408,7 +406,7 @@ class UITest : public UITestBase, public PlatformTest { // - The timeout value has been exceeded. bool WaitUntilCookieValue(TabProxy* tab, const GURL& url, const char* cookie_name, - base::TimeDelta timeout, + int timeout_ms, const char* expected_value); // Polls the tab for the cookie_name cookie and returns once one of the @@ -419,7 +417,7 @@ class UITest : public UITestBase, public PlatformTest { std::string WaitUntilCookieNonEmpty(TabProxy* tab, const GURL& url, const char* cookie_name, - base::TimeDelta timeout); + int timeout_ms); // Waits until the Find window has become fully visible (if |wait_for_open| is // true) or fully hidden (if |wait_for_open| is false). This function can time |