| Index: chrome/browser/in_process_webkit/indexed_db_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/in_process_webkit/indexed_db_browsertest.cc (revision 72412)
|
| +++ chrome/browser/in_process_webkit/indexed_db_browsertest.cc (working copy)
|
| @@ -82,13 +82,25 @@
|
| SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("database_test.html"))));
|
| }
|
|
|
| -// Flaky. See http://crbug.com/70643.
|
| -IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_TransactionTest) {
|
| +// Flaky. See http://crbug.com/70643 and http://crbug.com/70665.
|
| +#if defined(OS_LINUX)
|
| +#define MAYBE_TransactionTest DISABLED_TransactionTest
|
| +#else
|
| +#define MAYBE_TransactionTest FLAKY_TransactionTest
|
| +#endif
|
| +
|
| +IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, MAYBE_TransactionTest) {
|
| SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html"))));
|
| }
|
|
|
| -// Flaky. See http://crbug.com/70643.
|
| -IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_DoesntHangTest) {
|
| +// Flaky. See http://crbug.com/70643 and http://crbug.com/70665.
|
| +#if defined(OS_LINUX)
|
| +#define MAYBE_DoesntHangTest DISABLED_DoesntHangTest
|
| +#else
|
| +#define MAYBE_DoesntHangTest FLAKY_DoesntHangTest
|
| +#endif
|
| +
|
| +IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, MAYBE_DoesntHangTest) {
|
| SimpleTest(testUrl(FilePath(
|
| FILE_PATH_LITERAL("transaction_run_forever.html"))));
|
| ui_test_utils::CrashTab(browser()->GetSelectedTabContents());
|
|
|