Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(534)

Side by Side Diff: chrome/browser/extensions/extension_proxy_apitest.cc

Issue 6541021: Send fatal proxy errors to the network delegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/io_thread.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 286
287 // TODO(jochen): enable once network side has landed. Tests error events. 287 // Tests error events.
288 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, DISABLED_ProxyEvents) { 288 IN_PROC_BROWSER_TEST_F(ProxySettingsApiTest, ProxyEvents) {
289 CommandLine::ForCurrentProcess()->AppendSwitch( 289 CommandLine::ForCurrentProcess()->AppendSwitch(
290 switches::kEnableExperimentalExtensionApis); 290 switches::kEnableExperimentalExtensionApis);
291 291
292 ASSERT_TRUE(RunExtensionTest("proxy/events")) << message_; 292 ASSERT_TRUE(RunExtensionTest("proxy/events")) << message_;
293 } 293 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698