Create variations param for RapporRollout to non-UMA users.

components/rappor/rappor_service.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/rappor/rappor_service.h"
 
 #include "base/base64.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
@@ skipping 17 matching lines @@
 const int kLogIntervalSeconds = 30 * 60;
 
 const char kMimeType[] = "application/vnd.chrome.rappor";
 
 // Constants for the RAPPOR rollout field trial.
 const char kRapporRolloutFieldTrialName[] = "RapporRollout";
 
 // Constant for the finch parameter name for the server URL
 const char kRapporRolloutServerUrlParam[] = "ServerUrl";
 
+// Constant for the finch parameter name for the server URL
+const char kRapporRolloutRequireUmaParam[] = "RequireUma";
+
 // The rappor server's URL.
 const char kDefaultServerUrl[] = "https://clients4.google.com/rappor";
 
 GURL GetServerUrl() {
   std::string server_url = chrome_variations::GetVariationParamValue(
       kRapporRolloutFieldTrialName,
       kRapporRolloutServerUrlParam);
   if (!server_url.empty())
     return GURL(server_url);
   else
     return GURL(kDefaultServerUrl);
 }
 
 const RapporParameters kRapporParametersForType[NUM_RAPPOR_TYPES] = {
     // ETLD_PLUS_ONE_RAPPOR_TYPE
     {128 /* Num cohorts */,
      16 /* Bloom filter size bytes */,
      2 /* Bloom filter hash count */,
      rappor::PROBABILITY_50 /* Fake data probability */,
      rappor::PROBABILITY_50 /* Fake one probability */,
      rappor::PROBABILITY_75 /* One coin probability */,
      rappor::PROBABILITY_25 /* Zero coin probability */},
 };
 
+bool IsRapporEnabled(const GURL& server_url, bool metrics_enabled) {

[Alexei Svitkine (slow), 2014/07/30 16:52:51]

Can this be part of GetServerUrl() given that already has a way to disable UMA
via returning an invalid URL?

Seems hard to follow if the logic is to split into different places.

[Steven Holte, 2014/08/05 03:09:36]

Done.

+  if (!server_url.is_valid()) {
+    DVLOG(1) << server_url.spec() << " is invalid.";
+    return false;
+  }
+  if (metrics_enabled) {

[Alexei Svitkine (slow), 2014/07/30 16:52:51]

Nit: No {}'s.

[Steven Holte, 2014/08/05 03:09:37]

Done.

+    return true;
+  }
+  return chrome_variations::GetVariationParamValue(

[Alexei Svitkine (slow), 2014/07/30 16:52:51]

Nit: Please rebase, this is now in namespace variations

[Steven Holte, 2014/08/05 03:09:37]

Done.

+      kRapporRolloutFieldTrialName,
+      kRapporRolloutRequireUmaParam) == "False";
+}
+
 }  // namespace
 
 RapporService::RapporService() : cohort_(-1) {}
 
 RapporService::~RapporService() {
   STLDeleteValues(&metrics_map_);
 }
 
 void RapporService::Start(PrefService* pref_service,
-                          net::URLRequestContextGetter* request_context) {
+                          net::URLRequestContextGetter* request_context,
+                          bool metrics_enabled) {
   const GURL server_url = GetServerUrl();
-  if (!server_url.is_valid()) {
-    DVLOG(1) << "RapporService not started: "
-             << server_url.spec() << " is invalid.";
+  if (!IsRapporEnabled(server_url, metrics_enabled)) {
+    DVLOG(1) << "RapporService not started.";
     return;
   }
   DVLOG(1) << "RapporService started. Reporting to " << server_url.spec();
   DCHECK(!uploader_);
   LoadSecret(pref_service);
   LoadCohort(pref_service);
   uploader_.reset(new LogUploader(server_url, kMimeType, request_context));
   log_rotation_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromSeconds(kInitialLogIntervalSeconds),
@@ skipping 117 matching lines @@
     DCHECK_EQ(parameters.ToString(), metric->parameters().ToString());
     return metric;
   }
 
   RapporMetric* new_metric = new RapporMetric(metric_name, parameters, cohort_);
   metrics_map_[metric_name] = new_metric;
   return new_metric;
 }
 
 }  // namespace rappor