diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:20:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:28:57 +0000 |
| commit | d17ea114e5ef69ad5d5d7413280a13e6428098aa (patch) | |
| tree | 2c01a75df69f30d27b1432467cfe7c1467a498da /chromium/net/proxy_resolution/proxy_config.cc | |
| parent | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (diff) | |
| download | qtwebengine-chromium-d17ea114e5ef69ad5d5d7413280a13e6428098aa.tar.gz | |
BASELINE: Update Chromium to 67.0.3396.47
Change-Id: Idcb1341782e417561a2473eeecc82642dafda5b7
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/net/proxy_resolution/proxy_config.cc')
| -rw-r--r-- | chromium/net/proxy_resolution/proxy_config.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/chromium/net/proxy_resolution/proxy_config.cc b/chromium/net/proxy_resolution/proxy_config.cc index f33bab69fdf..7c5c189f6c3 100644 --- a/chromium/net/proxy_resolution/proxy_config.cc +++ b/chromium/net/proxy_resolution/proxy_config.cc @@ -190,10 +190,7 @@ const ProxyList* ProxyConfig::ProxyRules::GetProxyListForWebSocketScheme() return NULL; } -ProxyConfig::ProxyConfig() - : auto_detect_(false), - pac_mandatory_(false), - source_(PROXY_CONFIG_SOURCE_UNKNOWN) {} +ProxyConfig::ProxyConfig() : auto_detect_(false), pac_mandatory_(false) {} ProxyConfig::ProxyConfig(const ProxyConfig& config) = default; @@ -272,10 +269,7 @@ std::unique_ptr<base::DictionaryValue> ProxyConfig::ToValue() const { } } - // Output the source. - dict->SetString("source", ProxyConfigSourceToString(source_)); - return dict; } -} // namespace net +} // namespace net
\ No newline at end of file |