Revert r101718 "wait for test script to be loaded"

chrome/test/perf/page_cycler_test.cc

 // 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/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 179 matching lines @@
     // Wait for the test to finish.
     ASSERT_TRUE(WaitUntilCookieValue(
         tab.get(), test_url, "__pc_done",
         TestTimeouts::large_test_timeout_ms(), "1"));
 
     std::string cookie;
     ASSERT_TRUE(tab->GetCookieByName(test_url, "__pc_pages", &cookie));
     pages->assign(UTF8ToWide(cookie));
     ASSERT_FALSE(pages->empty());
 
-    // Wait for the report.html to be loaded.
-    ASSERT_TRUE(WaitUntilCookieValue(
-        tab.get(), test_url, "__navigated_to_report",
-        TestTimeouts::action_max_timeout_ms(), "1"));
-
     // Get the timing cookie value from the DOM automation.
     std::wstring wcookie;
     ASSERT_TRUE(tab->ExecuteAndExtractString(L"",
           L"window.domAutomationController.send("
           L"JSON.stringify(__get_timings()));",
           &wcookie));
     cookie = base::SysWideToNativeMB(wcookie);
 
     // JSON.stringify() encapsulates the returned string in quotes, strip them.
     std::string::size_type start_idx = cookie.find("\"");
@@ skipping 225 matching lines @@
 #define PAGE_CYCLER_TESTS(test, name, use_http) \
 TEST_F(PageCyclerTest, name) { \
   RunTest("times", test, use_http); \
 } \
 TEST_F(PageCyclerReferenceTest, name) { \
   RunTest("times", test, use_http); \
 }
 
 // This macro simplifies setting up regular and reference build tests
 // for HTML5 database tests.
+// FLAKY http://crbug.com/67918
 #define PAGE_CYCLER_DATABASE_TESTS(test, name) \
-TEST_F(PageCyclerDatabaseTest, Database##name##File) { \
+TEST_F(PageCyclerDatabaseTest, FLAKY_Database##name##File) { \
   RunTest(test, test, false); \
 } \
-TEST_F(PageCyclerDatabaseReferenceTest, Database##name##File) { \
+TEST_F(PageCyclerDatabaseReferenceTest, FLAKY_Database##name##File) { \
   RunTest(test, test, false); \
 }
 
 // This macro simplifies setting up regular and reference build tests
 // for HTML5 Indexed DB tests.
+// FLAKY http://crbug.com/67918
 #define PAGE_CYCLER_IDB_TESTS(test, name) \
-TEST_F(PageCyclerIndexedDatabaseTest, IndexedDB##name##File) { \
+TEST_F(PageCyclerIndexedDatabaseTest, FLAKY_IndexedDB##name##File) { \
   RunTest(test, test, false); \
 } \
 TEST_F(PageCyclerIndexedDatabaseReferenceTest, IndexedDB##name##File) { \
   RunTest(test, test, false); \
 }
 
 // These are shorthand for File vs. Http tests.
 #define PAGE_CYCLER_FILE_TESTS(test, name) \
   PAGE_CYCLER_TESTS(test, name, false)
 #define PAGE_CYCLER_HTTP_TESTS(test, name) \
@@ skipping 58 matching lines @@
 PAGE_CYCLER_DATABASE_TESTS("delete-transactions",
                            DeleteTransactions);
 PAGE_CYCLER_DATABASE_TESTS("pseudo-random-transactions",
                            PseudoRandomTransactions);
 #endif
 
 // Indexed DB tests.
 PAGE_CYCLER_IDB_TESTS("basic_insert", BasicInsert);
 
 }  // namespace