Replacing the OVERRIDE with override and FINAL with final in content/browser/appcache

content/browser/appcache/appcache_update_job_unittest.cc

Index: content/browser/appcache/appcache_update_job_unittest.cc
diff --git a/content/browser/appcache/appcache_update_job_unittest.cc b/content/browser/appcache/appcache_update_job_unittest.cc
index c7a2e704ae2ba7856c1987233984e94f4ba78603..5d10bfda45c7966452fe79e2e8525e08f8ebe014 100644
--- a/content/browser/appcache/appcache_update_job_unittest.cc
+++ b/content/browser/appcache/appcache_update_job_unittest.cc
@@ -197,7 +197,7 @@ class MockHttpServerJobFactory
  public:
   virtual net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE {
+      net::NetworkDelegate* network_delegate) const override {
     return MockHttpServer::JobFactory(request, network_delegate);
   }
 };
@@ -220,15 +220,15 @@ class MockFrontend : public AppCacheFrontend {
   }
 
   virtual void OnCacheSelected(
-      int host_id, const AppCacheInfo& info) OVERRIDE {
+      int host_id, const AppCacheInfo& info) override {
   }
 
   virtual void OnStatusChanged(const std::vector<int>& host_ids,
-                               AppCacheStatus status) OVERRIDE {
+                               AppCacheStatus status) override {
   }
 
   virtual void OnEventRaised(const std::vector<int>& host_ids,
-                             AppCacheEventID event_id) OVERRIDE {
+                             AppCacheEventID event_id) override {
     raised_events_.push_back(RaisedEvent(host_ids, event_id));
 
     // Trigger additional updates if requested.
@@ -245,7 +245,7 @@ class MockFrontend : public AppCacheFrontend {
 
   virtual void OnErrorEventRaised(const std::vector<int>& host_ids,
                                   const AppCacheErrorDetails& details)
-      OVERRIDE {
+      override {
     error_message_ = details.message;
     OnEventRaised(host_ids, APPCACHE_ERROR_EVENT);
   }
@@ -253,7 +253,7 @@ class MockFrontend : public AppCacheFrontend {
   virtual void OnProgressEventRaised(const std::vector<int>& host_ids,
                                      const GURL& url,
                                      int num_total,
-                                     int num_complete) OVERRIDE {
+                                     int num_complete) override {
     if (!ignore_progress_events_)
       OnEventRaised(host_ids, APPCACHE_PROGRESS_EVENT);
 
@@ -283,11 +283,11 @@ class MockFrontend : public AppCacheFrontend {
 
   virtual void OnLogMessage(int host_id,
                             AppCacheLogLevel log_level,
-                            const std::string& message) OVERRIDE {
+                            const std::string& message) override {
   }
 
   virtual void OnContentBlocked(int host_id,
-                                const GURL& manifest_url) OVERRIDE {
+                                const GURL& manifest_url) override {
   }
 
   void AddExpectedEvent(const std::vector<int>& host_ids,
@@ -347,7 +347,7 @@ class RedirectFactory : public net::URLRequestJobFactory::ProtocolHandler {
  public:
   virtual net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE {
+      net::NetworkDelegate* network_delegate) const override {
     return new net::URLRequestTestJob(
         request,
         network_delegate,
@@ -399,7 +399,7 @@ class RetryRequestTestJob : public net::URLRequestTestJob {
     }
   }
 
-  virtual int GetResponseCode() const OVERRIDE { return response_code_; }
+  virtual int GetResponseCode() const override { return response_code_; }
 
  private:
   virtual ~RetryRequestTestJob() {}
@@ -463,7 +463,7 @@ class RetryRequestTestJobFactory
  public:
   virtual net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE {
+      net::NetworkDelegate* network_delegate) const override {
     return RetryRequestTestJob::RetryFactory(request, network_delegate);
   }
 };
@@ -543,7 +543,7 @@ class IfModifiedSinceJobFactory
  public:
   virtual net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const OVERRIDE {
+      net::NetworkDelegate* network_delegate) const override {
     return HttpHeadersRequestTestJob::IfModifiedSinceFactory(
         request, network_delegate);
   }
@@ -569,7 +569,7 @@ class IOThread : public base::Thread {
     request_context_->set_job_factory(job_factory_.get());
   }
 
-  virtual void Init() OVERRIDE {
+  virtual void Init() override {
     scoped_ptr<net::URLRequestJobFactoryImpl> factory(
         new net::URLRequestJobFactoryImpl());
     factory->SetProtocolHandler("http", new MockHttpServerJobFactory);
@@ -579,7 +579,7 @@ class IOThread : public base::Thread {
     request_context_->set_job_factory(job_factory_.get());
   }
 
-  virtual void CleanUp() OVERRIDE {
+  virtual void CleanUp() override {
     request_context_.reset();
     job_factory_.reset();
   }
@@ -3017,7 +3017,7 @@ class AppCacheUpdateJobTest : public testing::Test,
       group_->AddUpdateObserver(this);
   }
 
-  virtual void OnUpdateComplete(AppCacheGroup* group) OVERRIDE {
+  virtual void OnUpdateComplete(AppCacheGroup* group) override {
     ASSERT_EQ(group_.get(), group);
     protect_newest_cache_ = group->newest_complete_cache();
     UpdateFinished();