Remove sleep_timeout_ms and fix all the callers.

chrome/browser/media_uitest.cc

-// Copyright (c) 2009 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 "app/gfx/gl/gl_implementation.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/string_util.h"
+#include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/test_launcher_utils.h"
 #include "chrome/test/ui/ui_layout_test.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 
 class MediaTest : public UITest {
  protected:
   virtual void SetUp() {
@@ skipping 20 matching lines @@
                                    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";
     for (int i = 0; i < 10; ++i) {
-      base::PlatformThread::Sleep(sleep_timeout_ms());
+      base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
       const std::wstring& title = GetActiveTabTitle();
       if (title == kPlaying || title == kFailed ||
           StartsWith(title, kError, true))
         break;
     }
 
     EXPECT_EQ(kPlaying, GetActiveTabTitle());
   }
 
   void PlayAudio(const char* url) {
@@ skipping 65 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);
 }