Remove action_max_timeout_ms and fix all the callers.

chrome/test/ui/ppapi_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/file_util.h"
 #include "base/path_service.h"
 #include "base/test/test_timeouts.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
@@ skipping 74 matching lines @@
     ASSERT_TRUE(tab.get());
     ASSERT_TRUE(tab->NavigateToURL(test_url));
 
     // First wait for the "starting" signal. This cookie is set at the start
     // of every test. Waiting for this separately allows us to avoid a single
     // long timeout. Instead, we can have two timeouts which allow startup +
     // test execution time to take a while on a loaded computer, while also
     // making sure we're making forward progress.
     std::string startup_cookie =
         WaitUntilCookieNonEmpty(tab.get(), test_url,
-            "STARTUP_COOKIE", action_max_timeout_ms());
+            "STARTUP_COOKIE", TestTimeouts::action_max_timeout_ms());
 
     // If this fails, the plugin couldn't be loaded in the given amount of
     // time. This may mean the plugin was not found or possibly the system
     // can't load it due to missing symbols, etc.
     ASSERT_STREQ("STARTED", startup_cookie.c_str())
         << "Plugin couldn't be loaded. Make sure the PPAPI test plugin is "
         << "built, in the right place, and doesn't have any missing symbols.";
 
     std::string escaped_value =
         WaitUntilCookieNonEmpty(tab.get(), test_url,
@@ skipping 54 matching lines @@
 
 // TODO(dumi): figure out why this test is flaky / crashing.
 TEST_F(PPAPITest, DISABLED_FileRef) {
   RunTestViaHTTP("FileRef");
 }
 
 // http://crbug.com/63239
 TEST_F(PPAPITest, DISABLED_DirectoryReader) {
   RunTestViaHTTP("DirectoryReader");
 }