| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 1221af87201002e5486fa72d6cd7557779cdd68d..a4c9fa6e047d128dd53488f9a0a4bff9d718a9a2 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -562,6 +562,7 @@
|
| 'spdy_proxy_auth_property%' : '',
|
| 'spdy_proxy_auth_value%' : '',
|
| 'data_reduction_proxy_probe_url%' : '',
|
| + 'data_reduction_proxy_warmup_url%' : '',
|
| 'data_reduction_proxy_ssl_origin%' : '',
|
| 'data_reduction_proxy_alt_origin%' : '',
|
| 'data_reduction_proxy_alt_fallback_origin%' : '',
|
| @@ -925,12 +926,14 @@
|
| 'icu_use_data_file_flag%' : 1,
|
| 'spdy_proxy_auth_origin%': '',
|
| 'data_reduction_proxy_probe_url%': '',
|
| + 'data_reduction_proxy_warmup_url%': '',
|
| 'data_reduction_dev_host%': '',
|
| 'data_reduction_fallback_host%': '',
|
| }, {
|
| 'icu_use_data_file_flag%' : 0,
|
| 'spdy_proxy_auth_origin%': 'https://proxy.googlezip.net:443/',
|
| 'data_reduction_proxy_probe_url%': 'http://check.googlezip.net/connect',
|
| + 'data_reduction_proxy_warmup_url%': 'http://www.gstatic.com/generate_204',
|
| 'data_reduction_dev_host%': 'http://proxy-dev.googlezip.net:80/',
|
| 'data_reduction_fallback_host%': 'http://compress.googlezip.net:80/',
|
| }],
|
| @@ -1118,6 +1121,7 @@
|
| '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_warmup_url%': '<(data_reduction_proxy_warmup_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)',
|
| @@ -2749,6 +2753,10 @@
|
| 'defines': [
|
| 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'],
|
| }],
|
| + ['data_reduction_proxy_warmup_url != ""', {
|
| + 'defines': [
|
| + 'DATA_REDUCTION_PROXY_WARMUP_URL="<(data_reduction_proxy_warmup_url)"'],
|
| + }],
|
| ['data_reduction_proxy_ssl_origin != ""', {
|
| 'defines': [
|
| 'DATA_REDUCTION_PROXY_SSL_ORIGIN="<(data_reduction_proxy_ssl_origin)"'],
|
|
|