Index: components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc |
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc |
index 674222127407afd90e5e47ac7eb5d7b180bcd56e..0ecde2eb61a7468a55d40c1a0cc50b15cfd04b61 100644 |
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc |
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_params.cc |
@@ -10,7 +10,6 @@ |
#include "base/command_line.h" |
#include "base/metrics/field_trial.h" |
#include "base/strings/string_number_conversions.h" |
-#include "base/strings/string_piece.h" |
#include "base/strings/string_split.h" |
#include "base/strings/string_util.h" |
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h" |
@@ -61,19 +60,22 @@ const char kServerExperimentsFieldTrial[] = |
namespace data_reduction_proxy { |
namespace params { |
+bool IsIncludedInFieldTrial(const std::string& name) { |
lazyboy
2016/07/11 20:34:54
nit: can put this in anonymous namespace above.
Lei Zhang
2016/07/11 21:01:47
Done.
|
+ return base::StartsWith(FieldTrialList::FindFullName(name), kEnabled, |
+ base::CompareCase::SENSITIVE); |
+} |
+ |
bool IsIncludedInPromoFieldTrial() { |
- return FieldTrialList::FindFullName("DataCompressionProxyPromoVisibility") |
- .find(kEnabled) == 0; |
+ return IsIncludedInFieldTrial("DataCompressionProxyPromoVisibility"); |
} |
bool IsIncludedInHoldbackFieldTrial() { |
- return FieldTrialList::FindFullName("DataCompressionProxyHoldback") |
- .find(kEnabled) == 0; |
+ return IsIncludedInFieldTrial("DataCompressionProxyHoldback"); |
} |
-bool IsIncludedInAndroidOnePromoFieldTrial(const char* build_fingerprint) { |
- base::StringPiece fingerprint(build_fingerprint); |
- return (fingerprint.find(kAndroidOneIdentifier) != std::string::npos); |
+bool IsIncludedInAndroidOnePromoFieldTrial( |
+ base::StringPiece build_fingerprint) { |
+ return build_fingerprint.find(kAndroidOneIdentifier) != std::string::npos; |
} |
const char* GetTrustedSpdyProxyFieldTrialName() { |
@@ -81,8 +83,7 @@ const char* GetTrustedSpdyProxyFieldTrialName() { |
} |
bool IsIncludedInTrustedSpdyProxyFieldTrial() { |
- return base::FieldTrialList::FindFullName(GetTrustedSpdyProxyFieldTrialName()) |
- .find(kEnabled) == 0; |
+ return IsIncludedInFieldTrial(GetTrustedSpdyProxyFieldTrialName()); |
} |
const char* GetLoFiFieldTrialName() { |
@@ -120,8 +121,9 @@ bool IsIncludedInServerExperimentsFieldTrial() { |
} |
bool IsIncludedInTamperDetectionExperiment() { |
return IsIncludedInServerExperimentsFieldTrial() && |
- FieldTrialList::FindFullName(kServerExperimentsFieldTrial) |
- .find("TamperDetection_Enabled") == 0; |
+ base::StartsWith( |
+ FieldTrialList::FindFullName(kServerExperimentsFieldTrial), |
+ "TamperDetection_Enabled", base::CompareCase::SENSITIVE); |
} |
bool IsLoFiOnViaFlags() { |
@@ -181,7 +183,7 @@ bool WarnIfNoDataReductionProxy() { |
} |
bool IsIncludedInQuicFieldTrial() { |
- return FieldTrialList::FindFullName(kQuicFieldTrial).find(kEnabled) == 0; |
+ return IsIncludedInFieldTrial(kQuicFieldTrial); |
} |
const char* GetQuicFieldTrialName() { |