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/prefs/pref_service.h" | |
6 #include "build/build_config.h" | 5 #include "build/build_config.h" |
7 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
8 #include "chrome/browser/extensions/extension_util.h" | 7 #include "chrome/browser/extensions/extension_util.h" |
9 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
11 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| 11 #include "components/prefs/pref_service.h" |
12 #include "components/proxy_config/proxy_config_dictionary.h" | 12 #include "components/proxy_config/proxy_config_dictionary.h" |
13 #include "components/proxy_config/proxy_config_pref_names.h" | 13 #include "components/proxy_config/proxy_config_pref_names.h" |
14 #include "extensions/common/extension.h" | 14 #include "extensions/common/extension.h" |
15 #include "extensions/test/result_catcher.h" | 15 #include "extensions/test/result_catcher.h" |
16 | 16 |
17 namespace extensions { | 17 namespace extensions { |
18 | 18 |
19 namespace { | 19 namespace { |
20 | 20 |
21 const char kNoServer[] = ""; | 21 const char kNoServer[] = ""; |
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 RunExtensionSubtest("proxy/events", "invalid_proxy.html")) << message_; | 325 RunExtensionSubtest("proxy/events", "invalid_proxy.html")) << message_; |
326 } | 326 } |
327 | 327 |
328 // Tests error events: PAC script parse error. | 328 // Tests error events: PAC script parse error. |
329 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyEventsParseError) { | 329 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyEventsParseError) { |
330 ASSERT_TRUE( | 330 ASSERT_TRUE( |
331 RunExtensionSubtest("proxy/events", "parse_error.html")) << message_; | 331 RunExtensionSubtest("proxy/events", "parse_error.html")) << message_; |
332 } | 332 } |
333 | 333 |
334 } // namespace extensions | 334 } // namespace extensions |
OLD | NEW |