Remove action_max_timeout_ms and fix all the callers.

chrome/renderer/external_extension_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.
 
+#include "base/test/test_timeouts.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.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/escape.h"
 #include "net/test/test_server.h"
 
 struct IsSearchProviderTestData;
@@ skipping 85 matching lines @@
   // Bundle up information needed to verify the result.
   return IsSearchProviderTestData(tab, host, test_url);
 }
 
 void SearchProviderTest::FinishIsSearchProviderInstalledTest(
     const IsSearchProviderTestData& data) {
   ASSERT_TRUE(data.tab.get());
 
   std::string cookie_name = data.host + "testResult";
   std::string escaped_value =
-      WaitUntilCookieNonEmpty(data.tab, data.test_url,
-                              cookie_name.c_str(), action_max_timeout_ms());
+      WaitUntilCookieNonEmpty(data.tab,
+                              data.test_url,
+                              cookie_name.c_str(),
+                              TestTimeouts::action_max_timeout_ms());
 
   // Unescapes and normalizes the actual result.
   std::string value = UnescapeURLComponent(
       escaped_value,
       UnescapeRule::NORMAL | UnescapeRule::SPACES |
       UnescapeRule::URL_SPECIAL_CHARS | UnescapeRule::CONTROL_CHARS);
   value += "\n";
   ReplaceSubstringsAfterOffset(&value, 0, "\r", "");
   EXPECT_STREQ("1\n", value.c_str());
 }
@@ skipping 40 matching lines @@
 #if 0
   // Remove the calls to FinishIsSearchProviderInstalledTest above when
   // re-enabling this code.
 
   // Do the verification.
   for (size_t i = 0; i < arraysize(test_data); ++i) {
     FinishIsSearchProviderInstalledTest(test_data[i]);
   }
 #endif
 }