Index: chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc |
diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc |
index d6a97a9e92562968e73dbb8bca63ee05754a6ac2..6e0342bd3c9a234f3b8a92ce087cb4663d22dc39 100644 |
--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc |
+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc |
@@ -229,8 +229,16 @@ bool DataReductionProxySettings::WasFetchedViaProxy( |
// static |
std::string DataReductionProxySettings::GetDataReductionProxyOrigin() { |
const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
+ if (command_line.HasSwitch(switches::kSpdyProxyDevAuthOrigin)) |
+ return command_line.GetSwitchValueASCII(switches::kSpdyProxyDevAuthOrigin); |
if (command_line.HasSwitch(switches::kSpdyProxyAuthOrigin)) |
return command_line.GetSwitchValueASCII(switches::kSpdyProxyAuthOrigin); |
+#if defined(DATA_REDUCTION_DEV_HOST) |
+ if (FieldTrialList::FindFullName("DataCompressionProxyDevRollout") == |
+ kEnabled) { |
+ return DATA_REDUCTION_DEV_HOST; |
+ } |
+#endif |
#if defined(SPDY_PROXY_AUTH_ORIGIN) |
return SPDY_PROXY_AUTH_ORIGIN; |
#else |