Added alternative configuration for the data reduction proxy

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index d8e60f182335a6007d2cea3c3ecede989ec27f01..3d9e51a6a333347f563ed73732c840430a401788 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -551,6 +551,9 @@
       '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%' : '',

[Lei Zhang, 2014/05/21 19:41:28]

I'm a little concerned by the number of gyp variables here. Can you:

- Add some documentation to briefly explain how these work and how they relate?
Surely there aren't 2^9 possible build configs based on these variables, right?

- Add a newline to separate your list of gyp variables from the unrelated
service discovery ones below.

       'enable_mdns%' : 0,
       'enable_service_discovery%': 0,
       'enable_hangout_services_extension%': 0,
@@ -1084,6 +1087,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_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_hangout_services_extension%' : '<(enable_hangout_services_extension)',
@@ -2663,6 +2669,18 @@
         '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'],
       }],