Remove action_max_timeout_ms and fix all the callers.

chrome/test/pyautolib/pyautolib.h

-// 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.
 //
 // This file declares the C++ side of PyAuto, the python interface to
 // Chromium automation.  It access Chromium's internals using Automation Proxy.
 
 #ifndef CHROME_TEST_PYAUTOLIB_PYAUTOLIB_H_
 #define CHROME_TEST_PYAUTOLIB_PYAUTOLIB_H_
 #pragma once
 
 #include "base/message_loop.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
+#include "base/test/test_timeouts.h"
 #include "chrome/test/ui/ui_test.h"
 #include "chrome/test/ui/ui_test_suite.h"
 
 // The C++ style guide forbids using default arguments but I'm taking the
 // liberty of allowing it in this file. The sole purpose of this (and the
 // .cc) is to support the python interface, and default args are allowed in
 // python. Strictly adhering to the guide here would mean having to re-define
 // all methods in python just for the sake of providing default args. This
 // seems cumbersome and unwanted.
 
@@ skipping 153 matching lines @@
   // Resets to the default theme. Returns true on success.
   bool ResetToDefaultTheme();
 
   // Sets a cookie value for a url. Returns true on success.
   bool SetCookie(const GURL& cookie_url, const std::string& value,
                  int window_index = 0, int tab_index = 0);
   // Gets a cookie value for the given url.
   std::string GetCookie(const GURL& cookie_url, int window_index = 0,
                         int tab_index = 0);
 
+  int action_max_timeout_ms() const {
+    return TestTimeouts::action_max_timeout_ms();
+  }
+
  private:
   // Enables PostTask to main thread.
   // Should be shared across multiple instances of PyUITestBase so that this
   // class is re-entrant and multiple instances can be created.
   // This is necessary since python's unittest module creates instances of
   // TestCase at load time itself.
   static MessageLoop* GetSharedMessageLoop(MessageLoop::Type msg_loop_type);
   static MessageLoop* message_loop_;
 };
 
 #endif  // CHROME_TEST_PYAUTOLIB_PYAUTOLIB_H_