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 "build/build_config.h" | 7 #include "build/build_config.h" |
8 #include "chrome/browser/extensions/extension_apitest.h" | 8 #include "chrome/browser/extensions/extension_apitest.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
11 #include "components/prefs/pref_service.h" | 11 #include "components/prefs/pref_service.h" |
12 #include "net/dns/mock_host_resolver.h" | 12 #include "net/dns/mock_host_resolver.h" |
13 | 13 |
14 namespace extensions { | 14 namespace extensions { |
15 | 15 |
16 class HistoryApiTest : public ExtensionApiTest { | 16 class HistoryApiTest : public ExtensionApiTest { |
17 public: | 17 public: |
18 void SetUpInProcessBrowserTestFixture() override { | 18 void SetUpOnMainThread() override { |
19 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); | 19 ExtensionApiTest::SetUpOnMainThread(); |
20 | 20 |
21 host_resolver()->AddRule("www.a.com", "127.0.0.1"); | 21 host_resolver()->AddRule("www.a.com", "127.0.0.1"); |
22 host_resolver()->AddRule("www.b.com", "127.0.0.1"); | 22 host_resolver()->AddRule("www.b.com", "127.0.0.1"); |
23 } | 23 } |
24 }; | 24 }; |
25 | 25 |
26 // Full text search indexing sometimes exceeds a timeout. (http://crbug/119505) | 26 // Full text search indexing sometimes exceeds a timeout. (http://crbug/119505) |
27 IN_PROC_BROWSER_TEST_F(HistoryApiTest, DISABLED_MiscSearch) { | 27 IN_PROC_BROWSER_TEST_F(HistoryApiTest, DISABLED_MiscSearch) { |
28 ASSERT_TRUE(StartEmbeddedTestServer()); | 28 ASSERT_TRUE(StartEmbeddedTestServer()); |
29 ASSERT_TRUE(RunExtensionSubtest("history", "misc_search.html")) << message_; | 29 ASSERT_TRUE(RunExtensionSubtest("history", "misc_search.html")) << message_; |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 #define MAYBE_SearchAfterAdd SearchAfterAdd | 68 #define MAYBE_SearchAfterAdd SearchAfterAdd |
69 #endif | 69 #endif |
70 | 70 |
71 IN_PROC_BROWSER_TEST_F(HistoryApiTest, MAYBE_SearchAfterAdd) { | 71 IN_PROC_BROWSER_TEST_F(HistoryApiTest, MAYBE_SearchAfterAdd) { |
72 ASSERT_TRUE(StartEmbeddedTestServer()); | 72 ASSERT_TRUE(StartEmbeddedTestServer()); |
73 ASSERT_TRUE(RunExtensionSubtest("history", "search_after_add.html")) | 73 ASSERT_TRUE(RunExtensionSubtest("history", "search_after_add.html")) |
74 << message_; | 74 << message_; |
75 } | 75 } |
76 | 76 |
77 } // namespace extensions | 77 } // namespace extensions |
OLD | NEW |