Multi-dimension rappor metrics

components/rappor/rappor_service.h

Index: components/rappor/rappor_service.h
diff --git a/components/rappor/rappor_service.h b/components/rappor/rappor_service.h
index d50b91e9ca2edda4878a7314e5344b94e16e6c7d..8e3fbc8d4010fb07db6482c082d33a1c92d402f5 100644
--- a/components/rappor/rappor_service.h
+++ b/components/rappor/rappor_service.h
@@ -14,6 +14,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "components/metrics/daily_event.h"
+#include "components/rappor/rappor_metric.h"
 #include "components/rappor/rappor_parameters.h"
 
 class PrefRegistrySimple;
@@ -34,6 +35,7 @@ enum RapporType {
   // For sampling the eTLD+1 of a URL.
   ETLD_PLUS_ONE_RAPPOR_TYPE = 0,
   COARSE_RAPPOR_TYPE,
+  SB_STRING_W_FLAGS_TYPE,

[Alexei Svitkine (slow), 2015/04/09 21:25:03]

Please comment these - also I don't understand this - what is the "W"? is it
"WITH" or does it stand for something else? I actually suggest spelling out the
acronyms.

[Steven Holte, 2015/04/14 20:07:38]

Renamed, this and the other metrics, to be more consistent, and understandable.

   NUM_RAPPOR_TYPES
 };
 
@@ -69,6 +71,11 @@ class RapporService {
                             RapporType type,
                             const std::string& sample);
 
+  void RecordStringAndFlags(const std::string& metric_name,
+                                         RapporType type,

[Alexei Svitkine (slow), 2015/04/09 21:25:03]

Nit: Align and add a comment.

[Steven Holte, 2015/04/14 20:07:38]

Done.

+                                         const std::string& str,
+                                         uint64_t flags);

[Alexei Svitkine (slow), 2015/04/09 21:25:03]

Are you planning to add rappor.xml mechanism for specifying the flags values?

[Steven Holte, 2015/04/14 20:07:38]

Done.

+
   // Registers the names of all of the preferences used by RapporService in the
   // provided PrefRegistry. This should be called before calling Start().
   static void RegisterPrefs(PrefRegistrySimple* registry);
@@ -99,7 +106,7 @@ class RapporService {
   // Exposed for tests.
   void RecordSampleInternal(const std::string& metric_name,
                             const RapporParameters& parameters,
-                            const std::string& sample);
+                            const Sample& sample);
 
   // Checks if the service has been started successfully.
   bool IsInitialized() const;