Switch to TimeDelta interfaces in chrome automation test infrastructure.

chrome/test/ppapi/ppapi_test.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/ppapi/ppapi_test.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 42 matching lines @@
 
 bool IsAudioOutputAvailable() {
   scoped_ptr<media::AudioManager> audio_manager(media::AudioManager::Create());
   return audio_manager->HasAudioOutputDevices();
 }
 
 }  // namespace
 
 PPAPITestBase::TestFinishObserver::TestFinishObserver(
     RenderViewHost* render_view_host,
-    int timeout_s)
+    base::TimeDelta timeout)
     : finished_(false),
       waiting_(false),
-      timeout_s_(timeout_s) {
+      timeout_(timeout) {
   registrar_.Add(this, content::NOTIFICATION_DOM_OPERATION_RESPONSE,
                  content::Source<RenderViewHost>(render_view_host));
-  timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(timeout_s),
-               this, &TestFinishObserver::OnTimeout);
+  timer_.Start(FROM_HERE, timeout, this, &TestFinishObserver::OnTimeout);
 }
 
 bool PPAPITestBase::TestFinishObserver::WaitForFinish() {
   if (!finished_) {
     waiting_ = true;
     ui_test_utils::RunMessageLoop();
     waiting_ = false;
   }
   return finished_;
 }
 
 void PPAPITestBase::TestFinishObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == content::NOTIFICATION_DOM_OPERATION_RESPONSE);
   content::Details<DomOperationNotificationDetails> dom_op_details(details);
   // We might receive responses for other script execution, but we only
   // care about the test finished message.
   std::string response;
   TrimString(dom_op_details->json, "\"", &response);
   if (response == "...") {
     timer_.Stop();
-    timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(timeout_s_),
-                 this, &TestFinishObserver::OnTimeout);
+    timer_.Start(FROM_HERE, timeout_, this, &TestFinishObserver::OnTimeout);
   } else {
     result_ = response;
     finished_ = true;
     if (waiting_)
       MessageLoopForUI::current()->Quit();
   }
 }
 
 void PPAPITestBase::TestFinishObserver::Reset() {
   finished_ = false;
@@ skipping 118 matching lines @@
   return test_name;
 }
 
 void PPAPITestBase::RunTestURL(const GURL& test_url) {
   // See comment above TestingInstance in ppapi/test/testing_instance.h.
   // Basically it sends messages using the DOM automation controller. The
   // value of "..." means it's still working and we should continue to wait,
   // any other value indicates completion (in this case it will start with
   // "PASS" or "FAIL"). This keeps us from timing out on waits for long tests.
   TestFinishObserver observer(
-      chrome::GetActiveWebContents(browser())->GetRenderViewHost(), kTimeoutMs);
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+      base::TimeDelta::FromMilliseconds(kTimeoutMs));
 
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   ASSERT_TRUE(observer.WaitForFinish()) << "Test timed out.";
 
   EXPECT_STREQ("PASS", observer.result().c_str());
 }
 
 void PPAPITestBase::RunHTTPTestServer(
     const FilePath& document_root,
@@ skipping 125 matching lines @@
 }
 
 // Append the correct mode and testcase string
 std::string PPAPINaClTestDisallowedSockets::BuildQuery(
     const std::string& base,
     const std::string& test_case) {
   return StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
                       test_case.c_str());
 }