Revert 117824 - Convert use of int ms to TimeDelta in files owned by brettw.

chrome/browser/media_uitest.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 12 matching lines @@
     GURL player_gurl = net::FilePathToFileURL(test_file);
     std::string url = base::StringPrintf(
         "%s?%s=%s", player_gurl.spec().c_str(), tag, media_file);
 
     NavigateToURL(GURL(url));
 
     // Allow the media file to be loaded.
     const std::wstring kPlaying = L"PLAYING";
     const std::wstring kFailed = L"FAILED";
     const std::wstring kError = L"ERROR";
-    const base::TimeDelta kSleepInterval =
-        base::TimeDelta::FromMilliseconds(250);
+    const int kSleepIntervalMs = 250;
     const int kNumIntervals =
-        TestTimeouts::action_timeout() / kSleepInterval;
+        TestTimeouts::action_timeout_ms() / kSleepIntervalMs;
     for (int i = 0; i < kNumIntervals; ++i) {
       const std::wstring& title = GetActiveTabTitle();
       if (title == kPlaying || title == kFailed ||
           StartsWith(title, kError, true))
         break;
-      base::PlatformThread::Sleep(kSleepInterval);
+      base::PlatformThread::Sleep(kSleepIntervalMs);
     }
 
     EXPECT_EQ(kPlaying, GetActiveTabTitle());
   }
 
   void PlayAudio(const char* url) {
     PlayMedia("audio", url);
   }
 
   void PlayVideo(const char* url) {
@@ skipping 102 matching lines @@
   InitializeForLayoutTest(test_dir, media_test_dir, kNoHttpPort);
 
   // Copy resources first.
   for (size_t i = 0; i < arraysize(kResources); ++i)
     AddResourceForLayoutTest(
         test_dir, media_test_dir.AppendASCII(kResources[i]));
 
   for (size_t i = 0; i < arraysize(kMediaTests); ++i)
     RunLayoutTest(kMediaTests[i], kNoHttpPort);
 }