1 files changed, 12 insertions, 21 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 16ca71d..f5eae5a 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -119,7 +119,7 @@ void UITestBase::SetUp() {
                                  "of the app before testing.");
 
   JavaScriptExecutionController::set_timeout(
-      TestTimeouts::action_max_timeout());
+      TestTimeouts::action_max_timeout_ms());
   test_start_time_ = Time::NowFromSystemTime();
 
   SetLaunchSwitches();
@@ -138,22 +138,13 @@ AutomationProxy* UITestBase::automation() const {
   return launcher_->automation();
 }
 
-base::TimeDelta UITestBase::action_timeout() {
-  return automation()->action_timeout();
-}
-
 int UITestBase::action_timeout_ms() {
-  return action_timeout().InMilliseconds();
-}
-
-void UITestBase::set_action_timeout(base::TimeDelta timeout) {
-  automation()->set_action_timeout(timeout);
-  VLOG(1) << "Automation action timeout set to "
-          << timeout.InMilliseconds() << " ms";
+  return automation()->action_timeout_ms();
 }
 
 void UITestBase::set_action_timeout_ms(int timeout) {
-  set_action_timeout(base::TimeDelta::FromMilliseconds(timeout));
+  automation()->set_action_timeout_ms(timeout);
+  VLOG(1) << "Automation action timeout set to " << timeout << " ms";
 }
 
 ProxyLauncher* UITestBase::CreateProxyLauncher() {
@@ -423,7 +414,7 @@ bool UITestBase::CloseBrowser(BrowserProxy* browser,
   if (*application_closed) {
     int exit_code = -1;
     EXPECT_TRUE(launcher_->WaitForBrowserProcessToQuit(
-        TestTimeouts::action_max_timeout(), &exit_code));
+        TestTimeouts::action_max_timeout_ms(), &exit_code));
     EXPECT_EQ(0, exit_code);  // Expect a clean shutown.
   }
 
@@ -602,7 +593,7 @@ void UITest::WaitForFinish(const std::string &name,
                            const GURL &url,
                            const std::string& test_complete_cookie,
                            const std::string& expected_cookie_value,
-                           const base::TimeDelta wait_time) {
+                           const int wait_time) {
   // The webpage being tested has javascript which sets a cookie
   // which signals completion of the test.  The cookie name is
   // a concatenation of the test name and the test id.  This allows
@@ -636,9 +627,9 @@ bool UITest::EvictFileFromSystemCacheWrapper(const FilePath& path) {
 bool UITest::WaitUntilJavaScriptCondition(TabProxy* tab,
                                           const std::wstring& frame_xpath,
                                           const std::wstring& jscript,
-                                          base::TimeDelta timeout) {
+                                          int timeout_ms) {
   const TimeDelta kDelay = TimeDelta::FromMilliseconds(250);
-  const int kMaxDelays = timeout / kDelay;
+  const int kMaxDelays = timeout_ms / kDelay.InMilliseconds();
 
   // Wait until the test signals it has completed.
   for (int i = 0; i < kMaxDelays; ++i) {
@@ -661,10 +652,10 @@ bool UITest::WaitUntilJavaScriptCondition(TabProxy* tab,
 bool UITest::WaitUntilCookieValue(TabProxy* tab,
                                   const GURL& url,
                                   const char* cookie_name,
-                                  base::TimeDelta timeout,
+                                  int timeout_ms,
                                   const char* expected_value) {
   const TimeDelta kDelay = TimeDelta::FromMilliseconds(250);
-  const int kMaxDelays = timeout / kDelay;
+  const int kMaxDelays = timeout_ms / kDelay.InMilliseconds();
 
   std::string cookie_value;
   for (int i = 0; i < kMaxDelays; ++i) {
@@ -682,9 +673,9 @@ bool UITest::WaitUntilCookieValue(TabProxy* tab,
 std::string UITest::WaitUntilCookieNonEmpty(TabProxy* tab,
                                             const GURL& url,
                                             const char* cookie_name,
-                                            base::TimeDelta timeout) {
+                                            int timeout_ms) {
   const TimeDelta kDelay = TimeDelta::FromMilliseconds(250);
-  const int kMaxDelays = timeout / kDelay;
+  const int kMaxDelays = timeout_ms / kDelay.InMilliseconds();
 
   for (int i = 0; i < kMaxDelays; ++i) {
     std::string cookie_value;