diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 18:31:03 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 18:31:03 +0000 |
| commit | 004ec925e3f71aeba2acd1461741ccddd92eeedc (patch) | |
| tree | e58efd0fc8f7b2baec92cde9d95fd8617d86d32d /chrome/test/testing_profile.h | |
| parent | 53f4636020e46d0ca54a60b1ecbbdcb677651c80 (diff) | |
| download | chromium_src-004ec925e3f71aeba2acd1461741ccddd92eeedc.zip chromium_src-004ec925e3f71aeba2acd1461741ccddd92eeedc.tar.gz chromium_src-004ec925e3f71aeba2acd1461741ccddd92eeedc.tar.bz2 | |
Revert 78228 - Extended: Add "system" URLRequestContext (not ready for use!)
This is an extension of http://codereview.chromium.org/6280018 that provides a proxy configuration which respects command line parameters and policies
BUG=67232,70732
TEST=Start chrome, observe two PROXY_CONFIG_CHANGED events in about:net-internals (if you are on a corporate network with PAC configurations), observe that everything behaves as usual. In particular the https://www.google.com/searchdomaincheck?format=domain&type=chrome request should not fail as it uses the new system URLRequestContext.
Review URL: http://codereview.chromium.org/6292017
TBR=battre@chromium.org
Review URL: http://codereview.chromium.org/6693023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.h')
| -rw-r--r-- | chrome/test/testing_profile.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index acea619..49063b5 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -255,6 +255,10 @@ class TestingProfile : public Profile { virtual FilePath last_selected_directory(); virtual void set_last_selected_directory(const FilePath& path); #if defined(OS_CHROMEOS) + virtual chromeos::ProxyConfigServiceImpl* + GetChromeOSProxyConfigServiceImpl() { + return NULL; + } virtual void SetupChromeOSEnterpriseExtensionObserver() { } virtual void InitChromeOSPreferences() { |