| Index: chrome/browser/domain_reliability/service_factory.cc
|
| diff --git a/chrome/browser/domain_reliability/service_factory.cc b/chrome/browser/domain_reliability/service_factory.cc
|
| index 0bea9ed81e4850a845bb76ba5febc0cd66942061..e4c1442a599ec760bb398f649644259931e619bd 100644
|
| --- a/chrome/browser/domain_reliability/service_factory.cc
|
| +++ b/chrome/browser/domain_reliability/service_factory.cc
|
| @@ -18,8 +18,15 @@ namespace domain_reliability {
|
|
|
| namespace {
|
|
|
| +// If Domain Reliability is enabled in the absence of a flag or field trial.
|
| +const bool kDefaultEnabled = true;
|
| +
|
| +// The name and value of the field trial to turn Domain Reliability on.
|
| +const char* kFieldTrialName = "DomRel-Enable";
|
| +const char* kFieldTrialValueEnable = "enable";
|
| +
|
| // Identifies Chrome as the source of Domain Reliability uploads it sends.
|
| -const char* kDomainReliabilityUploadReporterString = "chrome";
|
| +const char* kUploadReporterString = "chrome";
|
|
|
| bool IsDomainReliabilityMonitoringEnabled() {
|
| base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
| @@ -27,7 +34,13 @@ bool IsDomainReliabilityMonitoringEnabled() {
|
| return false;
|
| if (command_line->HasSwitch(switches::kEnableDomainReliability))
|
| return true;
|
| - return base::FieldTrialList::FindFullName("DomRel-Enable") == "enable";
|
| +
|
| + if (base::FieldTrialList::TrialExists(kFieldTrialName)) {
|
| + std::string value = base::FieldTrialList::FindFullName(kFieldTrialName);
|
| + return value == kFieldTrialValueEnable;
|
| + }
|
| +
|
| + return kDefaultEnabled;
|
| }
|
|
|
| } // namespace
|
| @@ -64,8 +77,7 @@ KeyedService* DomainReliabilityServiceFactory::BuildServiceInstanceFor(
|
| return NULL;
|
| }
|
|
|
| - return DomainReliabilityService::Create(
|
| - kDomainReliabilityUploadReporterString);
|
| + return DomainReliabilityService::Create(kUploadReporterString);
|
| }
|
|
|
| } // namespace domain_reliability
|
|
|