| Index: base/metrics/histogram.h
|
| diff --git a/base/metrics/histogram.h b/base/metrics/histogram.h
|
| index 9ee172e6cdadcf8e1493cffb24e3d5f45ca65be3..c13f05e17904ce7461ffcb7106ef1cac8f3bbfd2 100644
|
| --- a/base/metrics/histogram.h
|
| +++ b/base/metrics/histogram.h
|
| @@ -83,15 +83,14 @@
|
| #include "base/metrics/histogram_samples.h"
|
| #include "base/time/time.h"
|
|
|
| -class Pickle;
|
| -class PickleIterator;
|
| -
|
| namespace base {
|
|
|
| class BooleanHistogram;
|
| class CustomHistogram;
|
| class Histogram;
|
| class LinearHistogram;
|
| +class Pickle;
|
| +class PickleIterator;
|
| class SampleVector;
|
|
|
| class BASE_EXPORT Histogram : public HistogramBase {
|
| @@ -170,7 +169,7 @@ class BASE_EXPORT Histogram : public HistogramBase {
|
| void Add(Sample value) override;
|
| scoped_ptr<HistogramSamples> SnapshotSamples() const override;
|
| void AddSamples(const HistogramSamples& samples) override;
|
| - bool AddSamplesFromPickle(PickleIterator* iter) override;
|
| + bool AddSamplesFromPickle(base::PickleIterator* iter) override;
|
| void WriteHTMLGraph(std::string* output) const override;
|
| void WriteAscii(std::string* output) const override;
|
|
|
| @@ -185,7 +184,7 @@ class BASE_EXPORT Histogram : public HistogramBase {
|
| ~Histogram() override;
|
|
|
| // HistogramBase implementation:
|
| - bool SerializeInfoImpl(Pickle* pickle) const override;
|
| + bool SerializeInfoImpl(base::Pickle* pickle) const override;
|
|
|
| // Method to override to skip the display of the i'th bucket if it's empty.
|
| virtual bool PrintEmptyBucket(size_t index) const;
|
| @@ -210,8 +209,8 @@ class BASE_EXPORT Histogram : public HistogramBase {
|
| friend class StatisticsRecorderTest;
|
|
|
| friend BASE_EXPORT_PRIVATE HistogramBase* DeserializeHistogramInfo(
|
| - PickleIterator* iter);
|
| - static HistogramBase* DeserializeInfoImpl(PickleIterator* iter);
|
| + base::PickleIterator* iter);
|
| + static HistogramBase* DeserializeInfoImpl(base::PickleIterator* iter);
|
|
|
| // Implementation of SnapshotSamples function.
|
| scoped_ptr<SampleVector> SnapshotSampleVector() const;
|
| @@ -321,8 +320,8 @@ class BASE_EXPORT LinearHistogram : public Histogram {
|
|
|
| private:
|
| friend BASE_EXPORT_PRIVATE HistogramBase* DeserializeHistogramInfo(
|
| - PickleIterator* iter);
|
| - static HistogramBase* DeserializeInfoImpl(PickleIterator* iter);
|
| + base::PickleIterator* iter);
|
| + static HistogramBase* DeserializeInfoImpl(base::PickleIterator* iter);
|
|
|
| // For some ranges, we store a printable description of a bucket range.
|
| // If there is no description, then GetAsciiBucketRange() uses parent class
|
| @@ -346,8 +345,8 @@ class BASE_EXPORT BooleanHistogram : public LinearHistogram {
|
| BooleanHistogram(const std::string& name, const BucketRanges* ranges);
|
|
|
| friend BASE_EXPORT_PRIVATE HistogramBase* DeserializeHistogramInfo(
|
| - PickleIterator* iter);
|
| - static HistogramBase* DeserializeInfoImpl(PickleIterator* iter);
|
| + base::PickleIterator* iter);
|
| + static HistogramBase* DeserializeInfoImpl(base::PickleIterator* iter);
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BooleanHistogram);
|
| };
|
| @@ -381,14 +380,14 @@ class BASE_EXPORT CustomHistogram : public Histogram {
|
| const BucketRanges* ranges);
|
|
|
| // HistogramBase implementation:
|
| - bool SerializeInfoImpl(Pickle* pickle) const override;
|
| + bool SerializeInfoImpl(base::Pickle* pickle) const override;
|
|
|
| double GetBucketSize(Count current, size_t i) const override;
|
|
|
| private:
|
| friend BASE_EXPORT_PRIVATE HistogramBase* DeserializeHistogramInfo(
|
| - PickleIterator* iter);
|
| - static HistogramBase* DeserializeInfoImpl(PickleIterator* iter);
|
| + base::PickleIterator* iter);
|
| + static HistogramBase* DeserializeInfoImpl(base::PickleIterator* iter);
|
|
|
| static bool ValidateCustomRanges(const std::vector<Sample>& custom_ranges);
|
| static BucketRanges* CreateBucketRangesFromCustomRanges(
|
|
|