This is the continuation of https://codereview.chromium.org/11615008/

BUG=139612

Review URL: https://chromiumcodereview.appspot.com/12051044

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178550 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 7 insertions, 8 deletions

diff --git a/base/metrics/histogram_flattener.h b/base/metrics/histogram_flattener.h
index 6dd169e..137ce98 100644
--- a/base/metrics/histogram_flattener.h
+++ b/base/metrics/histogram_flattener.h
@@ -9,7 +9,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 
 namespace base {
@@ -22,7 +21,7 @@ class HistogramSamples;
 // error report mechanism.
 class BASE_EXPORT HistogramFlattener {
  public:
-  virtual void RecordDelta(const Histogram& histogram,
+  virtual void RecordDelta(const HistogramBase& histogram,
                            const HistogramSamples& snapshot) = 0;
 
   // Will be called each time a type of Inconsistenies is seen on a histogram,
diff --git a/chrome/common/metrics/metrics_service_base.cc b/chrome/common/metrics/metrics_service_base.cc
index c0df1bd..bb534b1 100644
--- a/chrome/common/metrics/metrics_service_base.cc
+++ b/chrome/common/metrics/metrics_service_base.cc
@@ -36,7 +36,7 @@ void MetricsServiceBase::RecordCurrentHistograms() {
 }
 
 void MetricsServiceBase::RecordDelta(
-    const base::Histogram& histogram,
+    const base::HistogramBase& histogram,
     const base::HistogramSamples& snapshot) {
   log_manager_.current_log()->RecordHistogramDelta(histogram.histogram_name(),
                                                    snapshot);
diff --git a/chrome/common/metrics/metrics_service_base.h b/chrome/common/metrics/metrics_service_base.h
index fb72377..a40b9a2 100644
--- a/chrome/common/metrics/metrics_service_base.h
+++ b/chrome/common/metrics/metrics_service_base.h
@@ -6,7 +6,7 @@
 #define CHROME_COMMON_METRICS_METRICS_SERVICE_BASE_H_
 
 #include "base/basictypes.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_flattener.h"
 #include "base/metrics/histogram_snapshot_manager.h"
 #include "chrome/common/metrics/metrics_log_manager.h"
@@ -21,7 +21,7 @@ class HistogramSamples;
 class MetricsServiceBase : public base::HistogramFlattener {
  public:
   // HistogramFlattener interface (override) methods.
-  virtual void RecordDelta(const base::Histogram& histogram,
+  virtual void RecordDelta(const base::HistogramBase& histogram,
                            const base::HistogramSamples& snapshot) OVERRIDE;
   virtual void InconsistencyDetected(
       base::Histogram::Inconsistencies problem) OVERRIDE;
diff --git a/content/common/child_histogram_message_filter.cc b/content/common/child_histogram_message_filter.cc
index 60cb389..3b410cc 100644
--- a/content/common/child_histogram_message_filter.cc
+++ b/content/common/child_histogram_message_filter.cc
@@ -74,7 +74,7 @@ void ChildHistogramMessageFilter::UploadAllHistograms(int sequence_number) {
 }
 
 void ChildHistogramMessageFilter::RecordDelta(
-    const base::Histogram& histogram,
+    const base::HistogramBase& histogram,
     const base::HistogramSamples& snapshot) {
   DCHECK_NE(0, snapshot.TotalCount());
 
diff --git a/content/common/child_histogram_message_filter.h b/content/common/child_histogram_message_filter.h
index 06ec0d9..a43750a 100644
--- a/content/common/child_histogram_message_filter.h
+++ b/content/common/child_histogram_message_filter.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/metrics/histogram.h"
+#include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_flattener.h"
 #include "base/metrics/histogram_snapshot_manager.h"
 #include "ipc/ipc_channel_proxy.h"
@@ -35,7 +35,7 @@ class ChildHistogramMessageFilter : public base::HistogramFlattener,
   void SendHistograms(int sequence_number);
 
   // HistogramFlattener interface (override) methods.
-  virtual void RecordDelta(const base::Histogram& histogram,
+  virtual void RecordDelta(const base::HistogramBase& histogram,
                            const base::HistogramSamples& snapshot) OVERRIDE;
   virtual void InconsistencyDetected(
       base::Histogram::Inconsistencies problem) OVERRIDE;