Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(304)

Unified Diff: content/browser/service_worker/service_worker_job_unittest.cc

Issue 637183002: Replace FINAL and OVERRIDE with their C++11 counterparts in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/service_worker/service_worker_job_unittest.cc
diff --git a/content/browser/service_worker/service_worker_job_unittest.cc b/content/browser/service_worker/service_worker_job_unittest.cc
index 976f5bdf59b23f14c536648c3051770ef258f6e7..85b14887460a096df7a36d934149ff2aba3a74ef 100644
--- a/content/browser/service_worker/service_worker_job_unittest.cc
+++ b/content/browser/service_worker/service_worker_job_unittest.cc
@@ -102,11 +102,11 @@ class ServiceWorkerJobTest : public testing::Test {
: browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP),
render_process_id_(kMockRenderProcessId) {}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
helper_.reset(new EmbeddedWorkerTestHelper(render_process_id_));
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
helper_.reset();
}
@@ -408,7 +408,7 @@ class FailToStartWorkerTestHelper : public EmbeddedWorkerTestHelper {
int64 service_worker_version_id,
const GURL& scope,
const GURL& script_url,
- bool pause_after_download) OVERRIDE {
+ bool pause_after_download) override {
EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id);
registry()->OnWorkerStopped(worker->process_id(), embedded_worker_id);
}
@@ -931,7 +931,7 @@ class UpdateJobTestHelper
int64 version_id,
const GURL& scope,
const GURL& script,
- bool pause_after_download) OVERRIDE {
+ bool pause_after_download) override {
const std::string kMockScriptBody = "mock_script";
ServiceWorkerVersion* version = context()->GetLiveVersion(version_id);
ASSERT_TRUE(version);
@@ -963,7 +963,7 @@ class UpdateJobTestHelper
virtual void OnVersionAttributesChanged(
ServiceWorkerRegistration* registration,
ChangedVersionAttributesMask changed_mask,
- const ServiceWorkerRegistrationInfo& info) OVERRIDE {
+ const ServiceWorkerRegistrationInfo& info) override {
AttributeChangeLogEntry entry;
entry.registration_id = registration->id();
entry.mask = changed_mask;
@@ -972,23 +972,23 @@ class UpdateJobTestHelper
}
virtual void OnRegistrationFailed(
- ServiceWorkerRegistration* registration) OVERRIDE {
+ ServiceWorkerRegistration* registration) override {
NOTREACHED();
}
virtual void OnRegistrationFinishedUninstalling(
- ServiceWorkerRegistration* registration) OVERRIDE {
+ ServiceWorkerRegistration* registration) override {
NOTREACHED();
}
virtual void OnUpdateFound(
- ServiceWorkerRegistration* registration) OVERRIDE {
+ ServiceWorkerRegistration* registration) override {
ASSERT_FALSE(update_found_);
update_found_ = true;
}
// ServiceWorkerVersion::Listener overrides
- virtual void OnVersionStateChanged(ServiceWorkerVersion* version) OVERRIDE {
+ virtual void OnVersionStateChanged(ServiceWorkerVersion* version) override {
StateChangeLogEntry entry;
entry.version_id = version->version_id();
entry.status = version->status();

Powered by Google App Engine
This is Rietveld 408576698