Switch to TimeDelta interfaces in chrome automation test infrastructure.

chrome/test/automation/browser_proxy.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/automation/browser_proxy.h"
 
 #include <algorithm>
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
@@ skipping 182 matching lines @@
   bool success = false;
   if (!sender_->Send(new AutomationMsg_WaitForTabCountToBecome(
                          handle_, count, &success))) {
     return false;
   }
 
   return success;
 }
 
 bool BrowserProxy::WaitForTabToBecomeActive(int tab,
-                                            int wait_timeout) {
+                                            base::TimeDelta wait_timeout) {
   const TimeTicks start = TimeTicks::Now();
-  const TimeDelta timeout = TimeDelta::FromMilliseconds(wait_timeout);
-  while (TimeTicks::Now() - start < timeout) {
+  while (TimeTicks::Now() - start < wait_timeout) {
     base::PlatformThread::Sleep(
         base::TimeDelta::FromMilliseconds(automation::kSleepTime));
     int active_tab;
     if (GetActiveTabIndex(&active_tab) && active_tab == tab)
       return true;
   }
   // If we get here, the active tab hasn't changed.
   return false;
 }
 
@@ skipping 214 matching lines @@
   if (!sender_->Send(
       new AutomationMsg_SendJSONRequestWithBrowserHandle(handle_,
                                                          request,
                                                          response,
                                                          &result),
                                                          timeout_ms))
     return false;
   return result;
 }
 
-bool BrowserProxy::GetInitialLoadTimes(int timeout_ms,
+bool BrowserProxy::GetInitialLoadTimes(base::TimeDelta timeout,
                                        float* min_start_time,
                                        float* max_stop_time,
                                        std::vector<float>* stop_times) {
   std::string json_response;
   const char* kJSONCommand = "{\"command\": \"GetInitialLoadTimes\"}";
 
   *max_stop_time = 0;
   *min_start_time = -1;
-  if (!SendJSONRequest(kJSONCommand, timeout_ms, &json_response)) {
+  if (!SendJSONRequest(
+          kJSONCommand, timeout.InMilliseconds(), &json_response)) {
     // Older browser versions do not support GetInitialLoadTimes.
     // Fail gracefully and do not record them in this case.
     return false;
   }
   std::string error;
   scoped_ptr<Value> values(base::JSONReader::ReadAndReturnError(
       json_response, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error));
   if (!error.empty() || values->GetType() != Value::TYPE_DICTIONARY)
     return false;
 
@@ skipping 29 matching lines @@
     if (i == 0)
       *min_start_time = start_ms;
 
     *min_start_time = std::min(start_ms, *min_start_time);
     *max_stop_time = std::max(stop_ms, *max_stop_time);
     stop_times->push_back(stop_ms);
   }
   std::sort(stop_times->begin(), stop_times->end());
   return true;
 }