| 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/ref_counted.h" | 7 #include "base/ref_counted.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/browser/browser.h" | 9 #include "chrome/browser/browser.h" |
| 10 #include "chrome/browser/tab_contents/tab_contents.h" | 10 #include "chrome/browser/tab_contents/tab_contents.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( | 45 ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( |
| 46 browser(), test_url, 2); | 46 browser(), test_url, 2); |
| 47 std::string result = browser()->GetSelectedTabContents()->GetURL().ref(); | 47 std::string result = browser()->GetSelectedTabContents()->GetURL().ref(); |
| 48 if (result != "pass") { | 48 if (result != "pass") { |
| 49 std::string js_result = GetTestLog(); | 49 std::string js_result = GetTestLog(); |
| 50 FAIL() << "Failed: " << js_result; | 50 FAIL() << "Failed: " << js_result; |
| 51 } | 51 } |
| 52 } | 52 } |
| 53 }; | 53 }; |
| 54 | 54 |
| 55 // Fails after WebKit roll 67957:68016, http://crbug.com/56509 | 55 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, CursorTest) { |
| 56 #if defined(OS_LINUX) | |
| 57 #define MAYBE_CursorTest FAILS_CursorTest | |
| 58 #define MAYBE_IndexTest FAILS_IndexTest | |
| 59 #define MAYBE_KeyPathTest FAILS_KeyPathTest | |
| 60 #else | |
| 61 #define MAYBE_CursorTest CursorTest | |
| 62 #define MAYBE_IndexTest IndexTest | |
| 63 #define MAYBE_KeyPathTest KeyPathTest | |
| 64 #endif | |
| 65 | |
| 66 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, MAYBE_CursorTest) { | |
| 67 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html")))); | 56 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("cursor_test.html")))); |
| 68 } | 57 } |
| 69 | 58 |
| 70 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, MAYBE_IndexTest) { | 59 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, IndexTest) { |
| 71 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("index_test.html")))); | 60 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("index_test.html")))); |
| 72 } | 61 } |
| 73 | 62 |
| 74 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, MAYBE_KeyPathTest) { | 63 IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, KeyPathTest) { |
| 75 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html")))); | 64 SimpleTest(testUrl(FilePath(FILE_PATH_LITERAL("key_path_test.html")))); |
| 76 } | 65 } |
| OLD | NEW |