Remove sleep_timeout_ms and fix all the callers.

chrome/browser/history/redirect_uitest.cc

-// Copyright (c) 2010 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.
 
 // Navigates the browser to server and client redirect pages and makes sure
 // that the correct redirects are reflected in the history database. Errors
 // here might indicate that WebKit changed the calls our glue layer gets in
 // the case of redirects. It may also mean problems with the history system.
 
 #include "base/file_util.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/string16.h"
+#include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 #include "net/test/test_server.h"
 #include "views/event.h"
@@ skipping 178 matching lines @@
       "server-redirect?" + next_to_last.spec());
   GURL first_url = test_server_.GetURL(
       "client-redirect?" + second_url.spec());
   std::vector<GURL> redirects;
 
   // We need the sleep for the client redirects, because it appears as two
   // page visits in the browser.
   NavigateToURL(first_url);
 
   for (int i = 0; i < 10; ++i) {
-    base::PlatformThread::Sleep(sleep_timeout_ms());
+    base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
     scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
     ASSERT_TRUE(tab_proxy.get());
     ASSERT_TRUE(tab_proxy->GetRedirectsFrom(first_url, &redirects));
     if (!redirects.empty())
       break;
   }
 
   ASSERT_EQ(3U, redirects.size());
   EXPECT_EQ(second_url.spec(), redirects[0].spec());
   EXPECT_EQ(next_to_last.spec(), redirects[1].spec());
@@ skipping 85 matching lines @@
   // We don't sleep here - the first navigation won't have been committed yet
   // because we told the server to wait a minute. This means the browser has
   // started it's provisional load for the client redirect destination page but
   // hasn't completed. Our time is now!
   NavigateToURL(final_url);
 
   std::wstring tab_title;
   std::wstring final_url_title = UTF8ToWide("Title Of Awesomeness");
   // Wait till the final page has been loaded.
   for (int i = 0; i < 10; ++i) {
-    base::PlatformThread::Sleep(sleep_timeout_ms());
+    base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
     scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
     ASSERT_TRUE(tab_proxy.get());
     ASSERT_TRUE(tab_proxy->GetTabTitle(&tab_title));
     if (tab_title == final_url_title) {
       ASSERT_TRUE(tab_proxy->GetRedirectsFrom(first_url, &redirects));
       break;
     }
   }
 
   // Check to make sure the navigation did in fact take place and we are
   // at the expected page.
   EXPECT_EQ(final_url_title, tab_title);
 
   bool final_navigation_not_redirect = true;
   // Check to make sure our request for files/title2.html doesn't get flagged
   // as a client redirect from the first (/client-redirect?) page.
   for (std::vector<GURL>::iterator it = redirects.begin();
        it != redirects.end(); ++it) {
     if (final_url.spec() == it->spec()) {
       final_navigation_not_redirect = false;
       break;
     }
   }
   EXPECT_TRUE(final_navigation_not_redirect);
 }
 
 }  // namespace