Put Data Reduction Proxy support in Cronet behind a gyp flag

components/cronet.gypi

Index: components/cronet.gypi
diff --git a/components/cronet.gypi b/components/cronet.gypi
index 01d51ec2418017560d30f33bac1c7c75a2d83711..ed45bc8abe630029b23480721996f675c96e832a 100644
--- a/components/cronet.gypi
+++ b/components/cronet.gypi
@@ -108,20 +108,60 @@
             'DISABLE_FTP_SUPPORT=1',
           ],
           'dependencies': [
-            '../components/components.gyp:data_reduction_proxy_core_browser_small',
             '../net/net.gyp:net_small',
           ],
           'includes': [ 'cronet/cronet_static.gypi' ],
+          'variables': {
+            'enable_data_reduction_proxy_support%' : 0,
+          },
+          'conditions': [
+            # If Data Reduction Proxy support is enabled, add the following
+            # defines, sources, and dependencies.
+            ['enable_data_reduction_proxy_support==1',
+              {
+                'defines' : [
+                  'DATA_REDUCTION_PROXY_SUPPORT'

[mef, 2015/05/13 18:21:24]

would it make sense to have =1?

[bengr, 2015/05/15 00:54:55]

I considered that, but didn't see an advantage.

+                ],
+                'sources': [
+                  'cronet/android/cronet_data_reduction_proxy.cc',
+                  'cronet/android/cronet_data_reduction_proxy.h',
+                ],
+                'dependencies': [
+                  '../components/components.gyp:data_reduction_proxy_core_browser_small',
+                ]
+              }
+            ],
+          ],
         },
         {
           # cronet_static target depends on ICU and includes file and ftp support.
           'target_name': 'cronet_static',
           'dependencies': [
             '../base/base.gyp:base_i18n',
-            '../components/components.gyp:data_reduction_proxy_core_browser',
             '../net/net.gyp:net',
           ],
           'includes': [ 'cronet/cronet_static.gypi' ],
+          'variables': {

[mef, 2015/05/13 18:21:24]

should this whole section (except dependencies) go into 'cronet_static.gypi'?

[bengr, 2015/05/15 00:54:55]

Done.

+            'enable_data_reduction_proxy_support%' : 0,
+          },
+          'conditions': [
+            # If Data Reduction Proxy support is enabled, add the following
+            # defines, sources, and dependencies.
+            ['enable_data_reduction_proxy_support==1',
+              {
+                'defines' : [
+                  'DATA_REDUCTION_PROXY_SUPPORT'
+                ],
+                'sources': [
+                  'cronet/android/cronet_data_reduction_proxy.cc',
+                  'cronet/android/cronet_data_reduction_proxy.h',
+                ],
+                'dependencies': [
+                  '../components/components.gyp:data_reduction_proxy_core_browser',
+                ]
+              }
+            ],
+          ],
         },
         {
           'target_name': 'libcronet',