Update makefiles after merge of Chromium at 278252
This commit was generated by merge_from_chromium.py.
Change-Id: I2e09453759ef2a9b23eb8b2cf0d92f70acc3ea89
diff --git a/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk b/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk
index a8536e9..f8bd51d 100644
--- a/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk
+++ b/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk
@@ -87,6 +87,7 @@
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \
@@ -192,6 +193,7 @@
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DWEBRTC_RESTRICT_LOGGING' \
'-DWEBRTC_MODULE_UTILITY_VIDEO' \