summaryrefslogtreecommitdiffstats
path: root/components/domain_reliability
diff options
context:
space:
mode:
Diffstat (limited to 'components/domain_reliability')
-rw-r--r--components/domain_reliability/service.cc6
-rw-r--r--components/domain_reliability/test_util.cc6
-rw-r--r--components/domain_reliability/test_util.h10
-rw-r--r--components/domain_reliability/uploader.cc6
-rw-r--r--components/domain_reliability/util.cc6
-rw-r--r--components/domain_reliability/util.h6
6 files changed, 20 insertions, 20 deletions
diff --git a/components/domain_reliability/service.cc b/components/domain_reliability/service.cc
index 13eca0d..b8afff3 100644
--- a/components/domain_reliability/service.cc
+++ b/components/domain_reliability/service.cc
@@ -42,7 +42,7 @@ class DomainReliabilityServiceImpl : public DomainReliabilityService {
virtual scoped_ptr<DomainReliabilityMonitor> CreateMonitor(
scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
PrefService* local_state_pref_service,
- const char* reporting_pref_name) OVERRIDE {
+ const char* reporting_pref_name) override {
DCHECK(!network_task_runner_.get());
scoped_ptr<DomainReliabilityMonitor> monitor(
@@ -59,7 +59,7 @@ class DomainReliabilityServiceImpl : public DomainReliabilityService {
}
virtual void ClearBrowsingData(DomainReliabilityClearMode clear_mode,
- const base::Closure& callback) OVERRIDE {
+ const base::Closure& callback) override {
DCHECK(network_task_runner_.get());
network_task_runner_->PostTaskAndReply(
@@ -72,7 +72,7 @@ class DomainReliabilityServiceImpl : public DomainReliabilityService {
virtual void GetWebUIData(
const base::Callback<void(scoped_ptr<base::Value>)>& callback)
- const OVERRIDE {
+ const override {
DCHECK(network_task_runner_.get());
PostTaskAndReplyWithResult(
diff --git a/components/domain_reliability/test_util.cc b/components/domain_reliability/test_util.cc
index 1a5c836..49d9807 100644
--- a/components/domain_reliability/test_util.cc
+++ b/components/domain_reliability/test_util.cc
@@ -29,7 +29,7 @@ class MockTimer : public MockableTime::Timer {
// MockableTime::Timer implementation:
virtual void Start(const tracked_objects::Location& posted_from,
base::TimeDelta delay,
- const base::Closure& user_task) OVERRIDE {
+ const base::Closure& user_task) override {
DCHECK(!user_task.is_null());
if (running_)
@@ -42,14 +42,14 @@ class MockTimer : public MockableTime::Timer {
callback_sequence_number_));
}
- virtual void Stop() OVERRIDE {
+ virtual void Stop() override {
if (running_) {
++callback_sequence_number_;
running_ = false;
}
}
- virtual bool IsRunning() OVERRIDE { return running_; }
+ virtual bool IsRunning() override { return running_; }
private:
void OnDelayPassed(int expected_callback_sequence_number) {
diff --git a/components/domain_reliability/test_util.h b/components/domain_reliability/test_util.h
index a53664d..d8ac1b6 100644
--- a/components/domain_reliability/test_util.h
+++ b/components/domain_reliability/test_util.h
@@ -53,9 +53,9 @@ class MockUploader : public DomainReliabilityUploader {
// DomainReliabilityUploader implementation:
virtual void UploadReport(const std::string& report_json,
const GURL& upload_url,
- const UploadCallback& callback) OVERRIDE;
+ const UploadCallback& callback) override;
- virtual void set_discard_uploads(bool discard_uploads) OVERRIDE;
+ virtual void set_discard_uploads(bool discard_uploads) override;
private:
UploadRequestCallback callback_;
@@ -72,9 +72,9 @@ class MockTime : public MockableTime {
virtual ~MockTime();
// MockableTime implementation:
- virtual base::Time Now() OVERRIDE;
- virtual base::TimeTicks NowTicks() OVERRIDE;
- virtual scoped_ptr<MockableTime::Timer> CreateTimer() OVERRIDE;
+ virtual base::Time Now() override;
+ virtual base::TimeTicks NowTicks() override;
+ virtual scoped_ptr<MockableTime::Timer> CreateTimer() override;
// Pretends that |delta| has passed, and runs tasks that would've happened
// during that interval (with |Now()| returning proper values while they
diff --git a/components/domain_reliability/uploader.cc b/components/domain_reliability/uploader.cc
index b00b550..3a9e7b0 100644
--- a/components/domain_reliability/uploader.cc
+++ b/components/domain_reliability/uploader.cc
@@ -56,7 +56,7 @@ class DomainReliabilityUploaderImpl
virtual void UploadReport(
const std::string& report_json,
const GURL& upload_url,
- const DomainReliabilityUploader::UploadCallback& callback) OVERRIDE {
+ const DomainReliabilityUploader::UploadCallback& callback) override {
VLOG(1) << "Uploading report to " << upload_url;
VLOG(2) << "Report JSON: " << report_json;
@@ -81,14 +81,14 @@ class DomainReliabilityUploaderImpl
upload_callbacks_[fetcher] = callback;
}
- virtual void set_discard_uploads(bool discard_uploads) OVERRIDE {
+ virtual void set_discard_uploads(bool discard_uploads) override {
discard_uploads_ = discard_uploads;
VLOG(1) << "Setting discard_uploads to " << discard_uploads;
}
// net::URLFetcherDelegate implementation:
virtual void OnURLFetchComplete(
- const net::URLFetcher* fetcher) OVERRIDE {
+ const net::URLFetcher* fetcher) override {
DCHECK(fetcher);
UploadCallbackMap::iterator callback_it = upload_callbacks_.find(fetcher);
diff --git a/components/domain_reliability/util.cc b/components/domain_reliability/util.cc
index 1fc38ba..c7b83b2 100644
--- a/components/domain_reliability/util.cc
+++ b/components/domain_reliability/util.cc
@@ -25,15 +25,15 @@ class ActualTimer : public MockableTime::Timer {
// MockableTime::Timer implementation:
virtual void Start(const tracked_objects::Location& posted_from,
base::TimeDelta delay,
- const base::Closure& user_task) OVERRIDE {
+ const base::Closure& user_task) override {
base_timer_.Start(posted_from, delay, user_task);
}
- virtual void Stop() OVERRIDE {
+ virtual void Stop() override {
base_timer_.Stop();
}
- virtual bool IsRunning() OVERRIDE {
+ virtual bool IsRunning() override {
return base_timer_.IsRunning();
}
diff --git a/components/domain_reliability/util.h b/components/domain_reliability/util.h
index bbb0243..6b142c6 100644
--- a/components/domain_reliability/util.h
+++ b/components/domain_reliability/util.h
@@ -77,9 +77,9 @@ class DOMAIN_RELIABILITY_EXPORT ActualTime : public MockableTime {
virtual ~ActualTime();
// MockableTime implementation:
- virtual base::Time Now() OVERRIDE;
- virtual base::TimeTicks NowTicks() OVERRIDE;
- virtual scoped_ptr<MockableTime::Timer> CreateTimer() OVERRIDE;
+ virtual base::Time Now() override;
+ virtual base::TimeTicks NowTicks() override;
+ virtual scoped_ptr<MockableTime::Timer> CreateTimer() override;
};
} // namespace domain_reliability
generated by cgit v1.1 at 2025-01-26 01:35:52 +0000