| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/file_path.h" | 6 #include "base/file_path.h" |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/ref_counted.h" | 8 #include "base/ref_counted.h" |
| 9 #include "base/scoped_temp_dir.h" | 9 #include "base/scoped_temp_dir.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 } | 71 } |
| 72 | 72 |
| 73 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DatabaseTest) { | 73 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DatabaseTest) { |
| 74 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("database_test.html")))); | 74 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("database_test.html")))); |
| 75 } | 75 } |
| 76 | 76 |
| 77 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionTest) { | 77 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionTest) { |
| 78 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); | 78 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); |
| 79 } | 79 } |
| 80 | 80 |
| 81 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DoesntHangTest) { | 81 // Crashy, http://crbug.com/66394. |
| 82 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_DoesntHangTest) { |
| 82 SimpleTest(testUrl(FilePath( | 83 SimpleTest(testUrl(FilePath( |
| 83 FILE_PATH_LITERAL("transaction_run_forever.html")))); | 84 FILE_PATH_LITERAL("transaction_run_forever.html")))); |
| 84 ui_test_utils::CrashTab(browser()->GetSelectedTabContents()); | 85 ui_test_utils::CrashTab(browser()->GetSelectedTabContents()); |
| 85 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); | 86 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); |
| 86 } | 87 } |
| 87 | 88 |
| 88 // In proc browser test is needed here because ClearLocalState indirectly calls | 89 // In proc browser test is needed here because ClearLocalState indirectly calls |
| 89 // WebKit's isMainThread through WebSecurityOrigin->SecurityOrigin. | 90 // WebKit's isMainThread through WebSecurityOrigin->SecurityOrigin. |
| 90 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ClearLocalState) { | 91 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ClearLocalState) { |
| 91 // Create test files. | 92 // Create test files. |
| (...skipping 24 matching lines...) Expand all Loading... |
| 116 // Make sure we wait until the destructor has run. | 117 // Make sure we wait until the destructor has run. |
| 117 scoped_refptr<ThreadTestHelper> helper( | 118 scoped_refptr<ThreadTestHelper> helper( |
| 118 new ThreadTestHelper(BrowserThread::WEBKIT)); | 119 new ThreadTestHelper(BrowserThread::WEBKIT)); |
| 119 ASSERT_TRUE(helper->Run()); | 120 ASSERT_TRUE(helper->Run()); |
| 120 | 121 |
| 121 // Because we specified https for scheme to be skipped the second file | 122 // Because we specified https for scheme to be skipped the second file |
| 122 // should survive and the first go into vanity. | 123 // should survive and the first go into vanity. |
| 123 ASSERT_FALSE(file_util::PathExists(temp_file_path_1)); | 124 ASSERT_FALSE(file_util::PathExists(temp_file_path_1)); |
| 124 ASSERT_TRUE(file_util::PathExists(temp_file_path_2)); | 125 ASSERT_TRUE(file_util::PathExists(temp_file_path_2)); |
| 125 } | 126 } |
| OLD | NEW |