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

Unified Diff: content/browser/service_worker/service_worker_browsertest.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_browsertest.cc
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc
index 34b09b2b93aca976378ca940dd343b88c1fdfec5..b0d4dd07e6c29d37a9e3eb01140a3cf25ec62600 100644
--- a/content/browser/service_worker/service_worker_browsertest.cc
+++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -145,7 +145,7 @@ class WorkerActivatedObserver
RunOnIOThread(base::Bind(&WorkerActivatedObserver::InitOnIOThread, this));
}
// ServiceWorkerContextObserver overrides.
- virtual void OnVersionStateChanged(int64 version_id) OVERRIDE {
+ virtual void OnVersionStateChanged(int64 version_id) override {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
const ServiceWorkerVersion* version =
context_->context()->GetLiveVersion(version_id);
@@ -197,7 +197,7 @@ class LongLivedResourceInterceptor : public net::URLRequestInterceptor {
// net::URLRequestInterceptor implementation
virtual net::URLRequestJob* MaybeInterceptRequest(
net::URLRequest* request,
- net::NetworkDelegate* network_delegate) const OVERRIDE {
+ net::NetworkDelegate* network_delegate) const override {
const char kHeaders[] =
"HTTP/1.1 200 OK\0"
"Content-Type: text/javascript\0"
@@ -262,12 +262,12 @@ class ServiceWorkerBrowserTest : public ContentBrowserTest {
protected:
typedef ServiceWorkerBrowserTest self;
- virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(
switches::kEnableExperimentalWebPlatformFeatures);
}
- virtual void SetUpOnMainThread() OVERRIDE {
+ virtual void SetUpOnMainThread() override {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
StoragePartition* partition = BrowserContext::GetDefaultStoragePartition(
shell()->web_contents()->GetBrowserContext());
@@ -283,7 +283,7 @@ class ServiceWorkerBrowserTest : public ContentBrowserTest {
RunOnIOThread(base::Bind(&self::SetUpOnIOThread, this));
}
- virtual void TearDownOnMainThread() OVERRIDE {
+ virtual void TearDownOnMainThread() override {
RunOnIOThread(base::Bind(&self::TearDownOnIOThread, this));
wrapper_ = NULL;
}
@@ -313,7 +313,7 @@ class EmbeddedWorkerBrowserTest : public ServiceWorkerBrowserTest,
pause_mode_(DONT_PAUSE) {}
virtual ~EmbeddedWorkerBrowserTest() {}
- virtual void TearDownOnIOThread() OVERRIDE {
+ virtual void TearDownOnIOThread() override {
if (worker_) {
worker_->RemoveListener(this);
worker_.reset();
@@ -367,19 +367,19 @@ class EmbeddedWorkerBrowserTest : public ServiceWorkerBrowserTest,
protected:
// EmbeddedWorkerInstance::Observer overrides:
- virtual void OnStarted() OVERRIDE {
+ virtual void OnStarted() override {
ASSERT_TRUE(worker_ != NULL);
ASSERT_FALSE(done_closure_.is_null());
last_worker_status_ = worker_->status();
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, done_closure_);
}
- virtual void OnStopped() OVERRIDE {
+ virtual void OnStopped() override {
ASSERT_TRUE(worker_ != NULL);
ASSERT_FALSE(done_closure_.is_null());
last_worker_status_ = worker_->status();
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, done_closure_);
}
- virtual void OnPausedAfterDownload() OVERRIDE {
+ virtual void OnPausedAfterDownload() override {
if (pause_mode_ == PAUSE_THEN_RESUME)
worker_->ResumeAfterDownload();
else if (pause_mode_ == PAUSE_THEN_STOP)
@@ -390,13 +390,13 @@ class EmbeddedWorkerBrowserTest : public ServiceWorkerBrowserTest,
virtual void OnReportException(const base::string16& error_message,
int line_number,
int column_number,
- const GURL& source_url) OVERRIDE {}
+ const GURL& source_url) override {}
virtual void OnReportConsoleMessage(int source_identifier,
int message_level,
const base::string16& message,
int line_number,
- const GURL& source_url) OVERRIDE {}
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+ const GURL& source_url) override {}
+ virtual bool OnMessageReceived(const IPC::Message& message) override {
return false;
}
@@ -420,7 +420,7 @@ class ServiceWorkerVersionBrowserTest : public ServiceWorkerBrowserTest {
virtual ~ServiceWorkerVersionBrowserTest() {}
- virtual void TearDownOnIOThread() OVERRIDE {
+ virtual void TearDownOnIOThread() override {
registration_ = NULL;
version_ = NULL;
}
« no previous file with comments | « content/browser/service_worker/embedded_worker_test_helper.h ('k') | content/browser/service_worker/service_worker_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698