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" | 5 #include "base/prefs/pref_service.h" |
6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
7 #include "chrome/browser/prefs/proxy_config_dictionary.h" | 7 #include "chrome/browser/prefs/proxy_config_dictionary.h" |
8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 // will be fetched successfully, resulting in no error. Hence this test | 276 // will be fetched successfully, resulting in no error. Hence this test |
277 // shouldn't run on ChromeOS. | 277 // shouldn't run on ChromeOS. |
278 #if defined(OS_CHROMEOS) | 278 #if defined(OS_CHROMEOS) |
279 #define MAYBE_ProxyEventsInvalidProxy DISABLED_ProxyEventsInvalidProxy | 279 #define MAYBE_ProxyEventsInvalidProxy DISABLED_ProxyEventsInvalidProxy |
280 #else | 280 #else |
281 #define MAYBE_ProxyEventsInvalidProxy ProxyEventsInvalidProxy | 281 #define MAYBE_ProxyEventsInvalidProxy ProxyEventsInvalidProxy |
282 #endif // defined(OS_CHROMEOS) | 282 #endif // defined(OS_CHROMEOS) |
283 | 283 |
284 // Tests error events: invalid proxy | 284 // Tests error events: invalid proxy |
285 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, MAYBE_ProxyEventsInvalidProxy) { | 285 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, MAYBE_ProxyEventsInvalidProxy) { |
286 ASSERT_TRUE(StartTestServer()); | 286 ASSERT_TRUE(StartEmbeddedTestServer()); |
287 ASSERT_TRUE( | 287 ASSERT_TRUE( |
288 RunExtensionSubtest("proxy/events", "invalid_proxy.html")) << message_; | 288 RunExtensionSubtest("proxy/events", "invalid_proxy.html")) << message_; |
289 } | 289 } |
290 | 290 |
291 // Tests error events: PAC script parse error. | 291 // Tests error events: PAC script parse error. |
292 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyEventsParseError) { | 292 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyEventsParseError) { |
293 ASSERT_TRUE( | 293 ASSERT_TRUE( |
294 RunExtensionSubtest("proxy/events", "parse_error.html")) << message_; | 294 RunExtensionSubtest("proxy/events", "parse_error.html")) << message_; |
295 } | 295 } |
296 | 296 |
297 } // namespace extensions | 297 } // namespace extensions |
OLD | NEW |