Switch to TimeDelta interfaces in chrome automation test infrastructure.

chrome/test/webdriver/webdriver_automation.cc

 // Copyright (c) 2012 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 "chrome/test/webdriver/webdriver_automation.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 282 matching lines @@
   proxy->channel()->set_outgoing_message_filter(filter);
 }
 
 class WebDriverAnonymousProxyLauncher : public AnonymousProxyLauncher {
  public:
   WebDriverAnonymousProxyLauncher()
       : AnonymousProxyLauncher(false) {}
   virtual ~WebDriverAnonymousProxyLauncher() {}
 
   virtual AutomationProxy* CreateAutomationProxy(
-      int execution_timeout) OVERRIDE {
+      base::TimeDelta execution_timeout) OVERRIDE {
     AutomationProxy* proxy =
         AnonymousProxyLauncher::CreateAutomationProxy(execution_timeout);
     AddBackwardsCompatFilter(proxy);
     return proxy;
   }
 };
 
 class WebDriverNamedProxyLauncher : public NamedProxyLauncher {
  public:
   WebDriverNamedProxyLauncher(const std::string& channel_id,
                               bool launch_browser)
       : NamedProxyLauncher(channel_id, launch_browser, false) {}
   virtual ~WebDriverNamedProxyLauncher() {}
 
   virtual AutomationProxy* CreateAutomationProxy(
-      int execution_timeout) OVERRIDE {
+      base::TimeDelta execution_timeout) OVERRIDE {
     AutomationProxy* proxy =
         NamedProxyLauncher::CreateAutomationProxy(execution_timeout);
     // We can only add the filter here if the browser has not already been
     // started. Otherwise the filter is not guaranteed to receive the
     // first message. The only occasion where we don't launch the browser is
     // in PyAuto, in which case the backwards compat filter isn't needed
     // anyways because ChromeDriver and Chrome are at the same version there.
     if (launch_browser_)
       AddBackwardsCompatFilter(proxy);
     return proxy;
@@ skipping 113 matching lines @@
   };
   if (!launcher_->InitializeConnection(launch_props, true)) {
     logger_.Log(kSevereLogLevel, "Failed to initialize connection");
     *error = new Error(
         kUnknownError,
         "Unable to either launch or connect to Chrome. Please check that "
             "ChromeDriver is up-to-date. " + chrome_details);
     return;
   }
 
-  launcher_->automation()->set_action_timeout_ms(base::kNoTimeout);
+  launcher_->automation()->set_action_timeout(
+      base::TimeDelta::FromMilliseconds(base::kNoTimeout));
   logger_.Log(kInfoLogLevel, "Connected to Chrome successfully. Version: " +
               automation()->server_version());
 
   *error = DetermineBuildNumber();
   if (*error)
     return;
   *build_no = build_no_;
 
   // Check the version of Chrome is compatible with this ChromeDriver.
   chrome_details += ", version (" + automation()->server_version() + ")";
@@ skipping 22 matching lines @@
     // if all else fails, kill it hard.
     Error* error = NULL;
     AcceptOrDismissAppModalDialog(true /* accept */, &error);
     scoped_ptr<Error> scoped_error(error);
 
     kill(launcher_->process(), SIGTERM);
 #else
     automation()->Disconnect();
 #endif
     int exit_code = -1;
-    if (!launcher_->WaitForBrowserProcessToQuit(10000, &exit_code)) {
+    if (!launcher_->WaitForBrowserProcessToQuit(
+            base::TimeDelta::FromSeconds(10), &exit_code)) {
       logger_.Log(kWarningLogLevel, "Chrome still running, terminating...");
       TerminateAllChromeProcesses(launcher_->process_id());
     }
     base::CloseProcessHandle(launcher_->process());
     logger_.Log(kInfoLogLevel, "Chrome shutdown");
   }
 }
 
 void Automation::ExecuteScript(const WebViewId& view_id,
                                const FramePath& frame_path,
@@ skipping 683 matching lines @@
 }
 
 Error* Automation::CheckMaximizeSupported() {
   const char* message =
       "Maximize automation interface is not supported for this version of "
       "Chrome.";
   return CheckVersion(1160, message);
 }
 
 }  // namespace webdriver