Remove sleep_timeout_ms and fix all the callers.

chrome/browser/ui/tests/browser_uitest.cc

-// Copyright (c) 2006-2008 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/base_paths.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/test/test_file_util.h"
+#include "base/test/test_timeouts.h"
 #include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
@@ skipping 84 matching lines @@
 
   // Use JavaScript URL to "fork" a new tab, just like Gmail.  (Open tab to a
   // blank page, set its opener to null, and redirect it cross-site.)
   std::wstring url_prefix(L"javascript:(function(){w=window.open();");
   GURL fork_url(url_prefix +
       L"w.opener=null;w.document.location=\"http://localhost:1337\";})()");
 
   // Make sure that a new tab has been created and that we have a new renderer
   // process for it.
   ASSERT_TRUE(tab->NavigateToURLAsync(fork_url));
-  PlatformThread::Sleep(sleep_timeout_ms());
+  PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
   ASSERT_EQ(orig_process_count + 1, GetBrowserProcessCount());
   int new_tab_count = -1;
   ASSERT_TRUE(window->GetTabCount(&new_tab_count));
   ASSERT_EQ(orig_tab_count + 1, new_tab_count);
 }
 #endif  // CHROME_V8
 
 // This test fails on ChromeOS (it has never been known to work on it).
 // Currently flaky on Windows - it has crashed a couple of times.
 // http://crbug.com/32799
@@ skipping 32 matching lines @@
   // Use JavaScript URL to almost fork a new tab, but not quite.  (Leave the
   // opener non-null.)  Should not fork a process.
   std::string url_str = "javascript:(function(){w=window.open(); ";
   url_str += "w.document.location=\"";
   url_str += test_server.GetURL("").spec();
   url_str += "\";})()";
   GURL dont_fork_url(url_str);
 
   // Make sure that a new tab but not new process has been created.
   ASSERT_TRUE(tab->NavigateToURLAsync(dont_fork_url));
-  base::PlatformThread::Sleep(sleep_timeout_ms());
+  base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
   ASSERT_EQ(orig_process_count, GetBrowserProcessCount());
   int new_tab_count = -1;
   ASSERT_TRUE(window->GetTabCount(&new_tab_count));
   ASSERT_EQ(orig_tab_count + 1, new_tab_count);
 
   // Same thing if the current tab tries to redirect itself.
   url_str = "javascript:(function(){w=window.open(); ";
   url_str += "document.location=\"";
   url_str += test_server.GetURL("").spec();
   url_str += "\";})()";
   GURL dont_fork_url2(url_str);
 
   // Make sure that no new process has been created.
   ASSERT_TRUE(tab->NavigateToURLAsync(dont_fork_url2));
-  base::PlatformThread::Sleep(sleep_timeout_ms());
+  base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
   ASSERT_EQ(orig_process_count, GetBrowserProcessCount());
 }
 
 TEST_F(VisibleBrowserTest, WindowOpenClose) {
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("window.close.html");
 
   NavigateToURLBlockUntilNavigationsComplete(
       net::FilePathToFileURL(test_file), 2);
   EXPECT_EQ(L"Title Of Awesomeness", GetActiveTabTitle());
@@ skipping 181 matching lines @@
   EXPECT_EQ(0, window_count);
 
   // Starting a browser window should work just fine.
   ASSERT_TRUE(IsBrowserRunning());
   ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_NORMAL, true));
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
   EXPECT_EQ(1, window_count);
 }
 
 }  // namespace