OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/base_switches.h" | 5 #include "base/base_switches.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
8 #include "net/base/mock_host_resolver.h" | 8 #include "net/base/mock_host_resolver.h" |
9 | 9 |
10 class HistoryExtensionApiTest : public ExtensionApiTest { | 10 class HistoryExtensionApiTest : public ExtensionApiTest { |
(...skipping 11 matching lines...) Expand all Loading... |
22 // Full text search indexing sometimes exceeds a timeout. | 22 // Full text search indexing sometimes exceeds a timeout. |
23 // Fix this as part of crbug/76170. | 23 // Fix this as part of crbug/76170. |
24 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, DISABLED_MiscSearch) { | 24 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, DISABLED_MiscSearch) { |
25 ASSERT_TRUE(RunExtensionSubtest("history", "misc_search.html")) << message_; | 25 ASSERT_TRUE(RunExtensionSubtest("history", "misc_search.html")) << message_; |
26 } | 26 } |
27 | 27 |
28 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, TimedSearch) { | 28 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, TimedSearch) { |
29 ASSERT_TRUE(RunExtensionSubtest("history", "timed_search.html")) << message_; | 29 ASSERT_TRUE(RunExtensionSubtest("history", "timed_search.html")) << message_; |
30 } | 30 } |
31 | 31 |
32 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, Delete) { | 32 #if defined(OS_WIN) |
| 33 // Flaky on Windows: crbug.com/88318 |
| 34 #define MAYBE_Delete DISABLED_Delete |
| 35 #else |
| 36 #define MAYBE_Delete Delete |
| 37 #endif |
| 38 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, MAYBE_Delete) { |
33 ASSERT_TRUE(RunExtensionSubtest("history", "delete.html")) << message_; | 39 ASSERT_TRUE(RunExtensionSubtest("history", "delete.html")) << message_; |
34 } | 40 } |
35 | 41 |
36 // See crbug.com/79074 | 42 // See crbug.com/79074 |
37 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, DISABLED_GetVisits) { | 43 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, DISABLED_GetVisits) { |
38 ASSERT_TRUE(RunExtensionSubtest("history", "get_visits.html")) << message_; | 44 ASSERT_TRUE(RunExtensionSubtest("history", "get_visits.html")) << message_; |
39 } | 45 } |
40 | 46 |
41 #if defined(OS_WIN) | 47 #if defined(OS_WIN) |
42 // Searching for a URL right after adding it fails on win XP. | 48 // Searching for a URL right after adding it fails on win XP. |
43 // Fix this as part of crbug/76170. | 49 // Fix this as part of crbug/76170. |
44 #define MAYBE_SearchAfterAdd DISABLED_SearchAfterAdd | 50 #define MAYBE_SearchAfterAdd DISABLED_SearchAfterAdd |
45 #else | 51 #else |
46 #define MAYBE_SearchAfterAdd SearchAfterAdd | 52 #define MAYBE_SearchAfterAdd SearchAfterAdd |
47 #endif | 53 #endif |
48 | 54 |
49 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, MAYBE_SearchAfterAdd) { | 55 IN_PROC_BROWSER_TEST_F(HistoryExtensionApiTest, MAYBE_SearchAfterAdd) { |
50 ASSERT_TRUE(RunExtensionSubtest("history", "search_after_add.html")) | 56 ASSERT_TRUE(RunExtensionSubtest("history", "search_after_add.html")) |
51 << message_; | 57 << message_; |
52 } | 58 } |
OLD | NEW |