Revved to chromium c06ba3f6d7a67bc04ae2f6c041c22a86bdcf372a refs/remotes/origin/HEAD
diff --git a/base/metrics/field_trial_unittest.cc b/base/metrics/field_trial_unittest.cc
index 52ce855..b3a6eb3 100644
--- a/base/metrics/field_trial_unittest.cc
+++ b/base/metrics/field_trial_unittest.cc
@@ -49,7 +49,7 @@
}
virtual void OnFieldTrialGroupFinalized(const std::string& trial,
- const std::string& group) OVERRIDE {
+ const std::string& group) override {
trial_name_ = trial;
group_name_ = group;
}
diff --git a/base/metrics/histogram.h b/base/metrics/histogram.h
index 816458d..47cfc79 100644
--- a/base/metrics/histogram.h
+++ b/base/metrics/histogram.h
@@ -359,7 +359,7 @@
// produce a false-alarm if a race occurred in the reading of the data during
// a SnapShot process, but should otherwise be false at all times (unless we
// have memory over-writes, or DRAM failures).
- virtual int FindCorruption(const HistogramSamples& samples) const OVERRIDE;
+ virtual int FindCorruption(const HistogramSamples& samples) const override;
//----------------------------------------------------------------------------
// Accessors for factory construction, serialization and testing.
@@ -382,17 +382,17 @@
size_t* bucket_count);
// HistogramBase implementation:
- virtual HistogramType GetHistogramType() const OVERRIDE;
+ virtual HistogramType GetHistogramType() const override;
virtual bool HasConstructionArguments(
Sample expected_minimum,
Sample expected_maximum,
- size_t expected_bucket_count) const OVERRIDE;
- virtual void Add(Sample value) OVERRIDE;
- virtual scoped_ptr<HistogramSamples> SnapshotSamples() const OVERRIDE;
- virtual void AddSamples(const HistogramSamples& samples) OVERRIDE;
- virtual bool AddSamplesFromPickle(PickleIterator* iter) OVERRIDE;
- virtual void WriteHTMLGraph(std::string* output) const OVERRIDE;
- virtual void WriteAscii(std::string* output) const OVERRIDE;
+ size_t expected_bucket_count) const override;
+ virtual void Add(Sample value) override;
+ virtual scoped_ptr<HistogramSamples> SnapshotSamples() const override;
+ virtual void AddSamples(const HistogramSamples& samples) override;
+ virtual bool AddSamplesFromPickle(PickleIterator* iter) override;
+ virtual void WriteHTMLGraph(std::string* output) const override;
+ virtual void WriteAscii(std::string* output) const override;
protected:
// |ranges| should contain the underflow and overflow buckets. See top
@@ -405,7 +405,7 @@
virtual ~Histogram();
// HistogramBase implementation:
- virtual bool SerializeInfoImpl(Pickle* pickle) const OVERRIDE;
+ virtual bool SerializeInfoImpl(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;
@@ -458,11 +458,11 @@
std::string* output) const;
// WriteJSON calls these.
- virtual void GetParameters(DictionaryValue* params) const OVERRIDE;
+ virtual void GetParameters(DictionaryValue* params) const override;
virtual void GetCountAndBucketData(Count* count,
int64* sum,
- ListValue* buckets) const OVERRIDE;
+ ListValue* buckets) const override;
// Does not own this object. Should get from StatisticsRecorder.
const BucketRanges* bucket_ranges_;
@@ -521,7 +521,7 @@
BucketRanges* ranges);
// Overridden from Histogram:
- virtual HistogramType GetHistogramType() const OVERRIDE;
+ virtual HistogramType GetHistogramType() const override;
protected:
LinearHistogram(const std::string& name,
@@ -529,15 +529,15 @@
Sample maximum,
const BucketRanges* ranges);
- virtual double GetBucketSize(Count current, size_t i) const OVERRIDE;
+ virtual double GetBucketSize(Count current, size_t i) const override;
// If we have a description for a bucket, then return that. Otherwise
// let parent class provide a (numeric) description.
- virtual const std::string GetAsciiBucketRange(size_t i) const OVERRIDE;
+ virtual const std::string GetAsciiBucketRange(size_t i) const override;
// Skip printing of name for numeric range if we have a name (and if this is
// an empty bucket).
- virtual bool PrintEmptyBucket(size_t index) const OVERRIDE;
+ virtual bool PrintEmptyBucket(size_t index) const override;
private:
friend BASE_EXPORT_PRIVATE HistogramBase* DeserializeHistogramInfo(
@@ -560,7 +560,7 @@
public:
static HistogramBase* FactoryGet(const std::string& name, int32 flags);
- virtual HistogramType GetHistogramType() const OVERRIDE;
+ virtual HistogramType GetHistogramType() const override;
private:
BooleanHistogram(const std::string& name, const BucketRanges* ranges);
@@ -586,7 +586,7 @@
int32 flags);
// Overridden from Histogram:
- virtual HistogramType GetHistogramType() const OVERRIDE;
+ virtual HistogramType GetHistogramType() const override;
// Helper method for transforming an array of valid enumeration values
// to the std::vector<int> expected by UMA_HISTOGRAM_CUSTOM_ENUMERATION.
@@ -601,9 +601,9 @@
const BucketRanges* ranges);
// HistogramBase implementation:
- virtual bool SerializeInfoImpl(Pickle* pickle) const OVERRIDE;
+ virtual bool SerializeInfoImpl(Pickle* pickle) const override;
- virtual double GetBucketSize(Count current, size_t i) const OVERRIDE;
+ virtual double GetBucketSize(Count current, size_t i) const override;
private:
friend BASE_EXPORT_PRIVATE HistogramBase* DeserializeHistogramInfo(
diff --git a/base/metrics/histogram_delta_serialization.h b/base/metrics/histogram_delta_serialization.h
index ccadb12..037d0b5 100644
--- a/base/metrics/histogram_delta_serialization.h
+++ b/base/metrics/histogram_delta_serialization.h
@@ -39,12 +39,12 @@
private:
// HistogramFlattener implementation.
virtual void RecordDelta(const HistogramBase& histogram,
- const HistogramSamples& snapshot) OVERRIDE;
+ const HistogramSamples& snapshot) override;
virtual void InconsistencyDetected(
- HistogramBase::Inconsistency problem) OVERRIDE;
+ HistogramBase::Inconsistency problem) override;
virtual void UniqueInconsistencyDetected(
- HistogramBase::Inconsistency problem) OVERRIDE;
- virtual void InconsistencyDetectedInLoggedCount(int amount) OVERRIDE;
+ HistogramBase::Inconsistency problem) override;
+ virtual void InconsistencyDetectedInLoggedCount(int amount) override;
// Calculates deltas in histogram counters.
HistogramSnapshotManager histogram_snapshot_manager_;
diff --git a/base/metrics/histogram_samples.cc b/base/metrics/histogram_samples.cc
index 2319ed1..26c2aeb 100644
--- a/base/metrics/histogram_samples.cc
+++ b/base/metrics/histogram_samples.cc
@@ -15,11 +15,11 @@
public:
explicit SampleCountPickleIterator(PickleIterator* iter);
- 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:
PickleIterator* const iter_;
diff --git a/base/metrics/histogram_snapshot_manager_unittest.cc b/base/metrics/histogram_snapshot_manager_unittest.cc
index e6672ea..2da22be 100644
--- a/base/metrics/histogram_snapshot_manager_unittest.cc
+++ b/base/metrics/histogram_snapshot_manager_unittest.cc
@@ -19,21 +19,21 @@
HistogramFlattenerDeltaRecorder() {}
virtual void RecordDelta(const HistogramBase& histogram,
- const HistogramSamples& snapshot) OVERRIDE {
+ const HistogramSamples& snapshot) override {
recorded_delta_histogram_names_.push_back(histogram.histogram_name());
}
virtual void InconsistencyDetected(
- HistogramBase::Inconsistency problem) OVERRIDE {
+ HistogramBase::Inconsistency problem) override {
ASSERT_TRUE(false);
}
virtual void UniqueInconsistencyDetected(
- HistogramBase::Inconsistency problem) OVERRIDE {
+ HistogramBase::Inconsistency problem) override {
ASSERT_TRUE(false);
}
- virtual void InconsistencyDetectedInLoggedCount(int amount) OVERRIDE {
+ virtual void InconsistencyDetectedInLoggedCount(int amount) override {
ASSERT_TRUE(false);
}
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_;
diff --git a/base/metrics/sample_vector.h b/base/metrics/sample_vector.h
index 6b2adcf..8cc8ce9 100644
--- a/base/metrics/sample_vector.h
+++ b/base/metrics/sample_vector.h
@@ -27,11 +27,11 @@
// 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;
// Get count of a specific bucket.
HistogramBase::Count GetCountAtIndex(size_t bucket_index) const;
@@ -39,7 +39,7 @@
protected:
virtual bool AddSubtractImpl(
SampleCountIterator* iter,
- HistogramSamples::Operator op) OVERRIDE; // |op| is ADD or SUBTRACT.
+ HistogramSamples::Operator op) override; // |op| is ADD or SUBTRACT.
virtual size_t GetBucketIndex(HistogramBase::Sample value) const;
@@ -61,14 +61,14 @@
virtual ~SampleVectorIterator();
// 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;
// SampleVector uses predefined buckets, so iterator can return bucket index.
- virtual bool GetBucketIndex(size_t* index) const OVERRIDE;
+ virtual bool GetBucketIndex(size_t* index) const override;
private:
void SkipEmptyBuckets();
diff --git a/base/metrics/sparse_histogram.h b/base/metrics/sparse_histogram.h
index c114916..321c630 100644
--- a/base/metrics/sparse_histogram.h
+++ b/base/metrics/sparse_histogram.h
@@ -37,21 +37,21 @@
virtual ~SparseHistogram();
// HistogramBase implementation:
- virtual HistogramType GetHistogramType() const OVERRIDE;
+ virtual HistogramType GetHistogramType() const override;
virtual bool HasConstructionArguments(
Sample expected_minimum,
Sample expected_maximum,
- size_t expected_bucket_count) const OVERRIDE;
- virtual void Add(Sample value) OVERRIDE;
- virtual void AddSamples(const HistogramSamples& samples) OVERRIDE;
- virtual bool AddSamplesFromPickle(PickleIterator* iter) OVERRIDE;
- virtual scoped_ptr<HistogramSamples> SnapshotSamples() const OVERRIDE;
- virtual void WriteHTMLGraph(std::string* output) const OVERRIDE;
- virtual void WriteAscii(std::string* output) const OVERRIDE;
+ size_t expected_bucket_count) const override;
+ virtual void Add(Sample value) override;
+ virtual void AddSamples(const HistogramSamples& samples) override;
+ virtual bool AddSamplesFromPickle(PickleIterator* iter) override;
+ virtual scoped_ptr<HistogramSamples> SnapshotSamples() const override;
+ virtual void WriteHTMLGraph(std::string* output) const override;
+ virtual void WriteAscii(std::string* output) const override;
protected:
// HistogramBase implementation:
- virtual bool SerializeInfoImpl(Pickle* pickle) const OVERRIDE;
+ virtual bool SerializeInfoImpl(Pickle* pickle) const override;
private:
// Clients should always use FactoryGet to create SparseHistogram.
@@ -61,10 +61,10 @@
PickleIterator* iter);
static HistogramBase* DeserializeInfoImpl(PickleIterator* iter);
- virtual void GetParameters(DictionaryValue* params) const OVERRIDE;
+ virtual void GetParameters(DictionaryValue* params) const override;
virtual void GetCountAndBucketData(Count* count,
int64* sum,
- ListValue* buckets) const OVERRIDE;
+ ListValue* buckets) const override;
// Helpers for emitting Ascii graphic. Each method appends data to output.
void WriteAsciiImpl(bool graph_it,
diff --git a/base/metrics/stats_counters.h b/base/metrics/stats_counters.h
index d47bab3..a2c7dec 100644
--- a/base/metrics/stats_counters.h
+++ b/base/metrics/stats_counters.h
@@ -164,7 +164,7 @@
explicit StatsRate(const std::string& name);
virtual ~StatsRate();
- virtual void Add(int value) OVERRIDE;
+ virtual void Add(int value) override;
private:
StatsCounter counter_;
diff --git a/base/metrics/stats_table_unittest.cc b/base/metrics/stats_table_unittest.cc
index 840f926..501cbc7 100644
--- a/base/metrics/stats_table_unittest.cc
+++ b/base/metrics/stats_table_unittest.cc
@@ -70,7 +70,7 @@
: SimpleThread(name),
id_(id) {}
- virtual void Run() OVERRIDE;
+ virtual void Run() override;
private:
int id_;
