Chromium Code Reviews| 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 c2067f84a88617bddd9acff4b69a5e099b04843f..38e215a21a0bf1160056f3fe97491361337079f1 100644 |
| --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc |
| +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc |
| @@ -258,8 +258,15 @@ 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) |
|
bengr
2013/12/19 23:11:15
Add curly braces.
bolian
2013/12/19 23:35:26
Done.
|
| + return DATA_REDUCTION_DEV_HOST; |
| +#endif |
| #if defined(SPDY_PROXY_AUTH_ORIGIN) |
| return SPDY_PROXY_AUTH_ORIGIN; |
| #else |