Remove action_timeout_ms and fix all the callers.

chrome/test/automated_ui_tests/automated_ui_test_base.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/test/test_timeouts.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/test/automated_ui_tests/automated_ui_test_base.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 "gfx/point.h"
 #include "gfx/rect.h"
 #include "views/event.h"
@@ skipping 190 matching lines @@
     new_tab_index = tab_index - 1;
     destination_point.Offset(-2 * dragged_tab_bounds.width() / 3, 0);
   }
 
   if (!browser->SimulateDrag(dragged_tab_point, destination_point,
                              views::Event::EF_LEFT_BUTTON_DOWN, false)) {
     LogWarningMessage("failed_to_simulate_drag");
     return false;
   }
 
-  if (!browser->WaitForTabToBecomeActive(new_tab_index, action_timeout_ms())) {
+  if (!browser->WaitForTabToBecomeActive(new_tab_index,
+                                         TestTimeouts::action_timeout_ms())) {
     LogWarningMessage("failed_to_reindex_tab");
     return false;
   }
 
   return true;
 }
 
 bool AutomatedUITestBase::FindInPage() {
   if (!RunCommandAsync(IDC_FIND))
     return false;
@@ skipping 151 matching lines @@
 
 scoped_refptr<WindowProxy> AutomatedUITestBase::GetAndActivateWindowForBrowser(
     BrowserProxy* browser) {
   if (!browser->BringToFront()) {
     LogWarningMessage("failed_to_bring_window_to_front");
     return NULL;
   }
 
   return browser->GetWindow();
 }