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

git-svn-id: http://src.chromium.org/svn/trunk/src/build@273810 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
bengr@chromium.org 2014-05-30 13:06:23 +00:00
Родитель 5a19323bcc
Коммит 3a01f2bda9
1 изменённых файлов: 18 добавлений и 0 удалений

Просмотреть файл

@ -550,6 +550,9 @@
'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_alt_origin%' : '',
'data_reduction_proxy_alt_fallback_origin%' : '',
'enable_mdns%' : 0, 'enable_mdns%' : 0,
'enable_service_discovery%': 0, 'enable_service_discovery%': 0,
'enable_wifi_bootstrapping%': 0, 'enable_wifi_bootstrapping%': 0,
@ -1099,6 +1102,9 @@
'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',
'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',
'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)', '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_mdns%' : '<(enable_mdns)',
'enable_service_discovery%' : '<(enable_service_discovery)', 'enable_service_discovery%' : '<(enable_service_discovery)',
'enable_wifi_bootstrapping%': '<(enable_wifi_bootstrapping)', 'enable_wifi_bootstrapping%': '<(enable_wifi_bootstrapping)',
@ -2718,6 +2724,18 @@
'defines': [ 'defines': [
'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'], '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', { ['enable_mdns==1', {
'defines': ['ENABLE_MDNS=1'], 'defines': ['ENABLE_MDNS=1'],
}], }],