| Index: chrome/browser/in_process_webkit/indexed_db_browsertest.cc
|
| diff --git a/chrome/browser/in_process_webkit/indexed_db_browsertest.cc b/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
|
| index 3454ed074f2069a8042db62b27a1a0b03e7069d6..1e3a4645f71d7593d4227f128b79c15da813ab33 100644
|
| --- a/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
|
| +++ b/chrome/browser/in_process_webkit/indexed_db_browsertest.cc
|
| @@ -52,20 +52,11 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, CursorTest) {
|
| SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html"))));
|
| }
|
|
|
| -// Flaky. See http://crbug.com/70643.
|
| -IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_IndexTest) {
|
| +IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, IndexTest) {
|
| SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("index_test.html"))));
|
| }
|
|
|
| -// Flaky on windows, see http://crbug.com/67422 and http://crbug.com/69293.
|
| -//#if defined(OS_WIN)
|
| -//#define MAYBE_KeyPathTest FLAKY_KeyPathTest
|
| -//#else
|
| -//#define MAYBE_KeyPathTest KeyPathTest
|
| -//#endif
|
| -
|
| -// Disabled per http://trac.webkit.org/changeset/76531. See http://crbug.com/70665.
|
| -IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_KeyPathTest) {
|
| +IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, KeyPathTest) {
|
| SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html"))));
|
| }
|
|
|
| @@ -73,8 +64,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionGetTest) {
|
| SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_get_test.html"))));
|
| }
|
|
|
| -// Flaky. See http://crbug.com/70643.
|
| -IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, FLAKY_ObjectStoreTest) {
|
| +IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ObjectStoreTest) {
|
| SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("object_store_test.html"))));
|
| }
|
|
|
| @@ -82,13 +72,11 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DatabaseTest) {
|
| SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("database_test.html"))));
|
| }
|
|
|
| -// Flaky. See http://crbug.com/70643 and http://crbug.com/70665.
|
| -IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_TransactionTest) {
|
| +IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionTest) {
|
| SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html"))));
|
| }
|
|
|
| -// Flaky. See http://crbug.com/70643 and http://crbug.com/70665.
|
| -IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_DoesntHangTest) {
|
| +IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DoesntHangTest) {
|
| SimpleTest(testUrl(FilePath(
|
| FILE_PATH_LITERAL("transaction_run_forever.html"))));
|
| ui_test_utils::CrashTab(browser()->GetSelectedTabContents());
|
|
|