Remove action_max_timeout_ms and fix all the callers.

chrome/test/ui/omnibox_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 <math.h>
 #include <stdio.h>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/perftimer.h"
 #include "base/string_util.h"
+#include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/libxml_utils.h"
 #include "chrome/test/automation/autocomplete_edit_proxy.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 
@@ skipping 63 matching lines @@
 
   // Try every proper prefix of input_text.  There's no use trying
   // input_text itself since the autocomplete results will always contain it.
   for (size_t i = 1; i < input_text.size(); ++i) {
     Matches matches;
 
     // We're only going to count the time elapsed waiting for autocomplete
     // matches to be returned to us.
     ASSERT_TRUE(autocomplete_edit->SetText(input_text.substr(0, i)));
     PerfTimer timer;
-    if (autocomplete_edit->WaitForQuery(action_max_timeout_ms())) {
+    if (autocomplete_edit->WaitForQuery(
+            TestTimeouts::action_max_timeout_ms())) {
       ASSERT_TRUE(autocomplete_edit->GetAutocompleteMatches(&matches));
       int64 time_elapsed = timer.Elapsed().InMilliseconds();
 
       // Adjust statistic trackers.
       if (query_count_ == 0)
         time_min_ = time_max_ = time_elapsed;
       ++query_count_;
       time_squared_ += time_elapsed * time_elapsed;
       time_sum_ += time_elapsed;
       if (time_elapsed < time_min_)
@@ skipping 66 matching lines @@
   wprintf(L"__om_query_count = %d\n", query_count_);
   wprintf(L"__om_query_timeouts = %d\n", query_timeouts_);
   wprintf(L"__om_time_per_query_avg = %d\n", mean);
   // Use the equation stddev = sqrt(Sum(x_i^2)/N - mean^2).
   wprintf(L"__om_time_per_query_stddev = %d\n", static_cast<int64>(
       sqrt(1.0 * time_squared_ / query_count_ - mean * mean)));
   wprintf(L"__om_time_per_query_max = %d\n", time_max_);
   wprintf(L"__om_time_per_query_min = %d\n", time_min_);
   wprintf(L"__om_score = %.4f\n", 100.0 * score_ / max_score_);
 }