Remove action_max_timeout_ms and fix all the callers.

chrome/test/ui/pepper_uitest.cc

Index: chrome/test/ui/pepper_uitest.cc
diff --git a/chrome/test/ui/pepper_uitest.cc b/chrome/test/ui/pepper_uitest.cc
index 590b5f3af01403734ee2c0d3c30755259bb1b856..f34346dbbab3a789cd2cce0559a7360bb627e87a 100644
--- a/chrome/test/ui/pepper_uitest.cc
+++ b/chrome/test/ui/pepper_uitest.cc
@@ -1,10 +1,11 @@
-// 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/file_path.h"
 
 #include "app/app_switches.h"
+#include "base/test/test_timeouts.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/ui/npapi_test_helper.h"
 #include "chrome/test/ui_test_utils.h"
@@ -41,6 +42,6 @@ TEST_F(PepperTester, FAILS_Pepper3D) {
   ASSERT_NO_FATAL_FAILURE(NavigateToURL(url));
   WaitForFinish("pepper_3d", "1", url,
                 kTestCompleteCookie, kTestCompleteSuccess,
-                action_max_timeout_ms());
+                TestTimeouts::action_max_timeout_ms());
 }
 #endif