diff options
| author | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 20:58:03 +0000 |
|---|---|---|
| committer | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 20:58:03 +0000 |
| commit | 98bca37088528b4066dac95c12ec134e1c0aa3b6 (patch) | |
| tree | 36bf3c1719d856c855c4122c175190aa14852292 /chrome/browser/net/spdyproxy | |
| parent | 5475f4ba1c67e7be19663e0add64c245d85e2aae (diff) | |
| download | chromium_src-98bca37088528b4066dac95c12ec134e1c0aa3b6.zip chromium_src-98bca37088528b4066dac95c12ec134e1c0aa3b6.tar.gz chromium_src-98bca37088528b4066dac95c12ec134e1c0aa3b6.tar.bz2 | |
Always initialize data reduction proxy pref member
The settings UI code may check a BooleanPrefMember in DataReductionProxySettings even when the Chrome instance is not part of a field trial that allows it to be used. If the pref member is not initialized, Chrome will Crash.
BUG=309213
Review URL: https://codereview.chromium.org/29363010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/spdyproxy')
| -rw-r--r-- | chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc index 4318d77..f540607 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc @@ -82,12 +82,12 @@ void DataReductionProxySettings::InitPrefMembers() { } void DataReductionProxySettings::InitDataReductionProxySettings() { + InitPrefMembers(); + // Disable the proxy if it is not allowed to be used. if (!IsDataReductionProxyAllowed()) return; - InitPrefMembers(); - AddDefaultProxyBypassRules(); net::NetworkChangeNotifier::AddIPAddressObserver(this); |