OLD | NEW |
1 // Copyright (c) 2009 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 "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
7 #include "chrome/common/chrome_switches.h" | 7 #include "chrome/common/chrome_switches.h" |
| 8 #include "net/base/mock_host_resolver.h" |
8 | 9 |
9 // Flaky, http://crbug.com/26296. | 10 // Flaky, http://crbug.com/26296. |
10 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_History) { | 11 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_History) { |
11 CommandLine::ForCurrentProcess()->AppendSwitch( | 12 CommandLine::ForCurrentProcess()->AppendSwitch( |
12 switches::kEnableExperimentalExtensionApis); | 13 switches::kEnableExperimentalExtensionApis); |
13 | 14 |
14 host_resolver()->AddRule("www.a.com", "127.0.0.1"); | 15 host_resolver()->AddRule("www.a.com", "127.0.0.1"); |
15 host_resolver()->AddRule("www.b.com", "127.0.0.1"); | 16 host_resolver()->AddRule("www.b.com", "127.0.0.1"); |
16 StartHTTPServer(); | 17 StartHTTPServer(); |
17 | 18 |
18 ASSERT_TRUE(RunExtensionTest("history")) << message_; | 19 ASSERT_TRUE(RunExtensionTest("history")) << message_; |
19 } | 20 } |
OLD | NEW |