Histograms - Support histograms for Plugins, GPU

chrome/common/metrics/metrics_service_base.h

Index: chrome/common/metrics/metrics_service_base.h
===================================================================
--- chrome/common/metrics/metrics_service_base.h	(revision 146279)
+++ chrome/common/metrics/metrics_service_base.h	(working copy)
@@ -7,13 +7,22 @@
 
 #include "base/basictypes.h"
 #include "base/metrics/histogram.h"
-#include "chrome/common/metrics/histogram_sender.h"
+#include "base/metrics/histogram_flattener.h"
+#include "base/metrics/histogram_snapshot_manager.h"
 #include "chrome/common/metrics/metrics_log_manager.h"
 
 // This class provides base functionality for logging metrics data.
 // TODO(ananta): Factor out more common code from chrome and chrome frame
 // metrics service into this class.
-class MetricsServiceBase : public HistogramSender {
+class MetricsServiceBase : public base::HistogramFlattener {
+ public:
+  // HistogramFlattener interface (override) methods.
+  virtual void RecordDelta(const base::Histogram& histogram,
+                           const base::Histogram::SampleSet& snapshot) OVERRIDE;
+  virtual void InconsistencyDetected(int problem) OVERRIDE;
+  virtual void UniqueInconsistencyDetected(int problem) OVERRIDE;
+  virtual void SnapshotProblemResolved(int amount) OVERRIDE;
+
  protected:
   MetricsServiceBase();
   virtual ~MetricsServiceBase();
@@ -34,13 +43,8 @@
   MetricsLogManager log_manager_;
 
  private:
-  // HistogramSender interface (override) methods.
-  virtual void TransmitHistogramDelta(
-      const base::Histogram& histogram,
-      const base::Histogram::SampleSet& snapshot) OVERRIDE;
-  virtual void InconsistencyDetected(int problem) OVERRIDE;
-  virtual void UniqueInconsistencyDetected(int problem) OVERRIDE;
-  virtual void SnapshotProblemResolved(int amount) OVERRIDE;
+  // |histogram_snapshot_manager_| prepares histogram deltas for transmission.
+  base::HistogramSnapshotManager histogram_snapshot_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MetricsServiceBase);
 };