OLD | NEW |
1 // Copyright (c) 2010 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 "chrome/browser/extensions/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
6 #include "chrome/browser/prefs/pref_service.h" | 6 #include "chrome/browser/prefs/pref_service.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 pref_service); | 276 pref_service); |
277 | 277 |
278 // Now check the incognito preferences. | 278 // Now check the incognito preferences. |
279 pref_service = browser()->profile()->GetOffTheRecordProfile()->GetPrefs(); | 279 pref_service = browser()->profile()->GetOffTheRecordProfile()->GetPrefs(); |
280 ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS, | 280 ValidateSettings(ProxyPrefs::MODE_FIXED_SERVERS, |
281 "http=1.1.1.1:80", | 281 "http=1.1.1.1:80", |
282 "localhost,::1,foo.bar,<local>", | 282 "localhost,::1,foo.bar,<local>", |
283 kNoPac, | 283 kNoPac, |
284 pref_service); | 284 pref_service); |
285 } | 285 } |
| 286 |
| 287 // TODO(jochen): enable once network side has landed. Tests error events. |
| 288 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, DISABLED_ProxyEvents) { |
| 289 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 290 switches::kEnableExperimentalExtensionApis); |
| 291 |
| 292 ASSERT_TRUE(RunExtensionTest("proxy/events")) << message_; |
| 293 } |
OLD | NEW |