Allow PolicyLoadStatusSample to override reporting method

components/policy/core/common/policy_load_status.h

 // Copyright (c) 2013 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_POLICY_CORE_COMMON_POLICY_LOAD_STATUS_H_
 #define COMPONENTS_POLICY_CORE_COMMON_POLICY_LOAD_STATUS_H_
 
 #include <bitset>
 
+#include "base/callback.h"

[emaxx, 2017/05/05 10:44:25]

nit: Not necessary anymore.

[ljusten (tachyonic), 2017/05/05 12:58:36]

Done.

 #include "base/macros.h"
 #include "components/policy/policy_export.h"
 
-namespace base {
-class HistogramBase;
-}
-
 namespace policy {
 
 // UMA histogram enum for policy load status. Don't change existing constants,
 // append additional constants to the end if needed.
 enum PolicyLoadStatus {
   // Policy load attempt started. This gets logged for each policy load attempt
   // to get a baseline on the number of requests, and an arbitrary number of
   // the below status codes may get added in addition.
   POLICY_LOAD_STATUS_STARTED = 0,
   // System failed to determine whether there's policy.
@@ skipping 10 matching lines @@
   POLICY_LOAD_STATUS_READ_ERROR = 6,
   // Data too large to process.
   POLICY_LOAD_STATUS_TOO_BIG = 7,
   // Parse error.
   POLICY_LOAD_STATUS_PARSE_ERROR = 8,
 
   // This must stay last.
   POLICY_LOAD_STATUS_SIZE
 };
 
-// A helper for generating policy load status UMA statistics that'll collect
-// histogram samples for a policy load operation and records histogram samples
-// for the status codes that were seen on destruction.
-class POLICY_EXPORT PolicyLoadStatusSample {
+// A helper for collecting statuses for a policy load operation.
+class POLICY_EXPORT PolicyLoadStatusSampler {
  public:
-  PolicyLoadStatusSample();
-  ~PolicyLoadStatusSample();
+  using StatusSet = std::bitset<POLICY_LOAD_STATUS_SIZE>;
+
+  PolicyLoadStatusSampler();
+  virtual ~PolicyLoadStatusSampler();
 
   // Adds a status code.
   void Add(PolicyLoadStatus status);
 
+  // Returns a set with all statuses.
+  const StatusSet& GetStatusSet() const { return status_bits_; }
+
  private:
-  std::bitset<POLICY_LOAD_STATUS_SIZE> status_bits_;
-  base::HistogramBase* histogram_;
+  StatusSet status_bits_;
+  DISALLOW_COPY_AND_ASSIGN(PolicyLoadStatusSampler);
+};
 
-  DISALLOW_COPY_AND_ASSIGN(PolicyLoadStatusSample);
+// A helper for generating policy load status UMA statistics. On destruction,
+// records histogram samples for the collected status codes.
+class POLICY_EXPORT PolicyLoadStatusAutoSubmitter

[emaxx, 2017/05/05 10:44:25]

nit: Not insisting, but as you're already changing the name of the class, I'd
personally like something that explicitly refers to UMA - like
"...AutoUmaReporter" (this fact wasn't clear to me from the old name, and isn't
fully obvious to me now). But leaving this up to you.

[ljusten (tachyonic), 2017/05/05 12:58:36]

Done, but I dropped the 'Auto' - it's cleaner.

+    : public PolicyLoadStatusSampler {
+ public:
+  PolicyLoadStatusAutoSubmitter();
+  ~PolicyLoadStatusAutoSubmitter() override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(PolicyLoadStatusAutoSubmitter);
 };
 
 }  // namespace policy
 
 #endif  // COMPONENTS_POLICY_CORE_COMMON_POLICY_LOAD_STATUS_H_