| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 | 50 |
| 51 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, CursorTest) { | 51 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, CursorTest) { |
| 52 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html")))); | 52 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html")))); |
| 53 } | 53 } |
| 54 | 54 |
| 55 // http://code.google.com/p/chromium/issues/detail?id=70773 | 55 // http://code.google.com/p/chromium/issues/detail?id=70773 |
| 56 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISALBED_IndexTest) { | 56 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISALBED_IndexTest) { |
| 57 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("index_test.html")))); | 57 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("index_test.html")))); |
| 58 } | 58 } |
| 59 | 59 |
| 60 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, KeyPathTest) { | 60 // http://code.google.com/p/chromium/issues/detail?id=70773 |
| 61 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_KeyPathTest) { |
| 61 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html")))); | 62 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html")))); |
| 62 } | 63 } |
| 63 | 64 |
| 64 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionGetTest) { | 65 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, TransactionGetTest) { |
| 65 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_get_test.html")))); | 66 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("transaction_get_test.html")))); |
| 66 } | 67 } |
| 67 | 68 |
| 68 // http://code.google.com/p/chromium/issues/detail?id=70773 | 69 // http://code.google.com/p/chromium/issues/detail?id=70773 |
| 69 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_ObjectStoreTest) { | 70 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_ObjectStoreTest) { |
| 70 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("object_store_test.html")))); | 71 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("object_store_test.html")))); |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 // Make sure we wait until the destructor has run. | 119 // Make sure we wait until the destructor has run. |
| 119 scoped_refptr<ThreadTestHelper> helper( | 120 scoped_refptr<ThreadTestHelper> helper( |
| 120 new ThreadTestHelper(BrowserThread::WEBKIT)); | 121 new ThreadTestHelper(BrowserThread::WEBKIT)); |
| 121 ASSERT_TRUE(helper->Run()); | 122 ASSERT_TRUE(helper->Run()); |
| 122 | 123 |
| 123 // Because we specified https for scheme to be skipped the second file | 124 // Because we specified https for scheme to be skipped the second file |
| 124 // should survive and the first go into vanity. | 125 // should survive and the first go into vanity. |
| 125 ASSERT_FALSE(file_util::PathExists(temp_file_path_1)); | 126 ASSERT_FALSE(file_util::PathExists(temp_file_path_1)); |
| 126 ASSERT_TRUE(file_util::PathExists(temp_file_path_2)); | 127 ASSERT_TRUE(file_util::PathExists(temp_file_path_2)); |
| 127 } | 128 } |
| OLD | NEW |