Remove action_max_timeout_ms and fix all the callers.

chrome/browser/in_process_webkit/dom_storage_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 "base/file_path.h"
 #include "base/file_util.h"
+#include "base/test/test_timeouts.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_layout_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "net/base/net_util.h"
 
 static const char* kRootFiles[] = {
   "clear.html",
 //  "complex-keys.html",  // Output too big for a cookie.  crbug.com/33472
 //  "complex-values.html",  // crbug.com/33472
@@ skipping 54 matching lines @@
   void ClearDOMStorage() {
     scoped_refptr<TabProxy> tab(GetActiveTab());
     ASSERT_TRUE(tab.get());
 
     const FilePath dir(FILE_PATH_LITERAL("layout_tests"));
     const FilePath file(FILE_PATH_LITERAL("clear_dom_storage.html"));
     GURL url = ui_test_utils::GetTestUrl(dir, file);
     ASSERT_TRUE(tab->SetCookie(url, ""));
     ASSERT_TRUE(tab->NavigateToURL(url));
 
-    WaitUntilCookieNonEmpty(tab.get(), url, "cleared", action_max_timeout_ms());
+    WaitUntilCookieNonEmpty(tab.get(), url, "cleared",
+                            TestTimeouts::action_max_timeout_ms());
   }
 
   // Runs each test in an array of strings until it hits a NULL.
   void RunTests(const char** files) {
     while (*files) {
       ClearDOMStorage();
       RunLayoutTest(*files, kNoHttpPort);
       ++files;
     }
   }
@@ skipping 87 matching lines @@
   NavigateToURL(GURL("javascript:set()"));
   QuitBrowser();
   EXPECT_FALSE(StorageDirIsEmpty());
 
   LaunchBrowserAndServer();
   NavigateToURL(TestUrl());
   NavigateToURL(GURL("javascript:clear()"));
   QuitBrowser();
   EXPECT_TRUE(StorageDirIsEmpty());
 }