diff options
| author | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 13:44:43 +0000 |
|---|---|---|
| committer | battre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 13:44:43 +0000 |
| commit | d46bc310b61db608ee250f042292364c7bf44656 (patch) | |
| tree | ed8033562cef79f3f750ed7113aed88c4c205607 /build/common.gypi | |
| parent | 8dcaa264e5fa488d2ac287bf63d2376259fdab25 (diff) | |
| download | chromium_src-d46bc310b61db608ee250f042292364c7bf44656.zip chromium_src-d46bc310b61db608ee250f042292364c7bf44656.tar.gz chromium_src-d46bc310b61db608ee250f042292364c7bf44656.tar.bz2 | |
Revert 273810 "Added alternative configuration for the data redu..."
Reverting due to failing tests. See http://crbug.com/370039#c5 for details.
> Added alternative configuration for the data reduction proxy
>
> Added a second configuration that can support two http proxies and one https proxy. In the process, added a new DataReductionProxyParams object to encapsulate static configuration details and made DataReductionSettingsAndroid a BrowserKeyedContextService.
>
> BUG=370039
>
> Review URL: https://codereview.chromium.org/286013002
TBR=bengr@chromium.org
Review URL: https://codereview.chromium.org/307013003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/build/common.gypi b/build/common.gypi index a18f871..0e9cdea 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -550,9 +550,6 @@ 'spdy_proxy_auth_property%' : '', 'spdy_proxy_auth_value%' : '', 'data_reduction_proxy_probe_url%' : '', - 'data_reduction_proxy_ssl_origin%' : '', - 'data_reduction_proxy_alt_origin%' : '', - 'data_reduction_proxy_alt_fallback_origin%' : '', 'enable_mdns%' : 0, 'enable_service_discovery%': 0, 'enable_wifi_bootstrapping%': 0, @@ -1102,9 +1099,6 @@ 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)', - 'data_reduction_proxy_ssl_origin%' : '<(data_reduction_proxy_ssl_origin)', - 'data_reduction_proxy_alt_origin%' : '<(data_reduction_proxy_alt_origin)', - 'data_reduction_proxy_alt_fallback_origin%' : '<(data_reduction_proxy_alt_fallback_origin)', 'enable_mdns%' : '<(enable_mdns)', 'enable_service_discovery%' : '<(enable_service_discovery)', 'enable_wifi_bootstrapping%': '<(enable_wifi_bootstrapping)', @@ -2724,18 +2718,6 @@ 'defines': [ 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'], }], - ['data_reduction_proxy_ssl_origin != ""', { - 'defines': [ - 'DATA_REDUCTION_PROXY_SSL_ORIGIN="<(data_reduction_proxy_ssl_origin)"'], - }], - ['data_reduction_proxy_alt_origin != ""', { - 'defines': [ - 'DATA_REDUCTION_PROXY_ALT_ORIGIN="<(data_reduction_proxy_alt_origin)"'], - }], - ['data_reduction_proxy_alt_fallback_origin != ""', { - 'defines': [ - 'DATA_REDUCTION_PROXY_ALT_FALLBACK_ORIGIN="<(data_reduction_proxy_alt_fallback_origin)"'], - }], ['enable_mdns==1', { 'defines': ['ENABLE_MDNS=1'], }], |