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