Linux/ChromeOS Chromium style checker cleanup, webkit/ edition.

Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.

BUG=115047

Review URL: https://chromiumcodereview.appspot.com/12225038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181219 0039d316-1c4b-4281-b951-d872f2087c98

50 files changed, 255 insertions, 216 deletions

diff --git a/webkit/appcache/appcache_disk_cache.cc b/webkit/appcache/appcache_disk_cache.cc
index 7b8e699..025c9b5 100644
--- a/webkit/appcache/appcache_disk_cache.cc
+++ b/webkit/appcache/appcache_disk_cache.cc
@@ -56,7 +56,7 @@ class AppCacheDiskCache::EntryImpl : public Entry {
 
   // Entry implementation.
   virtual int Read(int index, int64 offset, net::IOBuffer* buf, int buf_len,
-                   const net::CompletionCallback& callback) {
+                   const net::CompletionCallback& callback) OVERRIDE {
     if (offset < 0 || offset > kint32max)
       return net::ERR_INVALID_ARGUMENT;
     return disk_cache_entry_->ReadData(
@@ -64,7 +64,7 @@ class AppCacheDiskCache::EntryImpl : public Entry {
   }
 
   virtual int Write(int index, int64 offset, net::IOBuffer* buf, int buf_len,
-                    const net::CompletionCallback& callback) {
+                    const net::CompletionCallback& callback) OVERRIDE {
     if (offset < 0 || offset > kint32max)
       return net::ERR_INVALID_ARGUMENT;
     const bool kTruncate = true;
@@ -72,11 +72,11 @@ class AppCacheDiskCache::EntryImpl : public Entry {
         index, static_cast<int>(offset), buf, buf_len, callback, kTruncate);
   }
 
-  virtual int64 GetSize(int index) {
+  virtual int64 GetSize(int index) OVERRIDE {
     return disk_cache_entry_->GetDataSize(index);
   }
 
-  virtual void Close() {
+  virtual void Close() OVERRIDE {
     disk_cache_entry_->Close();
     delete this;
   }
diff --git a/webkit/appcache/appcache_group.cc b/webkit/appcache/appcache_group.cc
index 1bc5a1f..80aea9e0 100644
--- a/webkit/appcache/appcache_group.cc
+++ b/webkit/appcache/appcache_group.cc
@@ -27,8 +27,8 @@ class AppCacheGroup::HostObserver : public AppCacheHost::Observer {
   explicit HostObserver(AppCacheGroup* group) : group_(group) {}
 
   // Methods for AppCacheHost::Observer.
-  void OnCacheSelectionComplete(AppCacheHost* host) {}  // N/A
-  void OnDestructionImminent(AppCacheHost* host) {
+  virtual void OnCacheSelectionComplete(AppCacheHost* host) OVERRIDE {}  // N/A
+  virtual void OnDestructionImminent(AppCacheHost* host) OVERRIDE {
     group_->HostDestructionImminent(host);
   }
  private:
diff --git a/webkit/appcache/appcache_group_unittest.cc b/webkit/appcache/appcache_group_unittest.cc
index a8459e3..7740fa8 100644
--- a/webkit/appcache/appcache_group_unittest.cc
+++ b/webkit/appcache/appcache_group_unittest.cc
@@ -23,35 +23,35 @@ class TestAppCacheFrontend : public appcache::AppCacheFrontend {
   }
 
   virtual void OnCacheSelected(
-      int host_id, const appcache::AppCacheInfo& info) {
+      int host_id, const appcache::AppCacheInfo& info) OVERRIDE {
     last_host_id_ = host_id;
     last_cache_id_ = info.cache_id;
     last_status_ = info.status;
   }
 
   virtual void OnStatusChanged(const std::vector<int>& host_ids,
-                               appcache::Status status) {
+                               appcache::Status status) OVERRIDE {
   }
 
   virtual void OnEventRaised(const std::vector<int>& host_ids,
-                             appcache::EventID event_id) {
+                             appcache::EventID event_id) OVERRIDE {
   }
 
   virtual void OnErrorEventRaised(const std::vector<int>& host_ids,
-                                  const std::string& message) {
+                                  const std::string& message) OVERRIDE {
   }
 
   virtual void OnProgressEventRaised(const std::vector<int>& host_ids,
                                      const GURL& url,
-                                     int num_total, int num_complete) {
+                                     int num_total, int num_complete) OVERRIDE {
   }
 
   virtual void OnLogMessage(int host_id, appcache::LogLevel log_level,
-                            const std::string& message) {
+                            const std::string& message) OVERRIDE {
   }
 
   virtual void OnContentBlocked(int host_id,
-                                const GURL& manifest_url) {
+                                const GURL& manifest_url) OVERRIDE {
   }
 
   int last_host_id_;
@@ -68,7 +68,7 @@ class TestUpdateObserver : public AppCacheGroup::UpdateObserver {
   TestUpdateObserver() : update_completed_(false), group_has_cache_(false) {
   }
 
-  virtual void OnUpdateComplete(AppCacheGroup* group) {
+  virtual void OnUpdateComplete(AppCacheGroup* group) OVERRIDE {
     update_completed_ = true;
     group_has_cache_ = group->HasCache();
   }
@@ -88,7 +88,7 @@ class TestAppCacheHost : public AppCacheHost {
         update_completed_(false) {
   }
 
-  virtual void OnUpdateComplete(AppCacheGroup* group) {
+  virtual void OnUpdateComplete(AppCacheGroup* group) OVERRIDE {
     update_completed_ = true;
   }
 
diff --git a/webkit/appcache/appcache_host_unittest.cc b/webkit/appcache/appcache_host_unittest.cc
index 32b569b..d55b2457 100644
--- a/webkit/appcache/appcache_host_unittest.cc
+++ b/webkit/appcache/appcache_host_unittest.cc
@@ -43,38 +43,41 @@ class AppCacheHostTest : public testing::Test {
     }
 
     virtual void OnCacheSelected(
-        int host_id, const appcache::AppCacheInfo& info) {
+        int host_id, const appcache::AppCacheInfo& info) OVERRIDE {
       last_host_id_ = host_id;
       last_cache_id_ = info.cache_id;
       last_status_ = info.status;
     }
 
     virtual void OnStatusChanged(const std::vector<int>& host_ids,
-                                 appcache::Status status) {
+                                 appcache::Status status) OVERRIDE {
       last_status_changed_ = status;
     }
 
     virtual void OnEventRaised(const std::vector<int>& host_ids,
-                               appcache::EventID event_id) {
+                               appcache::EventID event_id) OVERRIDE {
       last_event_id_ = event_id;
     }
 
     virtual void OnErrorEventRaised(const std::vector<int>& host_ids,
-                                    const std::string& message) {
+                                    const std::string& message) OVERRIDE {
       last_event_id_ = ERROR_EVENT;
     }
 
     virtual void OnProgressEventRaised(const std::vector<int>& host_ids,
                                        const GURL& url,
-                                       int num_total, int num_complete) {
+                                       int num_total,
+                                       int num_complete) OVERRIDE {
       last_event_id_ = PROGRESS_EVENT;
     }
 
-    virtual void OnLogMessage(int host_id, appcache::LogLevel log_level,
-                              const std::string& message) {
+    virtual void OnLogMessage(int host_id,
+                              appcache::LogLevel log_level,
+                              const std::string& message) OVERRIDE {
     }
 
-    virtual void OnContentBlocked(int host_id, const GURL& manifest_url) {
+    virtual void OnContentBlocked(int host_id,
+                                  const GURL& manifest_url) OVERRIDE {
       content_blocked_ = true;
     }
 
@@ -91,20 +94,20 @@ class AppCacheHostTest : public testing::Test {
     MockQuotaManagerProxy() : QuotaManagerProxy(NULL, NULL) {}
 
     // Not needed for our tests.
-    virtual void RegisterClient(quota::QuotaClient* client) {}
+    virtual void RegisterClient(quota::QuotaClient* client) OVERRIDE {}
     virtual void NotifyStorageAccessed(quota::QuotaClient::ID client_id,
                                        const GURL& origin,
-                                       quota::StorageType type) {}
+                                       quota::StorageType type) OVERRIDE {}
     virtual void NotifyStorageModified(quota::QuotaClient::ID client_id,
                                        const GURL& origin,
                                        quota::StorageType type,
-                                       int64 delta) {}
+                                       int64 delta) OVERRIDE {}
 
-    virtual void NotifyOriginInUse(const GURL& origin) {
+    virtual void NotifyOriginInUse(const GURL& origin) OVERRIDE {
       inuse_[origin] += 1;
     }
 
-    virtual void NotifyOriginNoLongerInUse(const GURL& origin) {
+    virtual void NotifyOriginNoLongerInUse(const GURL& origin) OVERRIDE {
       inuse_[origin] -= 1;
     }
 
diff --git a/webkit/appcache/appcache_request_handler_unittest.cc b/webkit/appcache/appcache_request_handler_unittest.cc
index 2abb0f4..2a0d37e 100644
--- a/webkit/appcache/appcache_request_handler_unittest.cc
+++ b/webkit/appcache/appcache_request_handler_unittest.cc
@@ -34,25 +34,30 @@ class AppCacheRequestHandlerTest : public testing::Test {
   class MockFrontend : public AppCacheFrontend {
    public:
     virtual void OnCacheSelected(
-        int host_id, const appcache::AppCacheInfo& info) {}
+        int host_id, const appcache::AppCacheInfo& info) OVERRIDE {}
 
     virtual void OnStatusChanged(const std::vector<int>& host_ids,
-                                 appcache::Status status) {}
+                                 appcache::Status status) OVERRIDE {}
 
     virtual void OnEventRaised(const std::vector<int>& host_ids,
-                               appcache::EventID event_id) {}
+                               appcache::EventID event_id) OVERRIDE {}
 
     virtual void OnErrorEventRaised(const std::vector<int>& host_ids,
-                                    const std::string& message) {}
+                                    const std::string& message) OVERRIDE {}
 
     virtual void OnProgressEventRaised(const std::vector<int>& host_ids,
                                        const GURL& url,
-                                       int num_total, int num_complete) {}
+                                       int num_total,
+                                       int num_complete) OVERRIDE {
+    }
 
-    virtual void OnLogMessage(int host_id, appcache::LogLevel log_level,
-                              const std::string& message) {}
+    virtual void OnLogMessage(int host_id,
+                              appcache::LogLevel log_level,
+                              const std::string& message) OVERRIDE {
+    }
 
-    virtual void OnContentBlocked(int host_id, const GURL& manifest_url) {}
+    virtual void OnContentBlocked(int host_id,
+                                  const GURL& manifest_url) OVERRIDE {}
   };
 
   // Helper callback to run a test on our io_thread. The io_thread is spun up
@@ -67,8 +72,10 @@ class AppCacheRequestHandlerTest : public testing::Test {
   // exercise fallback code paths.
 
   class MockURLRequestDelegate : public net::URLRequest::Delegate {
-    virtual void OnResponseStarted(net::URLRequest* request) {}
-    virtual void OnReadCompleted(net::URLRequest* request, int bytes_read) {}
+    virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE {}
+    virtual void OnReadCompleted(net::URLRequest* request,
+                                 int bytes_read) OVERRIDE {
+    }
   };
 
   class MockURLRequestJob : public net::URLRequestJob {
diff --git a/webkit/appcache/appcache_response.cc b/webkit/appcache/appcache_response.cc
index b60d387..30ae5cd 100644
--- a/webkit/appcache/appcache_response.cc
+++ b/webkit/appcache/appcache_response.cc
@@ -37,7 +37,7 @@ class WrappedPickleIOBuffer : public net::WrappedIOBuffer {
   }
 
  private:
-  ~WrappedPickleIOBuffer() {}
+  virtual ~WrappedPickleIOBuffer() {}
 
   scoped_ptr<const Pickle> pickle_;
 };
diff --git a/webkit/appcache/appcache_response_unittest.cc b/webkit/appcache/appcache_response_unittest.cc
index db0cc31..f0d3d5c 100644
--- a/webkit/appcache/appcache_response_unittest.cc
+++ b/webkit/appcache/appcache_response_unittest.cc
@@ -42,7 +42,7 @@ class AppCacheResponseTest : public testing::Test {
     }
 
     virtual void OnResponseInfoLoaded(AppCacheResponseInfo* info,
-                                      int64 response_id) {
+                                      int64 response_id) OVERRIDE {
       loaded_info_ = info;
       loaded_info_id_ = response_id;
       test_->ScheduleNextTask();
diff --git a/webkit/appcache/appcache_service.cc b/webkit/appcache/appcache_service.cc
index c455436..9b9972e 100644
--- a/webkit/appcache/appcache_service.cc
+++ b/webkit/appcache/appcache_service.cc
@@ -92,7 +92,7 @@ class AppCacheService::CanHandleOfflineHelper : AsyncHelper {
         first_party_(first_party) {
   }
 
-  virtual void Start() {
+  virtual void Start() OVERRIDE {
     AppCachePolicy* policy = service_->appcache_policy();
     if (policy && !policy->CanLoadAppCache(url_, first_party_)) {
       CallCallback(net::ERR_FAILED);
@@ -135,16 +135,16 @@ class AppCacheService::DeleteHelper : public AsyncHelper {
       : AsyncHelper(service, callback), manifest_url_(manifest_url) {
   }
 
-  virtual void Start() {
+  virtual void Start() OVERRIDE {
     service_->storage()->LoadOrCreateGroup(manifest_url_, this);
   }
 
  private:
   // AppCacheStorage::Delegate implementation.
   virtual void OnGroupLoaded(
-      appcache::AppCacheGroup* group, const GURL& manifest_url);
+      appcache::AppCacheGroup* group, const GURL& manifest_url) OVERRIDE;
   virtual void OnGroupMadeObsolete(
-      appcache::AppCacheGroup* group, bool success);
+      appcache::AppCacheGroup* group, bool success) OVERRIDE;
 
   GURL manifest_url_;
   DISALLOW_COPY_AND_ASSIGN(DeleteHelper);
@@ -179,18 +179,18 @@ class AppCacheService::DeleteOriginHelper : public AsyncHelper {
         num_caches_to_delete_(0), successes_(0), failures_(0) {
   }
 
-  virtual void Start() {
+  virtual void Start() OVERRIDE {
     // We start by listing all caches, continues in OnAllInfo().
     service_->storage()->GetAllInfo(this);
   }
 
  private:
   // AppCacheStorage::Delegate implementation.
-  virtual void OnAllInfo(AppCacheInfoCollection* collection);
+  virtual void OnAllInfo(AppCacheInfoCollection* collection) OVERRIDE;
   virtual void OnGroupLoaded(
-      appcache::AppCacheGroup* group, const GURL& manifest_url);
+      appcache::AppCacheGroup* group, const GURL& manifest_url) OVERRIDE;
   virtual void OnGroupMadeObsolete(
-      appcache::AppCacheGroup* group, bool success);
+      appcache::AppCacheGroup* group, bool success) OVERRIDE;
 
   void CacheCompleted(bool success);
 
@@ -270,13 +270,13 @@ class AppCacheService::GetInfoHelper : AsyncHelper {
       : AsyncHelper(service, callback), collection_(collection) {
   }
 
-  virtual void Start() {
+  virtual void Start() OVERRIDE {
     service_->storage()->GetAllInfo(this);
   }
 
  private:
   // AppCacheStorage::Delegate implementation.
-  virtual void OnAllInfo(AppCacheInfoCollection* collection);
+  virtual void OnAllInfo(AppCacheInfoCollection* collection) OVERRIDE;
 
   scoped_refptr<AppCacheInfoCollection> collection_;
 
@@ -308,11 +308,11 @@ class AppCacheService::CheckResponseHelper : AsyncHelper {
         amount_data_read_(0) {
   }
 
-  virtual void Start() {
+  virtual void Start() OVERRIDE {
     service_->storage()->LoadOrCreateGroup(manifest_url_, this);
   }
 
-  virtual void Cancel() {
+  virtual void Cancel() OVERRIDE {
     AppCacheHistograms::CountCheckResponseResult(
         AppCacheHistograms::CHECK_CANCELED);
     response_reader_.reset();
@@ -320,7 +320,8 @@ class AppCacheService::CheckResponseHelper : AsyncHelper {
   }
 
  private:
-  virtual void OnGroupLoaded(AppCacheGroup* group, const GURL& manifest_url);
+  virtual void OnGroupLoaded(AppCacheGroup* group,
+                             const GURL& manifest_url) OVERRIDE;
   void OnReadInfoComplete(int result);
   void OnReadDataComplete(int result);
 
diff --git a/webkit/appcache/appcache_storage_impl_unittest.cc b/webkit/appcache/appcache_storage_impl_unittest.cc
index 37ed315..f3b2d77 100644
--- a/webkit/appcache/appcache_storage_impl_unittest.cc
+++ b/webkit/appcache/appcache_storage_impl_unittest.cc
@@ -65,13 +65,14 @@ class AppCacheStorageImplTest : public testing::Test {
           found_cache_id_(kNoCacheId), test_(test) {
     }
 
-    void OnCacheLoaded(AppCache* cache, int64 cache_id) {
+    virtual void OnCacheLoaded(AppCache* cache, int64 cache_id) OVERRIDE {
       loaded_cache_ = cache;
       loaded_cache_id_ = cache_id;
       test_->ScheduleNextTask();
     }
 
-    void OnGroupLoaded(AppCacheGroup* group, const GURL& manifest_url) {
+    virtual void OnGroupLoaded(AppCacheGroup* group,
+                               const GURL& manifest_url) OVERRIDE {
       loaded_group_ = group;
       loaded_manifest_url_ = manifest_url;
       loaded_groups_newest_cache_ = group ? group->newest_complete_cache()
@@ -79,26 +80,29 @@ class AppCacheStorageImplTest : public testing::Test {
       test_->ScheduleNextTask();
     }
 
-    void OnGroupAndNewestCacheStored(
+    virtual void OnGroupAndNewestCacheStored(
         AppCacheGroup* group, AppCache* newest_cache, bool success,
-        bool would_exceed_quota) {
+        bool would_exceed_quota) OVERRIDE {
       stored_group_ = group;
       stored_group_success_ = success;
       would_exceed_quota_ = would_exceed_quota;
       test_->ScheduleNextTask();
     }
 
-    void OnGroupMadeObsolete(AppCacheGroup* group, bool success) {
+    virtual void OnGroupMadeObsolete(AppCacheGroup* group,
+                                     bool success) OVERRIDE {
       obsoleted_group_ = group;
       obsoleted_success_ = success;
       test_->ScheduleNextTask();
     }
 
-    void OnMainResponseFound(const GURL& url, const AppCacheEntry& entry,
-                             const GURL& namespace_entry_url,
-                             const AppCacheEntry& fallback_entry,
-                             int64 cache_id, int64 group_id,
-                             const GURL& manifest_url) {
+    virtual void OnMainResponseFound(const GURL& url,
+                                     const AppCacheEntry& entry,
+                                     const GURL& namespace_entry_url,
+                                     const AppCacheEntry& fallback_entry,
+                                     int64 cache_id,
+                                     int64 group_id,
+                                     const GURL& manifest_url) OVERRIDE {
       found_url_ = url;
       found_entry_ = entry;
       found_namespace_entry_url_ = namespace_entry_url;
@@ -139,7 +143,8 @@ class AppCacheStorageImplTest : public testing::Test {
         async_(false) {}
 
     virtual void GetUsageAndQuota(
-        const GURL& origin, quota::StorageType type,
+        const GURL& origin,
+        quota::StorageType type,
         const GetUsageAndQuotaCallback& callback) OVERRIDE {
       EXPECT_EQ(kOrigin, origin);
       EXPECT_EQ(quota::kStorageTypeTemporary, type);
@@ -261,7 +266,8 @@ class AppCacheStorageImplTest : public testing::Test {
   void SetUpTest() {
     DCHECK(MessageLoop::current() == io_thread->message_loop());
     service_.reset(new AppCacheService(NULL));
-    service_->Initialize(base::FilePath(), db_thread->message_loop_proxy(), NULL);
+    service_->Initialize(
+        base::FilePath(), db_thread->message_loop_proxy(), NULL);
     mock_quota_manager_proxy_ = new MockQuotaManagerProxy();
     service_->quota_manager_proxy_ = mock_quota_manager_proxy_;
     delegate_.reset(new MockStorageDelegate(this));
diff --git a/webkit/appcache/appcache_update_job_unittest.cc b/webkit/appcache/appcache_update_job_unittest.cc
index 6873569..62cb7f2 100644
--- a/webkit/appcache/appcache_update_job_unittest.cc
+++ b/webkit/appcache/appcache_update_job_unittest.cc
@@ -197,7 +197,8 @@ class MockHttpServerJobFactory
     : public net::URLRequestJobFactory::ProtocolHandler {
  public:
   virtual net::URLRequestJob* MaybeCreateJob(
-      net::URLRequest* request, net::NetworkDelegate* network_delegate) const {
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate) const OVERRIDE {
     return MockHttpServer::JobFactory(request, network_delegate);
   }
 };
@@ -219,15 +220,15 @@ class MockFrontend : public AppCacheFrontend {
   }
 
   virtual void OnCacheSelected(
-      int host_id, const appcache::AppCacheInfo& info) {
+      int host_id, const appcache::AppCacheInfo& info) OVERRIDE {
   }
 
   virtual void OnStatusChanged(const std::vector<int>& host_ids,
-                               Status status) {
+                               Status status) OVERRIDE {
   }
 
   virtual void OnEventRaised(const std::vector<int>& host_ids,
-                             EventID event_id) {
+                             EventID event_id) OVERRIDE {
     raised_events_.push_back(RaisedEvent(host_ids, event_id));
 
     // Trigger additional updates if requested.
@@ -243,14 +244,15 @@ class MockFrontend : public AppCacheFrontend {
   }
 
   virtual void OnErrorEventRaised(const std::vector<int>& host_ids,
-                                  const std::string& message) {
+                                  const std::string& message) OVERRIDE {
     error_message_ = message;
     OnEventRaised(host_ids, ERROR_EVENT);
   }
 
   virtual void OnProgressEventRaised(const std::vector<int>& host_ids,
                                      const GURL& url,
-                                     int num_total, int num_complete) {
+                                     int num_total,
+                                     int num_complete) OVERRIDE {
     if (!ignore_progress_events_)
       OnEventRaised(host_ids, PROGRESS_EVENT);
 
@@ -278,11 +280,13 @@ class MockFrontend : public AppCacheFrontend {
     }
   }
 
-  virtual void OnLogMessage(int host_id, appcache::LogLevel log_level,
-                            const std::string& message) {
+  virtual void OnLogMessage(int host_id,
+                            appcache::LogLevel log_level,
+                            const std::string& message) OVERRIDE {
   }
 
-  virtual void OnContentBlocked(int host_id, const GURL& manifest_url) {
+  virtual void OnContentBlocked(int host_id,
+                                const GURL& manifest_url) OVERRIDE {
   }
 
   void AddExpectedEvent(const std::vector<int>& host_ids, EventID event_id) {
@@ -340,7 +344,8 @@ class MockFrontend : public AppCacheFrontend {
 class RedirectFactory : public net::URLRequestJobFactory::ProtocolHandler {
  public:
   virtual net::URLRequestJob* MaybeCreateJob(
-      net::URLRequest* request, net::NetworkDelegate* network_delegate) const {
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate) const OVERRIDE {
     return new net::URLRequestTestJob(
         request,
         network_delegate,
@@ -392,10 +397,10 @@ class RetryRequestTestJob : public net::URLRequestTestJob {
     }
   }
 
-  virtual int GetResponseCode() const { return response_code_; }
+  virtual int GetResponseCode() const OVERRIDE { return response_code_; }
 
  private:
-  ~RetryRequestTestJob() {}
+  virtual ~RetryRequestTestJob() {}
 
   static std::string retry_headers() {
     const char no_retry_after[] =
@@ -455,7 +460,8 @@ class RetryRequestTestJobFactory
     : public net::URLRequestJobFactory::ProtocolHandler {
  public:
   virtual net::URLRequestJob* MaybeCreateJob(
-      net::URLRequest* request, net::NetworkDelegate* network_delegate) const {
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate) const OVERRIDE {
     return RetryRequestTestJob::RetryFactory(request, network_delegate);
   }
 };
@@ -534,7 +540,8 @@ class IfModifiedSinceJobFactory
     : public net::URLRequestJobFactory::ProtocolHandler {
  public:
   virtual net::URLRequestJob* MaybeCreateJob(
-      net::URLRequest* request, net::NetworkDelegate* network_delegate) const {
+      net::URLRequest* request,
+      net::NetworkDelegate* network_delegate) const OVERRIDE {
     return HttpHeadersRequestTestJob::IfModifiedSinceFactory(
         request, network_delegate);
   }
@@ -546,7 +553,7 @@ class IOThread : public base::Thread {
       : base::Thread(name) {
   }
 
-  ~IOThread() {
+  virtual ~IOThread() {
     Stop();
   }
 
@@ -560,7 +567,7 @@ class IOThread : public base::Thread {
     request_context_->set_job_factory(job_factory_.get());
   }
 
-  virtual void Init() {
+  virtual void Init() OVERRIDE {
     scoped_ptr<net::URLRequestJobFactoryImpl> factory(
         new net::URLRequestJobFactoryImpl());
     factory->SetProtocolHandler("http", new MockHttpServerJobFactory);
@@ -570,7 +577,7 @@ class IOThread : public base::Thread {
     request_context_->set_job_factory(job_factory_.get());
   }
 
-  virtual void CleanUp() {
+  virtual void CleanUp() OVERRIDE {
     request_context_.reset();
     job_factory_.reset();
   }
@@ -2928,7 +2935,7 @@ class AppCacheUpdateJobTest : public testing::Test,
       group_->AddUpdateObserver(this);
   }
 
-  void OnUpdateComplete(AppCacheGroup* group) {
+  virtual void OnUpdateComplete(AppCacheGroup* group) OVERRIDE {
     ASSERT_EQ(group_, group);
     protect_newest_cache_ = group->newest_complete_cache();
     UpdateFinished();
diff --git a/webkit/appcache/appcache_url_request_job_unittest.cc b/webkit/appcache/appcache_url_request_job_unittest.cc
index 400998b..5001cea 100644
--- a/webkit/appcache/appcache_url_request_job_unittest.cc
+++ b/webkit/appcache/appcache_url_request_job_unittest.cc
@@ -48,7 +48,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
     }
 
     virtual void OnResponseInfoLoaded(AppCacheResponseInfo* info,
-                                      int64 response_id) {
+                                      int64 response_id) OVERRIDE {
       loaded_info_ = info;
       loaded_info_id_ = response_id;
       test_->ScheduleNextTask();
@@ -68,7 +68,7 @@ class AppCacheURLRequestJobTest : public testing::Test {
           kill_after_amount_received_(0), kill_with_io_pending_(false) {
     }
 
-    virtual void OnResponseStarted(net::URLRequest* request) {
+    virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE {
       amount_received_ = 0;
       did_receive_headers_ = false;
       if (request->status().is_success()) {
@@ -81,7 +81,8 @@ class AppCacheURLRequestJobTest : public testing::Test {
       }
     }
 
-    virtual void OnReadCompleted(net::URLRequest* request, int bytes_read) {
+    virtual void OnReadCompleted(net::URLRequest* request,
+                                 int bytes_read) OVERRIDE {
       if (bytes_read > 0) {
         amount_received_ += bytes_read;
 
diff --git a/webkit/appcache/mock_appcache_storage_unittest.cc b/webkit/appcache/mock_appcache_storage_unittest.cc
index f230db2..b82f831 100644
--- a/webkit/appcache/mock_appcache_storage_unittest.cc
+++ b/webkit/appcache/mock_appcache_storage_unittest.cc
@@ -21,33 +21,37 @@ class MockAppCacheStorageTest : public testing::Test {
           obsoleted_success_(false), found_cache_id_(kNoCacheId) {
     }
 
-    void OnCacheLoaded(AppCache* cache, int64 cache_id) {
+    virtual void OnCacheLoaded(AppCache* cache, int64 cache_id) OVERRIDE {
       loaded_cache_ = cache;
       loaded_cache_id_ = cache_id;
     }
 
-    void OnGroupLoaded(AppCacheGroup* group, const GURL& manifest_url) {
+    virtual void OnGroupLoaded(AppCacheGroup* group,
+                               const GURL& manifest_url) OVERRIDE {
       loaded_group_ = group;
       loaded_manifest_url_ = manifest_url;
     }
 
-    void OnGroupAndNewestCacheStored(
+    virtual void OnGroupAndNewestCacheStored(
         AppCacheGroup* group, AppCache* newest_cache, bool success,
-        bool would_exceed_quota) {
+        bool would_exceed_quota) OVERRIDE {
       stored_group_ = group;
       stored_group_success_ = success;
     }
 
-    void OnGroupMadeObsolete(AppCacheGroup* group, bool success) {
+    virtual void OnGroupMadeObsolete(AppCacheGroup* group,
+                                     bool success) OVERRIDE {
       obsoleted_group_ = group;
       obsoleted_success_ = success;
     }
 
-    void OnMainResponseFound(const GURL& url, const AppCacheEntry& entry,
-                             const GURL& fallback_url,
-                             const AppCacheEntry& fallback_entry,
-                             int64 cache_id, int64 group_id,
-                             const GURL& manifest_url) {
+    virtual void OnMainResponseFound(const GURL& url,
+                                     const AppCacheEntry& entry,
+                                     const GURL& fallback_url,
+                                     const AppCacheEntry& fallback_entry,
+                                     int64 cache_id,
+                                     int64 group_id,
+                                     const GURL& manifest_url) OVERRIDE {
       found_url_ = url;
       found_entry_ = entry;
       found_fallback_url_ = fallback_url;
diff --git a/webkit/appcache/view_appcache_internals_job.cc b/webkit/appcache/view_appcache_internals_job.cc
index 995df05..89a2622 100644
--- a/webkit/appcache/view_appcache_internals_job.cc
+++ b/webkit/appcache/view_appcache_internals_job.cc
@@ -331,7 +331,7 @@ class MainPageJob : public BaseInternalsJob {
         ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   }
 
-  virtual void Start() {
+  virtual void Start() OVERRIDE {
     DCHECK(request_);
     info_collection_ = new AppCacheInfoCollection;
     appcache_service_->GetAllAppCacheInfo(
@@ -400,7 +400,8 @@ class RedirectToMainPageJob : public BaseInternalsJob {
     return net::OK;  // IsRedirectResponse induces a redirect.
   }
 
-  virtual bool IsRedirectResponse(GURL* location, int* http_status_code) {
+  virtual bool IsRedirectResponse(GURL* location,
+                                  int* http_status_code) OVERRIDE {
     *location = ClearQuery(request_->url());
     *http_status_code = 307;
     return true;
@@ -423,7 +424,7 @@ class RemoveAppCacheJob : public RedirectToMainPageJob {
         ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   }
 
-  virtual void Start() {
+  virtual void Start() OVERRIDE {
     DCHECK(request_);
 
     appcache_service_->DeleteAppCacheGroup(
@@ -455,7 +456,7 @@ class ViewAppCacheJob : public BaseInternalsJob,
       : BaseInternalsJob(request, network_delegate, service),
         manifest_url_(manifest_url) {}
 
-  virtual void Start() {
+  virtual void Start() OVERRIDE {
     DCHECK(request_);
     appcache_service_->storage()->LoadOrCreateGroup(manifest_url_, this);
   }
@@ -530,7 +531,7 @@ class ViewEntryJob : public BaseInternalsJob,
         response_id_(response_id), group_id_(group_id), amount_read_(0) {
   }
 
-  virtual void Start() {
+  virtual void Start() OVERRIDE {
     DCHECK(request_);
     appcache_service_->storage()->LoadResponseInfo(
         manifest_url_, group_id_, response_id_, this);
diff --git a/webkit/blob/blob_url_request_job_unittest.cc b/webkit/blob/blob_url_request_job_unittest.cc
index 8b07a4f..da20cd9 100644
--- a/webkit/blob/blob_url_request_job_unittest.cc
+++ b/webkit/blob/blob_url_request_job_unittest.cc
@@ -58,7 +58,7 @@ class BlobURLRequestJobTest : public testing::Test {
     MockURLRequestDelegate()
         : received_data_(new net::IOBuffer(kBufferSize)) {}
 
-    virtual void OnResponseStarted(net::URLRequest* request) {
+    virtual void OnResponseStarted(net::URLRequest* request) OVERRIDE {
       if (request->status().is_success()) {
         EXPECT_TRUE(request->response_headers());
         ReadSome(request);
@@ -67,7 +67,8 @@ class BlobURLRequestJobTest : public testing::Test {
       }
     }
 
-    virtual void OnReadCompleted(net::URLRequest* request, int bytes_read) {
+    virtual void OnReadCompleted(net::URLRequest* request,
+                                 int bytes_read) OVERRIDE {
        if (bytes_read > 0)
          ReceiveData(request, bytes_read);
        else
@@ -139,7 +140,7 @@ class BlobURLRequestJobTest : public testing::Test {
         expected_status_code_(0) {
   }
 
-  void SetUp() {
+  virtual void SetUp() {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
     temp_file1_ = temp_dir_.path().AppendASCII("BlobFile1.dat");
@@ -163,7 +164,7 @@ class BlobURLRequestJobTest : public testing::Test {
     url_request_context_.set_job_factory(&url_request_job_factory_);
   }
 
-  void TearDown() {
+  virtual void TearDown() {
   }
 
   void SetUpFileSystem() {
diff --git a/webkit/database/database_tracker_unittest.cc b/webkit/database/database_tracker_unittest.cc
index e3e3738..3a16141 100644
--- a/webkit/database/database_tracker_unittest.cc
+++ b/webkit/database/database_tracker_unittest.cc
@@ -41,7 +41,7 @@ class TestObserver : public webkit_database::DatabaseTracker::Observer {
   virtual ~TestObserver() {}
   virtual void OnDatabaseSizeChanged(const string16& origin_identifier,
                                      const string16& database_name,
-                                     int64 database_size) {
+                                     int64 database_size) OVERRIDE {
     if (!observe_size_changes_)
       return;
     new_notification_received_ = true;
@@ -49,8 +49,9 @@ class TestObserver : public webkit_database::DatabaseTracker::Observer {
     database_name_ = database_name;
     database_size_ = database_size;
   }
-  virtual void OnDatabaseScheduledForDeletion(const string16& origin_identifier,
-                                              const string16& database_name) {
+  virtual void OnDatabaseScheduledForDeletion(
+      const string16& origin_identifier,
+      const string16& database_name) OVERRIDE {
     if (!observe_scheduled_deletions_)
       return;
     new_notification_received_ = true;
@@ -95,14 +96,14 @@ class TestQuotaManagerProxy : public quota::QuotaManagerProxy {
         registered_client_(NULL) {
   }
 
-  virtual void RegisterClient(quota::QuotaClient* client) {
+  virtual void RegisterClient(quota::QuotaClient* client) OVERRIDE {
     EXPECT_FALSE(registered_client_);
     registered_client_ = client;
   }
 
   virtual void NotifyStorageAccessed(quota::QuotaClient::ID client_id,
                                      const GURL& origin,
-                                     quota::StorageType type) {
+                                     quota::StorageType type) OVERRIDE {
     EXPECT_EQ(quota::QuotaClient::kDatabase, client_id);
     EXPECT_EQ(quota::kStorageTypeTemporary, type);
     accesses_[origin] += 1;
@@ -111,7 +112,7 @@ class TestQuotaManagerProxy : public quota::QuotaManagerProxy {
   virtual void NotifyStorageModified(quota::QuotaClient::ID client_id,
                                      const GURL& origin,
                                      quota::StorageType type,
-                                     int64 delta) {
+                                     int64 delta) OVERRIDE {
     EXPECT_EQ(quota::QuotaClient::kDatabase, client_id);
     EXPECT_EQ(quota::kStorageTypeTemporary, type);
     modifications_[origin].first += 1;
@@ -119,8 +120,8 @@ class TestQuotaManagerProxy : public quota::QuotaManagerProxy {
   }
 
   // Not needed for our tests.
-  virtual void NotifyOriginInUse(const GURL& origin) {}
-  virtual void NotifyOriginNoLongerInUse(const GURL& origin) {}
+  virtual void NotifyOriginInUse(const GURL& origin) OVERRIDE {}
+  virtual void NotifyOriginNoLongerInUse(const GURL& origin) OVERRIDE {}
 
   void SimulateQuotaManagerDestroyed() {
     if (registered_client_) {
diff --git a/webkit/fileapi/file_system_context_unittest.cc b/webkit/fileapi/file_system_context_unittest.cc
index 0c13501..7e82118 100644
--- a/webkit/fileapi/file_system_context_unittest.cc
+++ b/webkit/fileapi/file_system_context_unittest.cc
@@ -43,7 +43,7 @@ class FileSystemContextTest : public testing::Test {
  public:
   FileSystemContextTest() {}
 
-  void SetUp() {
+  virtual void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
 
     storage_policy_ = new quota::MockSpecialStoragePolicy();
diff --git a/webkit/fileapi/file_system_file_util_unittest.cc b/webkit/fileapi/file_system_file_util_unittest.cc
index 9e12299..f42b6eb 100644
--- a/webkit/fileapi/file_system_file_util_unittest.cc
+++ b/webkit/fileapi/file_system_file_util_unittest.cc
@@ -32,7 +32,7 @@ class FileSystemFileUtilTest : public testing::Test {
   FileSystemFileUtilTest() {
   }
 
-  void SetUp() {
+  virtual void SetUp() {
   }
 
   FileSystemOperationContext* NewContext(
diff --git a/webkit/fileapi/file_system_mount_point_provider_unittest.cc b/webkit/fileapi/file_system_mount_point_provider_unittest.cc
index e3abb47..c6f1c21 100644
--- a/webkit/fileapi/file_system_mount_point_provider_unittest.cc
+++ b/webkit/fileapi/file_system_mount_point_provider_unittest.cc
@@ -205,7 +205,7 @@ class FileSystemMountPointProviderTest : public testing::Test {
       : ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   }
 
-  void SetUp() {
+  virtual void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
     special_storage_policy_ = new quota::MockSpecialStoragePolicy;
   }
diff --git a/webkit/fileapi/file_system_quota_client_unittest.cc b/webkit/fileapi/file_system_quota_client_unittest.cc
index 8859ddd..7de2d9f 100644
--- a/webkit/fileapi/file_system_quota_client_unittest.cc
+++ b/webkit/fileapi/file_system_quota_client_unittest.cc
@@ -45,7 +45,7 @@ class FileSystemQuotaClientTest : public testing::Test {
         deletion_status_(quota::kQuotaStatusUnknown) {
   }
 
-  void SetUp() {
+  virtual void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
     file_system_context_ =
         new FileSystemContext(
diff --git a/webkit/fileapi/file_system_usage_cache_unittest.cc b/webkit/fileapi/file_system_usage_cache_unittest.cc
index edc4457..eecccc0 100644
--- a/webkit/fileapi/file_system_usage_cache_unittest.cc
+++ b/webkit/fileapi/file_system_usage_cache_unittest.cc
@@ -15,7 +15,7 @@ class FileSystemUsageCacheTest : public testing::Test {
  public:
   FileSystemUsageCacheTest() {}
 
-  void SetUp() {
+  virtual void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
   }
 
diff --git a/webkit/fileapi/isolated_context_unittest.cc b/webkit/fileapi/isolated_context_unittest.cc
index c2c9537..15f10f8 100644
--- a/webkit/fileapi/isolated_context_unittest.cc
+++ b/webkit/fileapi/isolated_context_unittest.cc
@@ -48,7 +48,7 @@ class IsolatedContextTest : public testing::Test {
       fileset_.insert(kTestPaths[i].NormalizePathSeparators());
   }
 
-  void SetUp() {
+  virtual void SetUp() {
     IsolatedContext::FileInfoSet files;
     for (size_t i = 0; i < arraysize(kTestPaths); ++i) {
       std::string name;
@@ -61,7 +61,7 @@ class IsolatedContextTest : public testing::Test {
     ASSERT_FALSE(id_.empty());
   }
 
-  void TearDown() {
+  virtual void TearDown() {
     IsolatedContext::GetInstance()->RemoveReference(id_);
   }
 
diff --git a/webkit/fileapi/isolated_file_util_unittest.cc b/webkit/fileapi/isolated_file_util_unittest.cc
index 4652372..448cbef 100644
--- a/webkit/fileapi/isolated_file_util_unittest.cc
+++ b/webkit/fileapi/isolated_file_util_unittest.cc
@@ -68,7 +68,7 @@ class IsolatedFileUtilTest : public testing::Test {
   IsolatedFileUtilTest()
       : other_file_util_helper_(GURL("http://foo/"), kFileSystemTypeTest) {}
 
-  void SetUp() {
+  virtual void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(partition_dir_.CreateUniqueTempDir());
     file_util_.reset(new DraggedFileUtil());
@@ -91,7 +91,7 @@ class IsolatedFileUtilTest : public testing::Test {
     isolated_context()->AddReference(filesystem_id_);
   }
 
-  void TearDown() {
+  virtual void TearDown() {
     isolated_context()->RemoveReference(filesystem_id_);
     other_file_util_helper_.TearDown();
   }
diff --git a/webkit/fileapi/local_file_util.cc b/webkit/fileapi/local_file_util.cc
index 4b533c9..57454eb 100644
--- a/webkit/fileapi/local_file_util.cc
+++ b/webkit/fileapi/local_file_util.cc
@@ -32,7 +32,7 @@ class LocalFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
 #endif  // defined(OS_WIN)
   }
 
-  ~LocalFileEnumerator() {}
+  virtual ~LocalFileEnumerator() {}
 
   virtual base::FilePath Next() OVERRIDE;
   virtual int64 Size() OVERRIDE;
diff --git a/webkit/fileapi/local_file_util_unittest.cc b/webkit/fileapi/local_file_util_unittest.cc
index fc3175a..0d7df03 100644
--- a/webkit/fileapi/local_file_util_unittest.cc
+++ b/webkit/fileapi/local_file_util_unittest.cc
@@ -28,12 +28,12 @@ class LocalFileUtilTest : public testing::Test {
   LocalFileUtilTest()
       : test_helper_(GURL("http://foo/"), kFileSystemTypeTest) {}
 
-  void SetUp() {
+  virtual void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
     test_helper_.SetUp(data_dir_.path());
   }
 
-  void TearDown() {
+  virtual void TearDown() {
     test_helper_.TearDown();
   }
 
diff --git a/webkit/fileapi/media/native_media_file_util_unittest.cc b/webkit/fileapi/media/native_media_file_util_unittest.cc
index f98379b..71afc1c 100644
--- a/webkit/fileapi/media/native_media_file_util_unittest.cc
+++ b/webkit/fileapi/media/native_media_file_util_unittest.cc
@@ -104,7 +104,7 @@ class NativeMediaFileUtilTest : public testing::Test {
       : file_util_(NULL) {
   }
 
-  void SetUp() {
+  virtual void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(file_util::CreateDirectory(root_path()));
 
@@ -128,7 +128,7 @@ class NativeMediaFileUtilTest : public testing::Test {
     isolated_context()->AddReference(filesystem_id_);
   }
 
-  void TearDown() {
+  virtual void TearDown() {
     isolated_context()->RemoveReference(filesystem_id_);
     file_system_context_ = NULL;
   }
diff --git a/webkit/fileapi/native_file_util.cc b/webkit/fileapi/native_file_util.cc
index a794250..ff82e77 100644
--- a/webkit/fileapi/native_file_util.cc
+++ b/webkit/fileapi/native_file_util.cc
@@ -47,7 +47,7 @@ class NativeFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
 #endif  // defined(OS_WIN)
   }
 
-  ~NativeFileEnumerator() {}
+  virtual ~NativeFileEnumerator() {}
 
   virtual base::FilePath Next() OVERRIDE;
   virtual int64 Size() OVERRIDE;
diff --git a/webkit/fileapi/native_file_util_unittest.cc b/webkit/fileapi/native_file_util_unittest.cc
index 2121a3e..e395a57 100644
--- a/webkit/fileapi/native_file_util_unittest.cc
+++ b/webkit/fileapi/native_file_util_unittest.cc
@@ -14,7 +14,7 @@ class NativeFileUtilTest : public testing::Test {
  public:
   NativeFileUtilTest() {}
 
-  void SetUp() {
+  virtual void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
   }
 
diff --git a/webkit/fileapi/obfuscated_file_util.cc b/webkit/fileapi/obfuscated_file_util.cc
index 657eef1..b2a8462 100644
--- a/webkit/fileapi/obfuscated_file_util.cc
+++ b/webkit/fileapi/obfuscated_file_util.cc
@@ -214,7 +214,7 @@ class ObfuscatedOriginEnumerator
       origin_database->ListAllOrigins(&origins_);
   }
 
-  ~ObfuscatedOriginEnumerator() {}
+  virtual ~ObfuscatedOriginEnumerator() {}
 
   // Returns the next origin.  Returns empty if there are no more origins.
   virtual GURL Next() OVERRIDE {
diff --git a/webkit/fileapi/obfuscated_file_util_unittest.cc b/webkit/fileapi/obfuscated_file_util_unittest.cc
index a481c0c..ef0f2bc 100644
--- a/webkit/fileapi/obfuscated_file_util_unittest.cc
+++ b/webkit/fileapi/obfuscated_file_util_unittest.cc
@@ -106,7 +106,7 @@ class ObfuscatedFileUtilTest : public testing::Test {
         usage_(-1) {
   }
 
-  void SetUp() {
+  virtual void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
 
     scoped_refptr<quota::SpecialStoragePolicy> storage_policy =
@@ -135,7 +135,7 @@ class ObfuscatedFileUtilTest : public testing::Test {
     change_observers_ = MockFileChangeObserver::CreateList(&change_observer_);
   }
 
-  void TearDown() {
+  virtual void TearDown() {
     quota_manager_ = NULL;
     test_helper_.TearDown();
   }
diff --git a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc
index 9d51114..abdd2feb 100644
--- a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc
+++ b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc
@@ -22,7 +22,7 @@ namespace fileapi {
 
 class SandboxMountPointProviderOriginEnumeratorTest : public testing::Test {
  public:
-  void SetUp() {
+  virtual void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
     sandbox_provider_.reset(
         new SandboxMountPointProvider(
diff --git a/webkit/fileapi/syncable/syncable_file_system_unittest.cc b/webkit/fileapi/syncable/syncable_file_system_unittest.cc
index d2ad547..255a039 100644
--- a/webkit/fileapi/syncable/syncable_file_system_unittest.cc
+++ b/webkit/fileapi/syncable/syncable_file_system_unittest.cc
@@ -31,7 +31,7 @@ class SyncableFileSystemTest : public testing::Test {
                      base::MessageLoopProxy::current()),
         weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {}
 
-  void SetUp() {
+  virtual void SetUp() {
     file_system_.SetUp();
 
     sync_context_ = new LocalFileSyncContext(base::MessageLoopProxy::current(),
@@ -40,7 +40,7 @@ class SyncableFileSystemTest : public testing::Test {
               file_system_.MaybeInitializeFileSystemContext(sync_context_));
   }
 
-  void TearDown() {
+  virtual void TearDown() {
     if (sync_context_)
       sync_context_->ShutdownOnUIThread();
     sync_context_ = NULL;
diff --git a/webkit/fileapi/webfilewriter_base_unittest.cc b/webkit/fileapi/webfilewriter_base_unittest.cc
index 285efa9..828d904 100644
--- a/webkit/fileapi/webfilewriter_base_unittest.cc
+++ b/webkit/fileapi/webfilewriter_base_unittest.cc
@@ -65,7 +65,7 @@ class TestableFileWriter : public WebFileWriterBase {
   bool received_cancel_;
 
  protected:
-  virtual void DoTruncate(const GURL& path, int64 offset) {
+  virtual void DoTruncate(const GURL& path, int64 offset) OVERRIDE {
     received_truncate_ = true;
     received_truncate_path_ = path;
     received_truncate_offset_ = offset;
@@ -88,7 +88,7 @@ class TestableFileWriter : public WebFileWriterBase {
   }
 
   virtual void DoWrite(const GURL& path, const GURL& blob_url,
-                       int64 offset) {
+                       int64 offset) OVERRIDE {
     received_write_ = true;
     received_write_path_ = path;
     received_write_offset_ = offset;
@@ -121,7 +121,7 @@ class TestableFileWriter : public WebFileWriterBase {
     }
   }
 
-  virtual void DoCancel() {
+  virtual void DoCancel() OVERRIDE {
     received_cancel_ = true;
   }
 };
diff --git a/webkit/glue/cpp_binding_example.cc b/webkit/glue/cpp_binding_example.cc
index f487769..43b4ede 100644
--- a/webkit/glue/cpp_binding_example.cc
+++ b/webkit/glue/cpp_binding_example.cc
@@ -18,12 +18,12 @@ namespace {
 
 class PropertyCallbackExample : public CppBoundClass::PropertyCallback {
  public:
-  virtual bool GetValue(CppVariant* value) {
+  virtual bool GetValue(CppVariant* value) OVERRIDE {
     value->Set(value_);
     return true;
   }
 
-  virtual bool SetValue(const CppVariant& value) {
+  virtual bool SetValue(const CppVariant& value) OVERRIDE {
     value_.Set(value);
     return true;
   }
diff --git a/webkit/glue/cpp_bound_class.cc b/webkit/glue/cpp_bound_class.cc
index 28f9615..0e36a0d 100644
--- a/webkit/glue/cpp_bound_class.cc
+++ b/webkit/glue/cpp_bound_class.cc
@@ -32,11 +32,11 @@ class CppVariantPropertyCallback : public CppBoundClass::PropertyCallback {
  public:
   CppVariantPropertyCallback(CppVariant* value) : value_(value) { }
 
-  virtual bool GetValue(CppVariant* value) {
+  virtual bool GetValue(CppVariant* value) OVERRIDE {
     value->Set(*value_);
     return true;
   }
-  virtual bool SetValue(const CppVariant& value) {
+  virtual bool SetValue(const CppVariant& value) OVERRIDE {
     value_->Set(value);
     return true;
   }
@@ -50,12 +50,12 @@ public:
   GetterPropertyCallback(const CppBoundClass::GetterCallback& callback)
       : callback_(callback) { }
 
-  virtual bool GetValue(CppVariant* value) {
+  virtual bool GetValue(CppVariant* value) OVERRIDE {
     callback_.Run(value);
     return true;
   }
 
-  virtual bool SetValue(const CppVariant& value) {
+  virtual bool SetValue(const CppVariant& value) OVERRIDE {
     return false;
   }
 
diff --git a/webkit/glue/cpp_bound_class_unittest.cc b/webkit/glue/cpp_bound_class_unittest.cc
index a303d51..c1f5291 100644
--- a/webkit/glue/cpp_bound_class_unittest.cc
+++ b/webkit/glue/cpp_bound_class_unittest.cc
@@ -171,7 +171,7 @@ class CppBoundClassTest : public testing::Test, public WebKit::WebFrameClient {
 
 class CppBoundClassWithFallbackMethodTest : public CppBoundClassTest {
  protected:
-  virtual bool useFallback() {
+  virtual bool useFallback() OVERRIDE {
     return true;
   }
 };
diff --git a/webkit/glue/dom_serializer_unittest.cc b/webkit/glue/dom_serializer_unittest.cc
index de4f8a4..8144967 100644
--- a/webkit/glue/dom_serializer_unittest.cc
+++ b/webkit/glue/dom_serializer_unittest.cc
@@ -84,9 +84,9 @@ class DomSerializerTests : public TestShellTest,
     : local_directory_name_(FILE_PATH_LITERAL("./dummy_files/")) { }
 
   // DomSerializerDelegate.
-  void didSerializeDataForFrame(const WebURL& frame_web_url,
-                                const WebCString& data,
-                                PageSerializationStatus status) {
+  virtual void didSerializeDataForFrame(const WebURL& frame_web_url,
+                                        const WebCString& data,
+                                        PageSerializationStatus status) {
 
     GURL frame_url(frame_web_url);
     // If the all frames are finished saving, check all finish status
diff --git a/webkit/glue/resource_fetcher_unittest.cc b/webkit/glue/resource_fetcher_unittest.cc
index cd95878..786562a 100644
--- a/webkit/glue/resource_fetcher_unittest.cc
+++ b/webkit/glue/resource_fetcher_unittest.cc
@@ -185,7 +185,7 @@ class EvilFetcherDelegate : public FetcherDelegate {
   }
 
   virtual void OnURLFetchComplete(const WebURLResponse& response,
-                                  const std::string& data) {
+                                  const std::string& data) OVERRIDE {
     // Destroy the ResourceFetcher here.  We are testing that upon returning
     // to the ResourceFetcher that it does not crash.
     fetcher_.reset();
diff --git a/webkit/glue/websocketstreamhandle_impl.cc b/webkit/glue/websocketstreamhandle_impl.cc
index 8411869..b7a95e8 100644
--- a/webkit/glue/websocketstreamhandle_impl.cc
+++ b/webkit/glue/websocketstreamhandle_impl.cc
@@ -48,14 +48,16 @@ class WebSocketStreamHandleImpl::Context
   void Detach();
 
   // WebSocketStreamHandleDelegate methods:
-  virtual void DidOpenStream(WebSocketStreamHandle*, int);
-  virtual void DidSendData(WebSocketStreamHandle*, int);
-  virtual void DidReceiveData(WebSocketStreamHandle*, const char*, int);
-  virtual void DidClose(WebSocketStreamHandle*);
+  virtual void DidOpenStream(WebSocketStreamHandle*, int) OVERRIDE;
+  virtual void DidSendData(WebSocketStreamHandle*, int) OVERRIDE;
+  virtual void DidReceiveData(WebSocketStreamHandle*,
+                              const char*,
+                              int) OVERRIDE;
+  virtual void DidClose(WebSocketStreamHandle*) OVERRIDE;
 
  private:
   friend class base::RefCounted<Context>;
-  ~Context() {
+  virtual ~Context() {
     DCHECK(!handle_);
     DCHECK(!client_);
     DCHECK(!bridge_);
diff --git a/webkit/glue/weburlloader_impl.cc b/webkit/glue/weburlloader_impl.cc
index b64c6a9..c5838f9 100644
--- a/webkit/glue/weburlloader_impl.cc
+++ b/webkit/glue/weburlloader_impl.cc
@@ -291,26 +291,27 @@ class WebURLLoaderImpl::Context : public base::RefCounted<Context>,
       WebKitPlatformSupportImpl* platform);
 
   // ResourceLoaderBridge::Peer methods:
-  virtual void OnUploadProgress(uint64 position, uint64 size);
+  virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
   virtual bool OnReceivedRedirect(
       const GURL& new_url,
       const ResourceResponseInfo& info,
       bool* has_new_first_party_for_cookies,
-      GURL* new_first_party_for_cookies);
-  virtual void OnReceivedResponse(const ResourceResponseInfo& info);
-  virtual void OnDownloadedData(int len);
+      GURL* new_first_party_for_cookies) OVERRIDE;
+  virtual void OnReceivedResponse(const ResourceResponseInfo& info) OVERRIDE;
+  virtual void OnDownloadedData(int len) OVERRIDE;
   virtual void OnReceivedData(const char* data,
                               int data_length,
-                              int encoded_data_length);
-  virtual void OnReceivedCachedMetadata(const char* data, int len);
-  virtual void OnCompletedRequest(int error_code,
-                                  bool was_ignored_by_handler,
-                                  const std::string& security_info,
-                                  const base::TimeTicks& completion_time);
+                              int encoded_data_length) OVERRIDE;
+  virtual void OnReceivedCachedMetadata(const char* data, int len) OVERRIDE;
+  virtual void OnCompletedRequest(
+      int error_code,
+      bool was_ignored_by_handler,
+      const std::string& security_info,
+      const base::TimeTicks& completion_time) OVERRIDE;
 
  private:
   friend class base::RefCounted<Context>;
-  ~Context() {}
+  virtual ~Context() {}
 
   // We can optimize the handling of data URLs in most cases.
   bool CanHandleDataURL(const GURL& url) const;
diff --git a/webkit/quota/mock_quota_manager_unittest.cc b/webkit/quota/mock_quota_manager_unittest.cc
index c64138f..06edb06 100644
--- a/webkit/quota/mock_quota_manager_unittest.cc
+++ b/webkit/quota/mock_quota_manager_unittest.cc
@@ -39,7 +39,7 @@ class MockQuotaManagerTest : public testing::Test {
       deletion_callback_count_(0) {
   }
 
-  void SetUp() {
+  virtual void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
     policy_ = new MockSpecialStoragePolicy;
     manager_ = new MockQuotaManager(
@@ -50,7 +50,7 @@ class MockQuotaManagerTest : public testing::Test {
         policy_);
   }
 
-  void TearDown() {
+  virtual void TearDown() {
     // Make sure the quota manager cleans up correctly.
     manager_ = NULL;
     MessageLoop::current()->RunUntilIdle();
diff --git a/webkit/quota/quota_manager_unittest.cc b/webkit/quota/quota_manager_unittest.cc
index 0f800a2..fd65ef5 100644
--- a/webkit/quota/quota_manager_unittest.cc
+++ b/webkit/quota/quota_manager_unittest.cc
@@ -51,7 +51,7 @@ class QuotaManagerTest : public testing::Test {
         mock_time_counter_(0) {
   }
 
-  void SetUp() {
+  virtual void SetUp() {
     ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
     mock_special_storage_policy_ = new MockSpecialStoragePolicy;
     quota_manager_ = new QuotaManager(
@@ -67,7 +67,7 @@ class QuotaManagerTest : public testing::Test {
     additional_callback_count_ = 0;
   }
 
-  void TearDown() {
+  virtual void TearDown() {
     // Make sure the quota manager cleans up correctly.
     quota_manager_ = NULL;
     MessageLoop::current()->RunUntilIdle();
diff --git a/webkit/quota/quota_temporary_storage_evictor_unittest.cc b/webkit/quota/quota_temporary_storage_evictor_unittest.cc
index 21c1cf9..742150c 100644
--- a/webkit/quota/quota_temporary_storage_evictor_unittest.cc
+++ b/webkit/quota/quota_temporary_storage_evictor_unittest.cc
@@ -145,7 +145,7 @@ class QuotaTemporaryStorageEvictorTest : public testing::Test {
       : num_get_usage_and_quota_for_eviction_(0),
         ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {}
 
-  void SetUp() {
+  virtual void SetUp() {
     quota_eviction_handler_.reset(new MockQuotaEvictionHandler(this));
 
     // Run multiple evictions in a single RunUntilIdle() when interval_ms == 0
@@ -153,7 +153,7 @@ class QuotaTemporaryStorageEvictorTest : public testing::Test {
         quota_eviction_handler_.get(), 0));
   }
 
-  void TearDown() {
+  virtual void TearDown() {
     temporary_storage_evictor_.reset();
     quota_eviction_handler_.reset();
     MessageLoop::current()->RunUntilIdle();
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 66b9831..153deb3 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -732,11 +732,11 @@ WebURL LocalFileToDataURL(const WebURL& fileUrl) {
 // by webkit layout tests.
 class ScopedTempDirectoryInternal : public ScopedTempDirectory {
  public:
-  virtual bool CreateUniqueTempDir() {
+  virtual bool CreateUniqueTempDir() OVERRIDE {
     return tempDirectory_.CreateUniqueTempDir();
   }
 
-  virtual std::string path() const {
+  virtual std::string path() const OVERRIDE {
     return tempDirectory_.path().MaybeAsASCII();
   }
 
diff --git a/webkit/tools/test_shell/mock_spellcheck_unittest.cc b/webkit/tools/test_shell/mock_spellcheck_unittest.cc
index bcf3742..c09b344 100644
--- a/webkit/tools/test_shell/mock_spellcheck_unittest.cc
+++ b/webkit/tools/test_shell/mock_spellcheck_unittest.cc
@@ -1,6 +1,6 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.  Use of this
-// source code is governed by a BSD-style license that can be found in the
-// LICENSE file.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
 #include "base/format_macros.h"
 #include "base/string_util.h"
@@ -14,7 +14,7 @@ class MockSpellCheckTest : public testing::Test {
   MockSpellCheckTest() {
   }
 
-  ~MockSpellCheckTest() {
+  virtual ~MockSpellCheckTest() {
   }
 };
 
diff --git a/webkit/tools/test_shell/run_all_tests.cc b/webkit/tools/test_shell/run_all_tests.cc
index 9b3ec46..bf6edba 100644
--- a/webkit/tools/test_shell/run_all_tests.cc
+++ b/webkit/tools/test_shell/run_all_tests.cc
@@ -40,7 +40,7 @@ class TestShellTestSuite : public base::TestSuite {
         test_shell_webkit_init_(true) {
   }
 
-  virtual void Initialize() {
+  virtual void Initialize() OVERRIDE {
     // Override DIR_EXE early in case anything in base::TestSuite uses it.
 #if defined(OS_MACOSX)
     base::FilePath path;
@@ -77,7 +77,7 @@ class TestShellTestSuite : public base::TestSuite {
     platform_delegate_.SelectUnifiedTheme();
   }
 
-  virtual void Shutdown() {
+  virtual void Shutdown() OVERRIDE {
     TestShell::ShutdownTestShell();
     TestShell::CleanupLogging();
 
diff --git a/webkit/tools/test_shell/simple_appcache_system.cc b/webkit/tools/test_shell/simple_appcache_system.cc
index 8503672..bacda10 100644
--- a/webkit/tools/test_shell/simple_appcache_system.cc
+++ b/webkit/tools/test_shell/simple_appcache_system.cc
@@ -35,7 +35,7 @@ class SimpleFrontendProxy
   void clear_appcache_system() { system_ = NULL; }
 
   virtual void OnCacheSelected(int host_id,
-      const appcache::AppCacheInfo& info) {
+      const appcache::AppCacheInfo& info) OVERRIDE {
     if (!system_)
       return;
     if (system_->is_io_thread()) {
@@ -51,7 +51,7 @@ class SimpleFrontendProxy
   }
 
   virtual void OnStatusChanged(const std::vector<int>& host_ids,
-                               appcache::Status status) {
+                               appcache::Status status) OVERRIDE {
     if (!system_)
       return;
     if (system_->is_io_thread())
@@ -66,7 +66,7 @@ class SimpleFrontendProxy
   }
 
   virtual void OnEventRaised(const std::vector<int>& host_ids,
-                             appcache::EventID event_id) {
+                             appcache::EventID event_id) OVERRIDE {
     if (!system_)
       return;
     if (system_->is_io_thread())
@@ -82,7 +82,7 @@ class SimpleFrontendProxy
 
   virtual void OnProgressEventRaised(const std::vector<int>& host_ids,
                                      const GURL& url,
-                                     int num_total, int num_complete) {
+                                     int num_total, int num_complete) OVERRIDE {
     if (!system_)
       return;
     if (system_->is_io_thread())
@@ -98,7 +98,7 @@ class SimpleFrontendProxy
   }
 
   virtual void OnErrorEventRaised(const std::vector<int>& host_ids,
-                                  const std::string& message) {
+                                  const std::string& message) OVERRIDE {
     if (!system_)
       return;
     if (system_->is_io_thread())
@@ -115,7 +115,7 @@ class SimpleFrontendProxy
 
   virtual void OnLogMessage(int host_id,
                             appcache::LogLevel log_level,
-                            const std::string& message) {
+                            const std::string& message) OVERRIDE {
     if (!system_)
       return;
     if (system_->is_io_thread())
@@ -130,12 +130,13 @@ class SimpleFrontendProxy
       NOTREACHED();
   }
 
-  virtual void OnContentBlocked(int host_id, const GURL& manifest_url) {}
+  virtual void OnContentBlocked(int host_id,
+                                const GURL& manifest_url) OVERRIDE {}
 
  private:
   friend class base::RefCountedThreadSafe<SimpleFrontendProxy>;
 
-  ~SimpleFrontendProxy() {}
+  virtual ~SimpleFrontendProxy() {}
 
   SimpleAppCacheSystem* system_;
 };
@@ -161,7 +162,7 @@ class SimpleBackendProxy
                    base::Unretained(this));
   }
 
-  virtual void RegisterHost(int host_id) {
+  virtual void RegisterHost(int host_id) OVERRIDE {
     if (system_->is_ui_thread()) {
       system_->io_message_loop()->PostTask(
           FROM_HERE,
@@ -173,7 +174,7 @@ class SimpleBackendProxy
     }
   }
 
-  virtual void UnregisterHost(int host_id) {
+  virtual void UnregisterHost(int host_id) OVERRIDE {
     if (system_->is_ui_thread()) {
       system_->io_message_loop()->PostTask(
           FROM_HERE,
@@ -185,7 +186,7 @@ class SimpleBackendProxy
     }
   }
 
-  virtual void SetSpawningHostId(int host_id, int spawning_host_id) {
+  virtual void SetSpawningHostId(int host_id, int spawning_host_id) OVERRIDE {
     if (system_->is_ui_thread()) {
       system_->io_message_loop()->PostTask(
           FROM_HERE,
@@ -201,7 +202,7 @@ class SimpleBackendProxy
   virtual void SelectCache(int host_id,
                            const GURL& document_url,
                            const int64 cache_document_was_loaded_from,
-                           const GURL& manifest_url) {
+                           const GURL& manifest_url) OVERRIDE {
     if (system_->is_ui_thread()) {
       system_->io_message_loop()->PostTask(
           FROM_HERE,
@@ -219,7 +220,7 @@ class SimpleBackendProxy
 
   virtual void GetResourceList(
       int host_id,
-      std::vector<appcache::AppCacheResourceInfo>* resource_infos) {
+      std::vector<appcache::AppCacheResourceInfo>* resource_infos) OVERRIDE {
     if (system_->is_ui_thread()) {
       system_->io_message_loop()->PostTask(
           FROM_HERE,
@@ -235,18 +236,20 @@ class SimpleBackendProxy
   virtual void SelectCacheForWorker(
                            int host_id,
                            int parent_process_id,
-                           int parent_host_id) {
+                           int parent_host_id) OVERRIDE {
     NOTIMPLEMENTED();  // Workers are not supported in test_shell.
   }
 
   virtual void SelectCacheForSharedWorker(
                            int host_id,
-                           int64 appcache_id) {
+                           int64 appcache_id) OVERRIDE {
     NOTIMPLEMENTED();  // Workers are not supported in test_shell.
   }
 
-  virtual void MarkAsForeignEntry(int host_id, const GURL& document_url,
-                                  int64 cache_document_was_loaded_from) {
+  virtual void MarkAsForeignEntry(
+      int host_id,
+      const GURL& document_url,
+      int64 cache_document_was_loaded_from) OVERRIDE {
     if (system_->is_ui_thread()) {
       system_->io_message_loop()->PostTask(
           FROM_HERE,
@@ -261,7 +264,7 @@ class SimpleBackendProxy
     }
   }
 
-  virtual appcache::Status GetStatus(int host_id) {
+  virtual appcache::Status GetStatus(int host_id) OVERRIDE {
     if (system_->is_ui_thread()) {
       status_result_ = appcache::UNCACHED;
       event_.Reset();
@@ -279,7 +282,7 @@ class SimpleBackendProxy
     return status_result_;
   }
 
-  virtual bool StartUpdate(int host_id) {
+  virtual bool StartUpdate(int host_id) OVERRIDE {
     if (system_->is_ui_thread()) {
       bool_result_ = false;
       event_.Reset();
@@ -297,7 +300,7 @@ class SimpleBackendProxy
     return bool_result_;
   }
 
-  virtual bool SwapCache(int host_id) {
+  virtual bool SwapCache(int host_id) OVERRIDE {
     if (system_->is_ui_thread()) {
       bool_result_ = false;
       event_.Reset();
@@ -337,7 +340,7 @@ class SimpleBackendProxy
  private:
   friend class base::RefCountedThreadSafe<SimpleBackendProxy>;
 
-  ~SimpleBackendProxy() {}
+  virtual ~SimpleBackendProxy() {}
 
   SimpleAppCacheSystem* system_;
   base::WaitableEvent event_;
@@ -387,7 +390,8 @@ SimpleAppCacheSystem::~SimpleAppCacheSystem() {
   }
 }
 
-void SimpleAppCacheSystem::InitOnUIThread(const base::FilePath& cache_directory) {
+void SimpleAppCacheSystem::InitOnUIThread(
+    const base::FilePath& cache_directory) {
   DCHECK(!ui_message_loop_);
   ui_message_loop_ = MessageLoop::current();
   cache_directory_ = cache_directory;
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index 743ba26..de1f474 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -252,7 +252,7 @@ class IOThread : public base::Thread {
  public:
   IOThread() : base::Thread("IOThread") {}
 
-  ~IOThread() {
+  virtual ~IOThread() {
     Stop();
   }
 
@@ -921,13 +921,13 @@ class ResourceLoaderBridgeImpl : public ResourceLoaderBridge {
   // --------------------------------------------------------------------------
   // ResourceLoaderBridge implementation:
 
-  virtual void SetRequestBody(ResourceRequestBody* request_body) {
+  virtual void SetRequestBody(ResourceRequestBody* request_body) OVERRIDE {
     DCHECK(params_.get());
     DCHECK(!params_->request_body);
     params_->request_body = request_body;
   }
 
-  virtual bool Start(Peer* peer) {
+  virtual bool Start(Peer* peer) OVERRIDE {
     DCHECK(!proxy_);
 
     if (!SimpleResourceLoaderBridge::EnsureIOThread())
@@ -941,16 +941,16 @@ class ResourceLoaderBridgeImpl : public ResourceLoaderBridge {
     return true;  // Any errors will be reported asynchronously.
   }
 
-  virtual void Cancel() {
+  virtual void Cancel() OVERRIDE {
     DCHECK(proxy_);
     proxy_->Cancel();
   }
 
-  virtual void SetDefersLoading(bool value) {
+  virtual void SetDefersLoading(bool value) OVERRIDE {
     // TODO(darin): implement me
   }
 
-  virtual void SyncLoad(SyncLoadResponse* response) {
+  virtual void SyncLoad(SyncLoadResponse* response) OVERRIDE {
     DCHECK(!proxy_);
 
     if (!SimpleResourceLoaderBridge::EnsureIOThread())
diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
index 33302a3..b28e1e1 100644
--- a/webkit/tools/test_shell/simple_socket_stream_bridge.cc
+++ b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
@@ -36,18 +36,18 @@ class WebSocketStreamHandleBridgeImpl
       webkit_glue::WebSocketStreamHandleDelegate* delegate);
 
   // WebSocketStreamHandleBridge methods.
-  virtual void Connect(const GURL& url);
-  virtual bool Send(const std::vector<char>& data);
-  virtual void Close();
+  virtual void Connect(const GURL& url) OVERRIDE;
+  virtual bool Send(const std::vector<char>& data) OVERRIDE;
+  virtual void Close() OVERRIDE;
 
   // net::SocketStream::Delegate methods.
   virtual void OnConnected(net::SocketStream* req,
-                           int max_pending_send_allowed);
+                           int max_pending_send_allowed) OVERRIDE;
   virtual void OnSentData(net::SocketStream* req,
-                          int amount_sent);
+                          int amount_sent) OVERRIDE;
   virtual void OnReceivedData(net::SocketStream* req,
-                              const char* data, int len);
-  virtual void OnClose(net::SocketStream* req);
+                              const char* data, int len) OVERRIDE;
+  virtual void OnClose(net::SocketStream* req) OVERRIDE;
 
  private:
   virtual ~WebSocketStreamHandleBridgeImpl();
diff --git a/webkit/tools/webcore_unit_tests/BMPImageDecoder_unittest.cpp b/webkit/tools/webcore_unit_tests/BMPImageDecoder_unittest.cpp
index bdfe849d..a193863 100644
--- a/webkit/tools/webcore_unit_tests/BMPImageDecoder_unittest.cpp
+++ b/webkit/tools/webcore_unit_tests/BMPImageDecoder_unittest.cpp
@@ -10,7 +10,7 @@ class BMPImageDecoderTest : public ImageDecoderTest {
   BMPImageDecoderTest() : ImageDecoderTest("bmp") { }
 
  protected:
-  virtual WebKit::WebImageDecoder* CreateWebKitImageDecoder() const {
+  virtual WebKit::WebImageDecoder* CreateWebKitImageDecoder() const OVERRIDE {
     return new WebKit::WebImageDecoder(WebKit::WebImageDecoder::TypeBMP);
   }
 
diff --git a/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp b/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp
index 0c905ca..fc66332 100644
--- a/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp
+++ b/webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp
@@ -14,7 +14,7 @@ class ICOImageDecoderTest : public ImageDecoderTest {
   ICOImageDecoderTest() : ImageDecoderTest("ico") { }
 
  protected:
-   virtual WebKit::WebImageDecoder* CreateWebKitImageDecoder() const {
+   virtual WebKit::WebImageDecoder* CreateWebKitImageDecoder() const OVERRIDE {
      return new WebKit::WebImageDecoder(WebKit::WebImageDecoder::TypeICO);
   }
 };