Pass RapporService to content/browser/

components/rappor/public/rappor_parameters.h

 // 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.
 
 #ifndef COMPONENTS_RAPPOR_RAPPOR_PARAMETERS_H_
 #define COMPONENTS_RAPPOR_RAPPOR_PARAMETERS_H_

[ncarter (slow), 2016/12/01 22:33:32]

Update this guard (PSA: when moving files around, use scripts like:
https://cs.chromium.org/chromium/src/tools/git/move_source_file.py , they take
care of this)

[Navid Zolghadr, 2016/12/02 20:47:35]

Oops. I wish I knew this before. Thanks for letting me know. I'll keep this in
mind. I fixed it manually this time.

 
 #include <string>
 
 namespace rappor {
 
 // Levels of noise added to a sample.
 enum NoiseLevel {
   NO_NOISE = 0,
   NORMAL_NOISE,
   SPARSE_NOISE,
@@ skipping 16 matching lines @@
   // Type for low-frequency metrics from SafeBrowsing users.
   LOW_FREQUENCY_SAFEBROWSING_RAPPOR_TYPE,
   // Type for low-frequency metrics from UMA opt-in users. Do not use for new
   // metrics.
   LOW_FREQUENCY_ETLD_PLUS_ONE_RAPPOR_TYPE,
   NUM_RAPPOR_TYPES,
   COARSE_RAPPOR_TYPE = SAFEBROWSING_RAPPOR_TYPE,
 };
 
 enum Probability {
-  PROBABILITY_100,   // 100%
-  PROBABILITY_75,    // 75%
-  PROBABILITY_50,    // 50%
-  PROBABILITY_25,    // 25%
-  PROBABILITY_0,     // 0%
+  PROBABILITY_100,  // 100%
+  PROBABILITY_75,   // 75%
+  PROBABILITY_50,   // 50%
+  PROBABILITY_25,   // 25%
+  PROBABILITY_0,    // 0%
 };
 
-
 // A metric is reported when its reporting group is in the set of groups
 // passed in to RapporService::Start()
 enum RecordingGroup {
   // Metrics for UMA users.
   UMA_RAPPOR_GROUP = 1 << 0,
   // Metrics related to SafeBrowsing, for SafeBrowsing users.
   SAFEBROWSING_RAPPOR_GROUP = 1 << 1,
 };
 
-
 // An object describing noise probabilities for a noise level
 struct NoiseParameters {
   // The probability that a bit will be redacted with fake data. This
   // corresponds to the F privacy parameter.
   Probability fake_prob;
   // The probability that a fake bit will be a one.
   Probability fake_one_prob;
   // The probability that a one bit in the redacted data reports as one. This
   // corresponds to the Q privacy parameter
   Probability one_coin_prob;
@@ skipping 28 matching lines @@
 
   // The reporting level this metric is reported at.
   RecordingGroup recording_group;
 };
 
 namespace internal {
 
 const NoiseParameters kNoiseParametersForLevel[NUM_NOISE_LEVELS] = {
     // NO_NOISE
     {
-     rappor::PROBABILITY_0 /* Fake data probability */,
-     rappor::PROBABILITY_0 /* Fake one probability */,
-     rappor::PROBABILITY_100 /* One coin probability */,
-     rappor::PROBABILITY_0 /* Zero coin probability */,
+        rappor::PROBABILITY_0 /* Fake data probability */,
+        rappor::PROBABILITY_0 /* Fake one probability */,
+        rappor::PROBABILITY_100 /* One coin probability */,
+        rappor::PROBABILITY_0 /* Zero coin probability */,
     },
     // NORMAL_NOISE
     {
-     rappor::PROBABILITY_50 /* Fake data probability */,
-     rappor::PROBABILITY_50 /* Fake one probability */,
-     rappor::PROBABILITY_75 /* One coin probability */,
-     rappor::PROBABILITY_25 /* Zero coin probability */,
+        rappor::PROBABILITY_50 /* Fake data probability */,
+        rappor::PROBABILITY_50 /* Fake one probability */,
+        rappor::PROBABILITY_75 /* One coin probability */,
+        rappor::PROBABILITY_25 /* Zero coin probability */,
     },
     // SPARSE_NOISE
     {
-     rappor::PROBABILITY_25 /* Fake data probability */,
-     rappor::PROBABILITY_50 /* Fake one probability */,
-     rappor::PROBABILITY_75 /* One coin probability */,
-     rappor::PROBABILITY_25 /* Zero coin probability */,
+        rappor::PROBABILITY_25 /* Fake data probability */,
+        rappor::PROBABILITY_50 /* Fake one probability */,
+        rappor::PROBABILITY_75 /* One coin probability */,
+        rappor::PROBABILITY_25 /* Zero coin probability */,
     },
 };
 
 const RapporParameters kRapporParametersForType[NUM_RAPPOR_TYPES] = {
     // UMA_RAPPOR_TYPE
-    {128 /* Num cohorts */,
-     4 /* Bloom filter size bytes */,
-     2 /* Bloom filter hash count */,
-     rappor::NORMAL_NOISE /* Noise level */,
+    {128 /* Num cohorts */, 4 /* Bloom filter size bytes */,

[ncarter (slow), 2016/12/01 22:33:32]

totally optional: if you want to preserve the old one-per-line formatting,
clang-format is happy with this:

    // UMA_RAPPOR_TYPE
    {
        128,                   // Num cohorts
        4,                     // Bloom filter size bytes
        2,                     // Bloom filter hash count
        rappor::NORMAL_NOISE,  // Noise level
        UMA_RAPPOR_GROUP,      // Recording group
    },

[Navid Zolghadr, 2016/12/02 20:47:35]

I guess git cl format made it like this. I changed it back to what it was. It
looked better before.

+     2 /* Bloom filter hash count */, rappor::NORMAL_NOISE /* Noise level */,
      UMA_RAPPOR_GROUP /* Recording group */},
     // SAFEBROWSING_RAPPOR_TYPE
-    {128 /* Num cohorts */,
-     1 /* Bloom filter size bytes */,
-     2 /* Bloom filter hash count */,
-     rappor::NORMAL_NOISE /* Noise level */,
+    {128 /* Num cohorts */, 1 /* Bloom filter size bytes */,
+     2 /* Bloom filter hash count */, rappor::NORMAL_NOISE /* Noise level */,
      SAFEBROWSING_RAPPOR_GROUP /* Recording group */},
     // ETLD_PLUS_ONE_RAPPOR_TYPE
-    {128 /* Num cohorts */,
-     16 /* Bloom filter size bytes */,
-     2 /* Bloom filter hash count */,
-     rappor::NORMAL_NOISE /* Noise level */,
+    {128 /* Num cohorts */, 16 /* Bloom filter size bytes */,
+     2 /* Bloom filter hash count */, rappor::NORMAL_NOISE /* Noise level */,
      UMA_RAPPOR_GROUP /* Recording group */},
     // LOW_FREQUENCY_UMA_RAPPOR_TYPE
-    {128 /* Num cohorts */,
-     4 /* Bloom filter size bytes */,
-     2 /* Bloom filter hash count */,
-     rappor::SPARSE_NOISE /* Noise level */,
+    {128 /* Num cohorts */, 4 /* Bloom filter size bytes */,
+     2 /* Bloom filter hash count */, rappor::SPARSE_NOISE /* Noise level */,
      UMA_RAPPOR_GROUP /* Recording group */},
     // LOW_FREQUENCY_SAFEBROWSING_RAPPOR_TYPE
-    {128 /* Num cohorts */,
-     1 /* Bloom filter size bytes */,
-     2 /* Bloom filter hash count */,
-     rappor::SPARSE_NOISE /* Noise level */,
+    {128 /* Num cohorts */, 1 /* Bloom filter size bytes */,
+     2 /* Bloom filter hash count */, rappor::SPARSE_NOISE /* Noise level */,
      SAFEBROWSING_RAPPOR_GROUP /* Recording group */},
     // LOW_FREQUENCY_ETLD_PLUS_ONE_RAPPOR_TYPE
-    {128 /* Num cohorts */,
-     16 /* Bloom filter size bytes */,
-     2 /* Bloom filter hash count */,
-     rappor::SPARSE_NOISE /* Noise level */,
+    {128 /* Num cohorts */, 16 /* Bloom filter size bytes */,
+     2 /* Bloom filter hash count */, rappor::SPARSE_NOISE /* Noise level */,
      UMA_RAPPOR_GROUP /* Recording group */},
 };
 
 }  // namespace internal
 
 }  // namespace rappor
 
 #endif  // COMPONENTS_RAPPOR_RAPPOR_PARAMETERS_H_