Revved to chromium c06ba3f6d7a67bc04ae2f6c041c22a86bdcf372a refs/remotes/origin/HEAD
diff --git a/base/metrics/sample_map.h b/base/metrics/sample_map.h
index cdd1138..0972acd 100644
--- a/base/metrics/sample_map.h
+++ b/base/metrics/sample_map.h
@@ -24,16 +24,16 @@
// HistogramSamples implementation:
virtual void Accumulate(HistogramBase::Sample value,
- HistogramBase::Count count) OVERRIDE;
+ HistogramBase::Count count) override;
virtual HistogramBase::Count GetCount(
- HistogramBase::Sample value) const OVERRIDE;
- virtual HistogramBase::Count TotalCount() const OVERRIDE;
- virtual scoped_ptr<SampleCountIterator> Iterator() const OVERRIDE;
+ HistogramBase::Sample value) const override;
+ virtual HistogramBase::Count TotalCount() const override;
+ virtual scoped_ptr<SampleCountIterator> Iterator() const override;
protected:
virtual bool AddSubtractImpl(
SampleCountIterator* iter,
- HistogramSamples::Operator op) OVERRIDE; // |op| is ADD or SUBTRACT.
+ HistogramSamples::Operator op) override; // |op| is ADD or SUBTRACT.
private:
std::map<HistogramBase::Sample, HistogramBase::Count> sample_counts_;
@@ -50,11 +50,11 @@
virtual ~SampleMapIterator();
// SampleCountIterator implementation:
- virtual bool Done() const OVERRIDE;
- virtual void Next() OVERRIDE;
+ virtual bool Done() const override;
+ virtual void Next() override;
virtual void Get(HistogramBase::Sample* min,
HistogramBase::Sample* max,
- HistogramBase::Count* count) const OVERRIDE;
+ HistogramBase::Count* count) const override;
private:
SampleToCountMap::const_iterator iter_;
const SampleToCountMap::const_iterator end_;