summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorbengr <bengr@chromium.org>2014-09-18 14:47:38 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-18 21:47:48 +0000
commit2989fef8c7173769f4361c5bb55d991fa7c0ac26 (patch)
treee643176ed3fb2c374967028ccaabf68f8eb80718 /components
parent8034e1d4dc0524ef8477e475b771c4b080e6dce2 (diff)
downloadchromium_src-2989fef8c7173769f4361c5bb55d991fa7c0ac26.zip
chromium_src-2989fef8c7173769f4361c5bb55d991fa7c0ac26.tar.gz
chromium_src-2989fef8c7173769f4361c5bb55d991fa7c0ac26.tar.bz2
Added flag to enable the data reduction proxy alternative
This flags has the same effect as being part of the enabled group of the DataCompressionProxyAlternativeConfiguration field trial. BUG=415185 Review URL: https://codereview.chromium.org/578883004 Cr-Commit-Position: refs/heads/master@{#295563}
Diffstat (limited to 'components')
-rw-r--r--components/data_reduction_proxy/browser/data_reduction_proxy_params.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc
index 43d0795a..e42b145 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_params.cc
@@ -37,8 +37,13 @@ bool DataReductionProxyParams::IsIncludedInFieldTrial() {
// static
bool DataReductionProxyParams::IsIncludedInAlternativeFieldTrial() {
- return base::FieldTrialList::FindFullName(
- "DataCompressionProxyAlternativeConfiguration") == kEnabled;
+ const std::string group_name = base::FieldTrialList::FindFullName(
+ "DataCompressionProxyAlternativeConfiguration");
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ data_reduction_proxy::switches::kEnableDataReductionProxyAlt)) {
+ return true;
+ }
+ return group_name == kEnabled;
}
// static