Revert 115315 - Revert 115283 - this makes quite a few PPAPI tests timing out on the CrOS Valgrind bots

Reduce PPAPI ui_test timeout so the cycle time isn't so long when everything's failing.

Sorry for reverting it in the first place, looks like the failures were
unrelated to your change.
Still, I'd be happy to see the timeout value adjustable via a command line flag.

BUG=108264
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/9018006

TBR=dmazzoni@chromium.org,brettw@chromium.org,hbono@chromium.org
Review URL: http://codereview.chromium.org/9021013

TBR=timurrrr@chromium.org
Review URL: http://codereview.chromium.org/9019009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115321 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 1 deletions

diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index f5491379..c53237d 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -129,6 +129,12 @@ class PPAPITestBase : public UITest {
     ASSERT_TRUE(tab.get());
     ASSERT_TRUE(tab->NavigateToURL(test_url));
 
+    // The large timeout was causing the cycle time for the whole test suite
+    // to be too long when a tiny bug caused all tests to timeout.
+    // http://crbug.com/108264
+    int timeout_ms = 90000;
+    //int timeout_ms = TestTimeouts::large_test_timeout_ms());
+
     // See comment above TestingInstance in ppapi/test/testing_instance.h.
     // Basically it sets a series of numbered cookies. The value of "..." means
     // it's still working and we should continue to wait, any other value
@@ -140,7 +146,7 @@ class PPAPITestBase : public UITest {
       std::string cookie_name = StringPrintf("PPAPI_PROGRESS_%d",
                                              progress_number);
       progress = WaitUntilCookieNonEmpty(tab.get(), test_url,
-            cookie_name.c_str(), TestTimeouts::large_test_timeout_ms());
+                                         cookie_name.c_str(), timeout_ms);
       if (progress != "...")
         break;
       progress_number++;