Index: chrome/test/perf/page_cycler_test.cc |
diff --git a/chrome/test/perf/page_cycler_test.cc b/chrome/test/perf/page_cycler_test.cc |
index e07e36bbae65ede8bc8a55de7953d4cc90f495eb..31401eab8c910c826e20e9720e9ec4a147229580 100644 |
--- a/chrome/test/perf/page_cycler_test.cc |
+++ b/chrome/test/perf/page_cycler_test.cc |
@@ -197,6 +197,11 @@ class PageCyclerTest : public UIPerfTest { |
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"", |
@@ -442,20 +447,18 @@ TEST_F(PageCyclerReferenceTest, name) { \ |
// 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, FLAKY_Database##name##File) { \ |
+TEST_F(PageCyclerDatabaseTest, Database##name##File) { \ |
RunTest(test, test, false); \ |
} \ |
-TEST_F(PageCyclerDatabaseReferenceTest, FLAKY_Database##name##File) { \ |
+TEST_F(PageCyclerDatabaseReferenceTest, 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, FLAKY_IndexedDB##name##File) { \ |
+TEST_F(PageCyclerIndexedDatabaseTest, IndexedDB##name##File) { \ |
RunTest(test, test, false); \ |
} \ |
TEST_F(PageCyclerIndexedDatabaseReferenceTest, IndexedDB##name##File) { \ |