build/common.gypi - Issue 549153003: Dev finch trial of the data reduction proxy overrides both the primary and the fallback hosts

Unified Diff: build/common.gypi

Issue 549153003: Dev finch trial of the data reduction proxy overrides both the primary and the fallback hosts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: updated tests. Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler_unittest.cc » ('j') | components/data_reduction_proxy/browser/data_reduction_proxy_params.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index c605039d8330c9dc20dab8625c4125c1e2c2e1b1..e76de920562823b65c78206ada3b8f1c83729db7 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -601,6 +601,7 @@

'data_reduction_fallback_host%' : '',

'data_reduction_dev_host%' : '',

+ 'data_reduction_dev_fallback_host%' : '',

'spdy_proxy_auth_origin%' : '',

'spdy_proxy_auth_property%' : '',

'spdy_proxy_auth_value%' : '',

@@ -967,13 +968,15 @@

'data_reduction_proxy_probe_url%': '',

'data_reduction_proxy_warmup_url%': '',

'data_reduction_dev_host%': '',

+ 'data_reduction_dev_fallback_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_dev_host%': 'https://proxy-dev.googlezip.net:443/',

bengr 2014/09/09 19:17:56 Please coordinate with kundaji@ as he's updating h

Not at Google. Contact bengr 2014/09/09 19:41:41 Thanks for letting me know. I'll update the all-pl

+ 'data_reduction_dev_fallback_host%': 'http://proxy-dev.googlezip.net:80/',

'data_reduction_fallback_host%': 'http://compress.googlezip.net:80/',

}],

['OS=="win" or OS=="mac"', {

@@ -1176,6 +1179,7 @@

'native_memory_pressure_signals%': '<(native_memory_pressure_signals)',

'data_reduction_fallback_host%': '<(data_reduction_fallback_host)',

'data_reduction_dev_host%': '<(data_reduction_dev_host)',

+ 'data_reduction_dev_fallback_host%': '<(data_reduction_dev_fallback_host)',

'spdy_proxy_auth_origin%': '<(spdy_proxy_auth_origin)',

'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)',

'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)',

@@ -2891,6 +2895,10 @@

'defines': [

'DATA_REDUCTION_DEV_HOST="<(data_reduction_dev_host)"'],

}],

+ ['data_reduction_dev_fallback_host != ""', {

+ 'defines': [

+ 'DATA_REDUCTION_DEV_FALLBACK_HOST="<(data_reduction_dev_fallback_host)"'],

+ }],

['spdy_proxy_auth_origin != ""', {

'defines': ['SPDY_PROXY_AUTH_ORIGIN="<(spdy_proxy_auth_origin)"'],

}],