Add OVERRIDE to content/.

BUG=104314
TEST=no change

Review URL: http://codereview.chromium.org/8587009

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

183 files changed, 887 insertions, 756 deletions

diff --git a/content/browser/accessibility/browser_accessibility_mac.h b/content/browser/accessibility/browser_accessibility_mac.h
index ee6cfca..865d6a7 100644
--- a/content/browser/accessibility/browser_accessibility_mac.h
+++ b/content/browser/accessibility/browser_accessibility_mac.h
@@ -18,11 +18,11 @@
 class BrowserAccessibilityMac : public BrowserAccessibility {
  public:
   // Implementation of BrowserAccessibility.
-  virtual void Initialize();
-  virtual void NativeReleaseReference();
+  virtual void Initialize() OVERRIDE;
+  virtual void NativeReleaseReference() OVERRIDE;
 
   // Overrides from BrowserAccessibility.
-  virtual void DetachTree(std::vector<BrowserAccessibility*>* nodes);
+  virtual void DetachTree(std::vector<BrowserAccessibility*>* nodes) OVERRIDE;
 
   // The BrowserAccessibilityCocoa associated with us.
   BrowserAccessibilityCocoa* native_view() const {
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.h b/content/browser/accessibility/browser_accessibility_manager_mac.h
index c7c5089..e5ec5f3 100644
--- a/content/browser/accessibility/browser_accessibility_manager_mac.h
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -13,7 +13,8 @@
 class BrowserAccessibilityManagerMac : public BrowserAccessibilityManager {
  public:
   // Implementation of BrowserAccessibilityManager.
-  virtual void NotifyAccessibilityEvent(int type, BrowserAccessibility* node);
+  virtual void NotifyAccessibilityEvent(int type,
+                                        BrowserAccessibility* node) OVERRIDE;
 
  private:
   // This gives BrowserAccessibilityManager::Create access to the class
diff --git a/content/browser/appcache/appcache_dispatcher_host.h b/content/browser/appcache/appcache_dispatcher_host.h
index 5ed331b..ae13aa6 100644
--- a/content/browser/appcache/appcache_dispatcher_host.h
+++ b/content/browser/appcache/appcache_dispatcher_host.h
@@ -35,7 +35,7 @@ class AppCacheDispatcherHost : public BrowserMessageFilter {
 
  private:
   // BrowserMessageFilter override.
-  virtual void BadMessageReceived();
+  virtual void BadMessageReceived() OVERRIDE;
 
   // IPC message handlers
   void OnRegisterHost(int host_id);
diff --git a/content/browser/appcache/appcache_frontend_proxy.h b/content/browser/appcache/appcache_frontend_proxy.h
index f16a423..03592ee 100644
--- a/content/browser/appcache/appcache_frontend_proxy.h
+++ b/content/browser/appcache/appcache_frontend_proxy.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -18,20 +18,21 @@ class AppCacheFrontendProxy : public appcache::AppCacheFrontend {
   explicit AppCacheFrontendProxy(IPC::Message::Sender* sender);
 
   // AppCacheFrontend methods
-  virtual void OnCacheSelected(int host_id, const appcache::AppCacheInfo& info);
+  virtual void OnCacheSelected(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 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 OnErrorEventRaised(const std::vector<int>& host_ids,
-                                  const std::string& message);
+                                  const std::string& message) 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;
 
  private:
   IPC::Message::Sender* sender_;
diff --git a/content/browser/appcache/chrome_appcache_service.h b/content/browser/appcache/chrome_appcache_service.h
index 3717dc1..69498c2 100644
--- a/content/browser/appcache/chrome_appcache_service.h
+++ b/content/browser/appcache/chrome_appcache_service.h
@@ -58,14 +58,14 @@ class CONTENT_EXPORT ChromeAppCacheService
 
   // AppCachePolicy overrides
   virtual bool CanLoadAppCache(const GURL& manifest_url,
-                               const GURL& first_party);
+                               const GURL& first_party) OVERRIDE;
   virtual bool CanCreateAppCache(const GURL& manifest_url,
-                                 const GURL& first_party);
+                                 const GURL& first_party) OVERRIDE;
 
   // content::NotificationObserver override
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   const content::ResourceContext* resource_context_;
   content::NotificationRegistrar registrar_;
diff --git a/content/browser/browser_child_process_host.h b/content/browser/browser_child_process_host.h
index 092bf0d..1dbcb56 100644
--- a/content/browser/browser_child_process_host.h
+++ b/content/browser/browser_child_process_host.h
@@ -76,7 +76,7 @@ class CONTENT_EXPORT BrowserChildProcessHost :
   base::ProcessHandle GetChildProcessHandle() const;
 
   // ChildProcessLauncher::Client implementation.
-  virtual void OnProcessLaunched() {}
+  virtual void OnProcessLaunched() OVERRIDE {}
 
   // Derived classes can override this to know if the process crashed.
   // |exit_code| is the status returned when the process crashed (for
@@ -118,7 +118,7 @@ class CONTENT_EXPORT BrowserChildProcessHost :
   class ClientHook : public ChildProcessLauncher::Client {
    public:
     explicit ClientHook(BrowserChildProcessHost* host);
-    virtual void OnProcessLaunched();
+    virtual void OnProcessLaunched() OVERRIDE;
    private:
     BrowserChildProcessHost* host_;
   };
diff --git a/content/browser/browser_message_filter.h b/content/browser/browser_message_filter.h
index 8230916..78f5095 100644
--- a/content/browser/browser_message_filter.h
+++ b/content/browser/browser_message_filter.h
@@ -31,7 +31,7 @@ class CONTENT_EXPORT BrowserMessageFilter :
   // IPC::Message::Sender implementation.  Can be called on any thread.  Can't
   // send sync messages (since we don't want to block the browser on any other
   // process).
-  virtual bool Send(IPC::Message* message);
+  virtual bool Send(IPC::Message* message) OVERRIDE;
 
   // If you want the given message to be dispatched to your OnMessageReceived on
   // a different thread, change |thread| to the id of the target thread.
diff --git a/content/browser/browser_process_sub_thread.h b/content/browser/browser_process_sub_thread.h
index ac3f8560..a41bfdd 100644
--- a/content/browser/browser_process_sub_thread.h
+++ b/content/browser/browser_process_sub_thread.h
@@ -31,8 +31,8 @@ class CONTENT_EXPORT BrowserProcessSubThread : public BrowserThreadImpl {
   virtual ~BrowserProcessSubThread();
 
  protected:
-  virtual void Init();
-  virtual void CleanUp();
+  virtual void Init() OVERRIDE;
+  virtual void CleanUp() OVERRIDE;
 
  private:
   // Each specialized thread has its own notification service.
diff --git a/content/browser/cert_store.h b/content/browser/cert_store.h
index e5a6a67..4ed32fd 100644
--- a/content/browser/cert_store.h
+++ b/content/browser/cert_store.h
@@ -45,7 +45,7 @@ class CONTENT_EXPORT CertStore : public content::NotificationObserver {
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
  private:
   friend struct DefaultSingletonTraits<CertStore>;
diff --git a/content/browser/debugger/devtools_http_protocol_handler.h b/content/browser/debugger/devtools_http_protocol_handler.h
index 51e5fe1..866f925 100644
--- a/content/browser/debugger/devtools_http_protocol_handler.h
+++ b/content/browser/debugger/devtools_http_protocol_handler.h
@@ -72,15 +72,16 @@ class DevToolsHttpProtocolHandler
 
   // net::HttpServer::Delegate implementation.
   virtual void OnHttpRequest(int connection_id,
-                             const net::HttpServerRequestInfo& info);
-  virtual void OnWebSocketRequest(int connection_id,
-                                  const net::HttpServerRequestInfo& info);
+                             const net::HttpServerRequestInfo& info) OVERRIDE;
+  virtual void OnWebSocketRequest(
+      int connection_id,
+      const net::HttpServerRequestInfo& info) OVERRIDE;
   virtual void OnWebSocketMessage(int connection_id,
-                                  const std::string& data);
-  virtual void OnClose(int connection_id);
+                                  const std::string& data) OVERRIDE;
+  virtual void OnClose(int connection_id) OVERRIDE;
 
   virtual void OnJsonRequestUI(int connection_id,
-                             const net::HttpServerRequestInfo& info);
+                               const net::HttpServerRequestInfo& info);
   virtual void OnWebSocketRequestUI(int connection_id,
                                     const net::HttpServerRequestInfo& info);
   virtual void OnWebSocketMessageUI(int connection_id,
@@ -88,8 +89,9 @@ class DevToolsHttpProtocolHandler
   virtual void OnCloseUI(int connection_id);
 
   // net::URLRequest::Delegate implementation.
-  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;
 
   void Init();
   void Teardown();
diff --git a/content/browser/debugger/devtools_manager.h b/content/browser/debugger/devtools_manager.h
index b2d5338..1801d0c 100644
--- a/content/browser/debugger/devtools_manager.h
+++ b/content/browser/debugger/devtools_manager.h
@@ -9,6 +9,7 @@
 #include <map>
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "content/browser/debugger/devtools_agent_host.h"
 #include "content/browser/debugger/devtools_client_host.h"
 #include "content/common/content_export.h"
@@ -91,10 +92,10 @@ class CONTENT_EXPORT DevToolsManager
   // This method will remove all references from the manager to the
   // DevToolsClientHost and unregister all listeners related to the
   // DevToolsClientHost.
-  virtual void ClientHostClosing(DevToolsClientHost* host);
+  virtual void ClientHostClosing(DevToolsClientHost* host) OVERRIDE;
 
   // DevToolsAgentHost::CloseListener implementation.
-  virtual void AgentHostClosing(DevToolsAgentHost* host);
+  virtual void AgentHostClosing(DevToolsAgentHost* host) OVERRIDE;
 
   // Returns DevToolsAgentHost inspected by the DevToolsClientHost.
   DevToolsAgentHost* GetAgentHost(DevToolsClientHost* client_host);
diff --git a/content/browser/debugger/render_view_devtools_agent_host.h b/content/browser/debugger/render_view_devtools_agent_host.h
index e741a86..5ffda52 100644
--- a/content/browser/debugger/render_view_devtools_agent_host.h
+++ b/content/browser/debugger/render_view_devtools_agent_host.h
@@ -27,9 +27,9 @@ class CONTENT_EXPORT RenderViewDevToolsAgentHost
   virtual ~RenderViewDevToolsAgentHost();
 
   // DevToolsAgentHost implementation.
-  virtual void SendMessageToAgent(IPC::Message* msg);
-  virtual void NotifyClientClosing();
-  virtual int GetRenderProcessId();
+  virtual void SendMessageToAgent(IPC::Message* msg) OVERRIDE;
+  virtual void NotifyClientClosing() OVERRIDE;
+  virtual int GetRenderProcessId() OVERRIDE;
 
   // RenderViewHostObserver overrides.
   virtual void RenderViewHostDestroyed(RenderViewHost* rvh) OVERRIDE;
diff --git a/content/browser/debugger/worker_devtools_message_filter.h b/content/browser/debugger/worker_devtools_message_filter.h
index 453d9b3..db49a95 100644
--- a/content/browser/debugger/worker_devtools_message_filter.h
+++ b/content/browser/debugger/worker_devtools_message_filter.h
@@ -18,7 +18,7 @@ class WorkerDevToolsMessageFilter : public BrowserMessageFilter {
 
   // BrowserMessageFilter implementation.
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
   // Message handlers.
   void OnForwardToClient(const IPC::Message& message);
   void OnSaveAgentRumtimeState(const std::string& state);
diff --git a/content/browser/device_orientation/accelerometer_mac.h b/content/browser/device_orientation/accelerometer_mac.h
index d4480c8..853b4d5 100644
--- a/content/browser/device_orientation/accelerometer_mac.h
+++ b/content/browser/device_orientation/accelerometer_mac.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 //
@@ -56,6 +56,7 @@
 
 #include <IOKit/IOKitLib.h>
 
+#include "base/compiler_specific.h"
 #include "content/browser/device_orientation/data_fetcher.h"
 
 namespace device_orientation {
@@ -67,7 +68,7 @@ class AccelerometerMac : public DataFetcher {
   static DataFetcher* Create();
 
   // Implement DataFetcher.
-  virtual bool GetOrientation(Orientation* orientation);
+  virtual bool GetOrientation(Orientation* orientation) OVERRIDE;
 
   virtual ~AccelerometerMac();
 
diff --git a/content/browser/device_orientation/message_filter.h b/content/browser/device_orientation/message_filter.h
index d458965..2147dae 100644
--- a/content/browser/device_orientation/message_filter.h
+++ b/content/browser/device_orientation/message_filter.h
@@ -18,7 +18,7 @@ class MessageFilter : public BrowserMessageFilter {
 
   // BrowserMessageFilter implementation.
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
  private:
   virtual ~MessageFilter();
diff --git a/content/browser/device_orientation/provider_impl.h b/content/browser/device_orientation/provider_impl.h
index e70952b..4fb5ebd 100644
--- a/content/browser/device_orientation/provider_impl.h
+++ b/content/browser/device_orientation/provider_impl.h
@@ -32,8 +32,8 @@ class ProviderImpl : public Provider {
   CONTENT_EXPORT ProviderImpl(const DataFetcherFactory factories[]);
 
   // From Provider.
-  virtual void AddObserver(Observer* observer);
-  virtual void RemoveObserver(Observer* observer);
+  virtual void AddObserver(Observer* observer) OVERRIDE;
+  virtual void RemoveObserver(Observer* observer) OVERRIDE;
 
  private:
   virtual ~ProviderImpl();
diff --git a/content/browser/download/download_resource_handler.h b/content/browser/download/download_resource_handler.h
index 07cfd13..72bf588 100644
--- a/content/browser/download/download_resource_handler.h
+++ b/content/browser/download/download_resource_handler.h
@@ -49,29 +49,38 @@ class DownloadResourceHandler : public ResourceHandler {
                           const OnStartedCallback& started_cb,
                           const DownloadSaveInfo& save_info);
 
-  virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
+  virtual bool OnUploadProgress(int request_id,
+                                uint64 position,
+                                uint64 size) OVERRIDE;
 
   // Not needed, as this event handler ought to be the final resource.
-  virtual bool OnRequestRedirected(int request_id, const GURL& url,
-                                   ResourceResponse* response, bool* defer);
+  virtual bool OnRequestRedirected(int request_id,
+                                   const GURL& url,
+                                   ResourceResponse* response,
+                                   bool* defer) OVERRIDE;
 
   // Send the download creation information to the download thread.
-  virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
+  virtual bool OnResponseStarted(int request_id,
+                                 ResourceResponse* response) OVERRIDE;
 
   // Pass-through implementation.
-  virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
+  virtual bool OnWillStart(int request_id,
+                           const GURL& url,
+                           bool* defer) OVERRIDE;
 
   // Create a new buffer, which will be handed to the download thread for file
   // writing and deletion.
-  virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
-                          int min_size);
+  virtual bool OnWillRead(int request_id,
+                          net::IOBuffer** buf,
+                          int* buf_size,
+                          int min_size) OVERRIDE;
 
-  virtual bool OnReadCompleted(int request_id, int* bytes_read);
+  virtual bool OnReadCompleted(int request_id, int* bytes_read) OVERRIDE;
 
   virtual bool OnResponseCompleted(int request_id,
                                    const net::URLRequestStatus& status,
-                                   const std::string& security_info);
-  virtual void OnRequestClosed();
+                                   const std::string& security_info) OVERRIDE;
+  virtual void OnRequestClosed() OVERRIDE;
 
   // If the content-length header is not present (or contains something other
   // than numbers), the incoming content_length is -1 (unknown size).
diff --git a/content/browser/download/drag_download_file.h b/content/browser/download/drag_download_file.h
index 18228f08..af35e39 100644
--- a/content/browser/download/drag_download_file.h
+++ b/content/browser/download/drag_download_file.h
@@ -47,20 +47,20 @@ class CONTENT_EXPORT DragDownloadFile
   // DownloadFileProvider methods.
   // Called on drag-and-drop thread (Windows).
   // Called on UI thread (MacOSX).
-  virtual bool Start(ui::DownloadFileObserver* observer);
-  virtual void Stop();
+  virtual bool Start(ui::DownloadFileObserver* observer) OVERRIDE;
+  virtual void Stop() OVERRIDE;
 #if defined(OS_WIN)
   virtual IStream* GetStream() { return NULL; }
 #endif
 
   // DownloadManager::Observer methods.
   // Called on UI thread.
-  virtual void ModelChanged();
+  virtual void ModelChanged() OVERRIDE;
 
   // DownloadItem::Observer methods.
   // Called on UI thread.
-  virtual void OnDownloadUpdated(DownloadItem* download);
-  virtual void OnDownloadOpened(DownloadItem* download) { }
+  virtual void OnDownloadUpdated(DownloadItem* download) OVERRIDE;
+  virtual void OnDownloadOpened(DownloadItem* download) OVERRIDE { }
 
  private:
   // Called on drag-and-drop thread (Windows).
diff --git a/content/browser/download/drag_download_util.h b/content/browser/download/drag_download_util.h
index df8bde0..95a5521 100644
--- a/content/browser/download/drag_download_util.h
+++ b/content/browser/download/drag_download_util.h
@@ -47,8 +47,8 @@ class CONTENT_EXPORT PromiseFileFinalizer : public ui::DownloadFileObserver {
   virtual ~PromiseFileFinalizer();
 
   // DownloadFileObserver methods.
-  virtual void OnDownloadCompleted(const FilePath& file_path);
-  virtual void OnDownloadAborted();
+  virtual void OnDownloadCompleted(const FilePath& file_path) OVERRIDE;
+  virtual void OnDownloadAborted() OVERRIDE;
 
  private:
   void Cleanup();
diff --git a/content/browser/download/save_file_resource_handler.h b/content/browser/download/save_file_resource_handler.h
index f794ff6..e814091 100644
--- a/content/browser/download/save_file_resource_handler.h
+++ b/content/browser/download/save_file_resource_handler.h
@@ -22,32 +22,41 @@ class SaveFileResourceHandler : public ResourceHandler {
                           SaveFileManager* manager);
 
   // ResourceHandler Implementation:
-  virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
+  virtual bool OnUploadProgress(int request_id,
+                                uint64 position,
+                                uint64 size) OVERRIDE;
 
   // Saves the redirected URL to final_url_, we need to use the original
   // URL to match original request.
-  virtual bool OnRequestRedirected(int request_id, const GURL& url,
-                                   ResourceResponse* response, bool* defer);
+  virtual bool OnRequestRedirected(int request_id,
+                                   const GURL& url,
+                                   ResourceResponse* response,
+                                   bool* defer) OVERRIDE;
 
   // Sends the download creation information to the download thread.
-  virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
+  virtual bool OnResponseStarted(int request_id,
+                                 ResourceResponse* response) OVERRIDE;
 
   // Pass-through implementation.
-  virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
+  virtual bool OnWillStart(int request_id,
+                           const GURL& url,
+                           bool* defer) OVERRIDE;
 
   // Creates a new buffer, which will be handed to the download thread for file
   // writing and deletion.
-  virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
-                          int min_size);
+  virtual bool OnWillRead(int request_id,
+                          net::IOBuffer** buf,
+                          int* buf_size,
+                          int min_size) OVERRIDE;
 
   // Passes the buffer to the download file writer.
-  virtual bool OnReadCompleted(int request_id, int* bytes_read);
+  virtual bool OnReadCompleted(int request_id, int* bytes_read) OVERRIDE;
 
   virtual bool OnResponseCompleted(int request_id,
                                    const net::URLRequestStatus& status,
-                                   const std::string& security_info);
+                                   const std::string& security_info) OVERRIDE;
 
-  virtual void OnRequestClosed();
+  virtual void OnRequestClosed() OVERRIDE;
 
   // If the content-length header is not present (or contains something other
   // than numbers), StringToInt64 returns 0, which indicates 'unknown size' and
diff --git a/content/browser/geolocation/arbitrator_dependency_factories_for_test.h b/content/browser/geolocation/arbitrator_dependency_factories_for_test.h
index f05c00b7..a28719d 100644
--- a/content/browser/geolocation/arbitrator_dependency_factories_for_test.h
+++ b/content/browser/geolocation/arbitrator_dependency_factories_for_test.h
@@ -21,9 +21,9 @@ class GeolocationArbitratorDependencyFactoryWithLocationProvider
       AccessTokenStore* access_token_store,
       net::URLRequestContextGetter* context,
       const GURL& url,
-      const string16& access_token);
+      const string16& access_token) OVERRIDE;
 
-  virtual LocationProviderBase* NewSystemLocationProvider();
+  virtual LocationProviderBase* NewSystemLocationProvider() OVERRIDE;
 
  protected:
   LocationProviderFactoryFunction factory_function_;
diff --git a/content/browser/geolocation/arbitrator_dependency_factory.h b/content/browser/geolocation/arbitrator_dependency_factory.h
index 484c673..2aaf4aa 100644
--- a/content/browser/geolocation/arbitrator_dependency_factory.h
+++ b/content/browser/geolocation/arbitrator_dependency_factory.h
@@ -50,14 +50,14 @@ class CONTENT_EXPORT DefaultGeolocationArbitratorDependencyFactory
     : public GeolocationArbitratorDependencyFactory {
  public:
   // GeolocationArbitratorDependencyFactory
-  virtual GetTimeNow GetTimeFunction();
-  virtual AccessTokenStore* NewAccessTokenStore();
+  virtual GetTimeNow GetTimeFunction() OVERRIDE;
+  virtual AccessTokenStore* NewAccessTokenStore() OVERRIDE;
   virtual LocationProviderBase* NewNetworkLocationProvider(
       AccessTokenStore* access_token_store,
       net::URLRequestContextGetter* context,
       const GURL& url,
-      const string16& access_token);
-  virtual LocationProviderBase* NewSystemLocationProvider();
+      const string16& access_token) OVERRIDE;
+  virtual LocationProviderBase* NewSystemLocationProvider() OVERRIDE;
 };
 
 #endif  // CONTENT_BROWSER_GEOLOCATION_ARBITRATOR_DEPENDENCY_FACTORY_H_
diff --git a/content/browser/geolocation/core_location_provider_mac.h b/content/browser/geolocation/core_location_provider_mac.h
index 2c528ca..4ad5ee4 100644
--- a/content/browser/geolocation/core_location_provider_mac.h
+++ b/content/browser/geolocation/core_location_provider_mac.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -21,9 +21,9 @@ class CoreLocationProviderMac : public LocationProviderBase {
   virtual ~CoreLocationProviderMac();
 
   // LocationProvider
-  virtual bool StartProvider(bool high_accuracy);
-  virtual void StopProvider();
-  virtual void GetPosition(Geoposition* position);
+  virtual bool StartProvider(bool high_accuracy) OVERRIDE;
+  virtual void StopProvider() OVERRIDE;
+  virtual void GetPosition(Geoposition* position) OVERRIDE;
 
   // Receives new positions and calls UpdateListeners
   void SetPosition(Geoposition* position);
diff --git a/content/browser/geolocation/geolocation_provider.h b/content/browser/geolocation/geolocation_provider.h
index 5001fee..b627b1e 100644
--- a/content/browser/geolocation/geolocation_provider.h
+++ b/content/browser/geolocation/geolocation_provider.h
@@ -47,7 +47,7 @@ class CONTENT_EXPORT GeolocationProvider
   bool HasPermissionBeenGranted() const;
 
   // GeolocationObserver
-  virtual void OnLocationUpdate(const Geoposition& position);
+  virtual void OnLocationUpdate(const Geoposition& position) OVERRIDE;
 
   // Gets a pointer to the singleton instance of the location relayer, which
   // is in turn bound to the browser's global context objects. Ownership is NOT
@@ -83,8 +83,8 @@ class CONTENT_EXPORT GeolocationProvider
   void NotifyObservers(const Geoposition& position);
 
   // Thread
-  virtual void Init();
-  virtual void CleanUp();
+  virtual void Init() OVERRIDE;
+  virtual void CleanUp() OVERRIDE;
 
   scoped_refptr<base::MessageLoopProxy> client_loop_;
 
diff --git a/content/browser/geolocation/location_arbitrator.h b/content/browser/geolocation/location_arbitrator.h
index ffe0182..b020191 100644
--- a/content/browser/geolocation/location_arbitrator.h
+++ b/content/browser/geolocation/location_arbitrator.h
@@ -67,7 +67,7 @@ class CONTENT_EXPORT GeolocationArbitrator
       GeolocationArbitratorDependencyFactory* factory);
 
   // ListenerInterface
-  virtual void LocationUpdateAvailable(LocationProviderBase* provider);
+  virtual void LocationUpdateAvailable(LocationProviderBase* provider) OVERRIDE;
 
  private:
   GeolocationArbitrator(
diff --git a/content/browser/geolocation/mock_location_provider.h b/content/browser/geolocation/mock_location_provider.h
index 35d1d05..b375a53 100644
--- a/content/browser/geolocation/mock_location_provider.h
+++ b/content/browser/geolocation/mock_location_provider.h
@@ -26,10 +26,10 @@ class MockLocationProvider : public LocationProviderBase {
   void HandlePositionChanged(const Geoposition& position);
 
   // LocationProviderBase implementation.
-  virtual bool StartProvider(bool high_accuracy);
-  virtual void StopProvider();
-  virtual void GetPosition(Geoposition* position);
-  virtual void OnPermissionGranted(const GURL& requesting_frame);
+  virtual bool StartProvider(bool high_accuracy) OVERRIDE;
+  virtual void StopProvider() OVERRIDE;
+  virtual void GetPosition(Geoposition* position) OVERRIDE;
+  virtual void OnPermissionGranted(const GURL& requesting_frame) OVERRIDE;
 
   Geoposition position_;
   enum State { STOPPED, LOW_ACCURACY, HIGH_ACCURACY } state_;
diff --git a/content/browser/geolocation/network_location_provider.h b/content/browser/geolocation/network_location_provider.h
index 4330aee..8f6e360 100644
--- a/content/browser/geolocation/network_location_provider.h
+++ b/content/browser/geolocation/network_location_provider.h
@@ -71,11 +71,11 @@ class NetworkLocationProvider
   virtual ~NetworkLocationProvider();
 
   // LocationProviderBase implementation
-  virtual bool StartProvider(bool high_accuracy);
-  virtual void StopProvider();
-  virtual void GetPosition(Geoposition *position);
-  virtual void UpdatePosition();
-  virtual void OnPermissionGranted(const GURL& requesting_frame);
+  virtual bool StartProvider(bool high_accuracy) OVERRIDE;
+  virtual void StopProvider() OVERRIDE;
+  virtual void GetPosition(Geoposition *position) OVERRIDE;
+  virtual void UpdatePosition() OVERRIDE;
+  virtual void OnPermissionGranted(const GURL& requesting_frame) OVERRIDE;
 
  private:
   // Satisfies a position request from cache or network.
@@ -87,15 +87,15 @@ class NetworkLocationProvider
   bool IsStarted() const;
 
   // DeviceDataProvider::ListenerInterface implementation.
-  virtual void DeviceDataUpdateAvailable(RadioDataProvider* provider);
-  virtual void DeviceDataUpdateAvailable(WifiDataProvider* provider);
+  virtual void DeviceDataUpdateAvailable(RadioDataProvider* provider) OVERRIDE;
+  virtual void DeviceDataUpdateAvailable(WifiDataProvider* provider) OVERRIDE;
 
   // NetworkLocationRequest::ListenerInterface implementation.
   virtual void LocationResponseAvailable(const Geoposition& position,
                                          bool server_error,
                                          const string16& access_token,
                                          const RadioData& radio_data,
-                                         const WifiData& wifi_data);
+                                         const WifiData& wifi_data) OVERRIDE;
 
   scoped_refptr<AccessTokenStore> access_token_store_;
 
diff --git a/content/browser/geolocation/wifi_data_provider_common.h b/content/browser/geolocation/wifi_data_provider_common.h
index df3d681..eda08e3 100644
--- a/content/browser/geolocation/wifi_data_provider_common.h
+++ b/content/browser/geolocation/wifi_data_provider_common.h
@@ -82,9 +82,9 @@ class CONTENT_EXPORT WifiDataProviderCommon
   WifiDataProviderCommon();
 
   // WifiDataProviderImplBase implementation
-  virtual bool StartDataProvider();
-  virtual void StopDataProvider();
-  virtual bool GetData(WifiData* data);
+  virtual bool StartDataProvider() OVERRIDE;
+  virtual void StopDataProvider() OVERRIDE;
+  virtual bool GetData(WifiData* data) OVERRIDE;
 
  protected:
   virtual ~WifiDataProviderCommon();
@@ -97,8 +97,8 @@ class CONTENT_EXPORT WifiDataProviderCommon
 
  private:
   // Thread implementation
-  virtual void Init();
-  virtual void CleanUp();
+  virtual void Init() OVERRIDE;
+  virtual void CleanUp() OVERRIDE;
 
   // Task which run in the child thread.
   void DoWifiScanTask();
diff --git a/content/browser/geolocation/wifi_data_provider_mac.h b/content/browser/geolocation/wifi_data_provider_mac.h
index de67bed..7b95061 100644
--- a/content/browser/geolocation/wifi_data_provider_mac.h
+++ b/content/browser/geolocation/wifi_data_provider_mac.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -19,8 +19,8 @@ class MacWifiDataProvider : public WifiDataProviderCommon {
   virtual ~MacWifiDataProvider();
 
   // WifiDataProviderCommon
-  virtual WlanApiInterface* NewWlanApi();
-  virtual PollingPolicyInterface* NewPollingPolicy();
+  virtual WlanApiInterface* NewWlanApi() OVERRIDE;
+  virtual PollingPolicyInterface* NewPollingPolicy() OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(MacWifiDataProvider);
 };
diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h
index f4f226a..c6788b0 100644
--- a/content/browser/gpu/gpu_process_host.h
+++ b/content/browser/gpu/gpu_process_host.h
@@ -52,7 +52,7 @@ class GpuProcessHost : public BrowserChildProcessHost,
   static GpuProcessHost* FromID(int host_id);
   int host_id() const { return host_id_; }
 
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // ChildProcessHost implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
@@ -92,10 +92,10 @@ class GpuProcessHost : public BrowserChildProcessHost,
   // Post an IPC message to the UI shim's message handler on the UI thread.
   void RouteOnUIThread(const IPC::Message& message);
 
-  virtual bool CanShutdown();
-  virtual void OnProcessLaunched();
-  virtual void OnChildDied();
-  virtual void OnProcessCrashed(int exit_code);
+  virtual bool CanShutdown() OVERRIDE;
+  virtual void OnProcessLaunched() OVERRIDE;
+  virtual void OnChildDied() OVERRIDE;
+  virtual void OnProcessCrashed(int exit_code) OVERRIDE;
 
   // Message handlers.
   void OnChannelEstablished(const IPC::ChannelHandle& channel_handle);
diff --git a/content/browser/gpu/gpu_process_host_ui_shim.h b/content/browser/gpu/gpu_process_host_ui_shim.h
index a70f2a2..6a1f057 100644
--- a/content/browser/gpu/gpu_process_host_ui_shim.h
+++ b/content/browser/gpu/gpu_process_host_ui_shim.h
@@ -40,7 +40,7 @@ class CONTENT_EXPORT RouteToGpuProcessHostUIShimTask : public Task {
   virtual ~RouteToGpuProcessHostUIShimTask();
 
  private:
-  virtual void Run();
+  virtual void Run() OVERRIDE;
 
   int host_id_;
   IPC::Message msg_;
@@ -66,13 +66,13 @@ class CONTENT_EXPORT GpuProcessHostUIShim
   static GpuProcessHostUIShim* FromID(int host_id);
 
   // IPC::Channel::Sender implementation.
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // IPC::Channel::Listener implementation.
   // The GpuProcessHost causes this to be called on the UI thread to
   // dispatch the incoming messages from the GPU process, which are
   // actually received on the IO thread.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
 #if defined(OS_MACOSX) || defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   // TODO(apatrick): Remove this when mac does not use AcceleratedSurfaces for
diff --git a/content/browser/host_zoom_map.h b/content/browser/host_zoom_map.h
index 4d3efac..4579b88 100644
--- a/content/browser/host_zoom_map.h
+++ b/content/browser/host_zoom_map.h
@@ -69,7 +69,7 @@ class CONTENT_EXPORT HostZoomMap
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   double default_zoom_level() const { return default_zoom_level_; }
   void set_default_zoom_level(double level) { default_zoom_level_ = level; }
diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.h b/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
index 5a7c0d8..4ee03b9 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.h
@@ -43,11 +43,12 @@ class IndexedDBDispatcherHost : public BrowserMessageFilter {
   IndexedDBDispatcherHost(int process_id, WebKitContext* webkit_context);
 
   // BrowserMessageFilter implementation.
-  virtual void OnChannelClosing();
-  virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        content::BrowserThread::ID* thread);
+  virtual void OnChannelClosing() OVERRIDE;
+  virtual void OverrideThreadForMessage(
+      const IPC::Message& message,
+      content::BrowserThread::ID* thread) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
   void TransactionComplete(int32 transaction_id);
 
diff --git a/content/browser/in_process_webkit/webkit_thread.h b/content/browser/in_process_webkit/webkit_thread.h
index 5c62e2e..ed38bcf 100644
--- a/content/browser/in_process_webkit/webkit_thread.h
+++ b/content/browser/in_process_webkit/webkit_thread.h
@@ -31,8 +31,8 @@ class CONTENT_EXPORT WebKitThread {
     virtual ~InternalWebKitThread();
     // Does the actual initialization and shutdown of WebKit.  Called at the
     // beginning and end of the thread's lifetime.
-    virtual void Init();
-    virtual void CleanUp();
+    virtual void Init() OVERRIDE;
+    virtual void CleanUp() OVERRIDE;
 
    private:
     // The WebKitPlatformSupport implementation.  Only access on WebKit thread.
diff --git a/content/browser/mach_broker_mac.h b/content/browser/mach_broker_mac.h
index 6fdaaa8..27a61dd 100644
--- a/content/browser/mach_broker_mac.h
+++ b/content/browser/mach_broker_mac.h
@@ -79,12 +79,12 @@ class MachBroker : public base::ProcessMetrics::PortProvider,
   static std::string GetMachPortName();
 
   // Implement |ProcessMetrics::PortProvider|.
-  virtual mach_port_t TaskForPid(base::ProcessHandle process) const;
+  virtual mach_port_t TaskForPid(base::ProcessHandle process) const OVERRIDE;
 
   // Implement |content::NotificationObserver|.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
  private:
   // Private constructor.
   MachBroker();
diff --git a/content/browser/mime_registry_message_filter.h b/content/browser/mime_registry_message_filter.h
index 1274055..5e69152 100644
--- a/content/browser/mime_registry_message_filter.h
+++ b/content/browser/mime_registry_message_filter.h
@@ -12,10 +12,11 @@ class MimeRegistryMessageFilter : public BrowserMessageFilter {
  public:
   MimeRegistryMessageFilter();
 
-  virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        content::BrowserThread::ID* thread);
+  virtual void OverrideThreadForMessage(
+      const IPC::Message& message,
+      content::BrowserThread::ID* thread) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
  private:
   virtual ~MimeRegistryMessageFilter();
diff --git a/content/browser/net/browser_online_state_observer.h b/content/browser/net/browser_online_state_observer.h
index 9a5b62b..50fbb66 100644
--- a/content/browser/net/browser_online_state_observer.h
+++ b/content/browser/net/browser_online_state_observer.h
@@ -19,7 +19,7 @@ class CONTENT_EXPORT BrowserOnlineStateObserver
   virtual ~BrowserOnlineStateObserver();
 
   // OnlineStateObserver implementation.
-  virtual void OnOnlineStateChanged(bool online);
+  virtual void OnOnlineStateChanged(bool online) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserOnlineStateObserver);
diff --git a/content/browser/net/url_request_failed_dns_job.h b/content/browser/net/url_request_failed_dns_job.h
index 0442eb3..96c0d8a 100644
--- a/content/browser/net/url_request_failed_dns_job.h
+++ b/content/browser/net/url_request_failed_dns_job.h
@@ -15,7 +15,7 @@ class URLRequestFailedDnsJob : public net::URLRequestJob {
  public:
   explicit URLRequestFailedDnsJob(net::URLRequest* request);
 
-  virtual void Start();
+  virtual void Start() OVERRIDE;
 
   static net::URLRequestJob* Factory(net::URLRequest* request,
                                      const std::string& scheme);
diff --git a/content/browser/net/url_request_mock_http_job.h b/content/browser/net/url_request_mock_http_job.h
index 093b686..7cb9270 100644
--- a/content/browser/net/url_request_mock_http_job.h
+++ b/content/browser/net/url_request_mock_http_job.h
@@ -19,10 +19,11 @@ class CONTENT_EXPORT URLRequestMockHTTPJob : public net::URLRequestFileJob {
  public:
   URLRequestMockHTTPJob(net::URLRequest* request, const FilePath& file_path);
 
-  virtual bool GetMimeType(std::string* mime_type) const;
-  virtual bool GetCharset(std::string* charset);
-  virtual void GetResponseInfo(net::HttpResponseInfo* info);
-  virtual bool IsRedirectResponse(GURL* location, int* http_status_code);
+  virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
+  virtual bool GetCharset(std::string* charset) OVERRIDE;
+  virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE;
+  virtual bool IsRedirectResponse(GURL* location,
+                                  int* http_status_code) OVERRIDE;
 
   static net::URLRequest::ProtocolFactory Factory;
 
diff --git a/content/browser/net/url_request_slow_download_job.h b/content/browser/net/url_request_slow_download_job.h
index 5e70fb8..04c7d2c 100644
--- a/content/browser/net/url_request_slow_download_job.h
+++ b/content/browser/net/url_request_slow_download_job.h
@@ -34,10 +34,12 @@ class URLRequestSlowDownloadJob : public net::URLRequestJob {
   void CheckDoneStatus();
 
   // net::URLRequestJob methods
-  virtual void Start();
-  virtual bool GetMimeType(std::string* mime_type) const;
-  virtual void GetResponseInfo(net::HttpResponseInfo* info);
-  virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int *bytes_read);
+  virtual void Start() OVERRIDE;
+  virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
+  virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE;
+  virtual bool ReadRawData(net::IOBuffer* buf,
+                           int buf_size,
+                           int *bytes_read) OVERRIDE;
 
   static net::URLRequestJob* Factory(net::URLRequest* request,
                                      const std::string& scheme);
diff --git a/content/browser/net/url_request_slow_http_job.h b/content/browser/net/url_request_slow_http_job.h
index b94d0b9..e09f0ff 100644
--- a/content/browser/net/url_request_slow_http_job.h
+++ b/content/browser/net/url_request_slow_http_job.h
@@ -27,7 +27,7 @@ class URLRequestSlowHTTPJob : public URLRequestMockHTTPJob {
   // construct a mock URL.
   static GURL GetMockUrl(const FilePath& path);
 
-  virtual void Start();
+  virtual void Start() OVERRIDE;
 
  private:
   virtual ~URLRequestSlowHTTPJob();
diff --git a/content/browser/notification_service_impl.h b/content/browser/notification_service_impl.h
index 0880974..c6e1874 100644
--- a/content/browser/notification_service_impl.h
+++ b/content/browser/notification_service_impl.h
@@ -29,8 +29,8 @@ class CONTENT_EXPORT NotificationServiceImpl
 
   // content::NotificationService
   virtual void Notify(int type,
-              const content::NotificationSource& source,
-              const content::NotificationDetails& details);
+                      const content::NotificationSource& source,
+                      const content::NotificationDetails& details) OVERRIDE;
 
  private:
   friend class content::NotificationRegistrar;
diff --git a/content/browser/plugin_loader_posix.h b/content/browser/plugin_loader_posix.h
index b99a17a..b69ad89 100644
--- a/content/browser/plugin_loader_posix.h
+++ b/content/browser/plugin_loader_posix.h
@@ -57,7 +57,7 @@ class CONTENT_EXPORT PluginLoaderPosix : public UtilityProcessHost::Client,
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // IPC::Message::Sender:
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
  private:
   struct PendingCallback {
diff --git a/content/browser/plugin_process_host.h b/content/browser/plugin_process_host.h
index ffd072c..b56183f 100644
--- a/content/browser/plugin_process_host.h
+++ b/content/browser/plugin_process_host.h
@@ -69,7 +69,7 @@ class CONTENT_EXPORT PluginProcessHost : public BrowserChildProcessHost {
   bool Init(const webkit::WebPluginInfo& info, const std::string& locale);
 
   // Force the plugin process to shutdown (cleanly).
-  virtual void ForceShutdown();
+  virtual void ForceShutdown() OVERRIDE;
 
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
@@ -135,7 +135,7 @@ class CONTENT_EXPORT PluginProcessHost : public BrowserChildProcessHost {
   void OnPluginSetCursorVisibility(bool visible);
 #endif
 
-  virtual bool CanShutdown();
+  virtual bool CanShutdown() OVERRIDE;
 
   void CancelRequests();
 
diff --git a/content/browser/plugin_service.h b/content/browser/plugin_service.h
index dcc9a8b..da93943 100644
--- a/content/browser/plugin_service.h
+++ b/content/browser/plugin_service.h
@@ -202,11 +202,13 @@ class CONTENT_EXPORT PluginService
   virtual ~PluginService();
 
   // base::WaitableEventWatcher::Delegate implementation.
-  virtual void OnWaitableEventSignaled(base::WaitableEvent* waitable_event);
+  virtual void OnWaitableEventSignaled(
+      base::WaitableEvent* waitable_event) OVERRIDE;
 
   // content::NotificationObserver implementation
-  virtual void Observe(int type, const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE;
 
   void RegisterPepperPlugins();
 
diff --git a/content/browser/ppapi_plugin_process_host.h b/content/browser/ppapi_plugin_process_host.h
index a8c56a6..52227d7 100644
--- a/content/browser/ppapi_plugin_process_host.h
+++ b/content/browser/ppapi_plugin_process_host.h
@@ -86,8 +86,8 @@ class PpapiPluginProcessHost
 
   void RequestPluginChannel(Client* client);
 
-  virtual bool CanShutdown();
-  virtual void OnProcessLaunched();
+  virtual bool CanShutdown() OVERRIDE;
+  virtual void OnProcessLaunched() OVERRIDE;
 
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
diff --git a/content/browser/renderer_host/async_resource_handler.h b/content/browser/renderer_host/async_resource_handler.h
index bfef818..38d1fb6 100644
--- a/content/browser/renderer_host/async_resource_handler.h
+++ b/content/browser/renderer_host/async_resource_handler.h
@@ -25,19 +25,30 @@ class AsyncResourceHandler : public ResourceHandler {
                        ResourceDispatcherHost* resource_dispatcher_host);
 
   // ResourceHandler implementation:
-  virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
-  virtual bool OnRequestRedirected(int request_id, const GURL& new_url,
-                                   ResourceResponse* response, bool* defer);
-  virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
-  virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
-  virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
-                          int min_size);
-  virtual bool OnReadCompleted(int request_id, int* bytes_read);
+  virtual bool OnUploadProgress(int request_id,
+                                uint64 position,
+                                uint64 size) OVERRIDE;
+  virtual bool OnRequestRedirected(int request_id,
+                                   const GURL& new_url,
+                                   ResourceResponse* response,
+                                   bool* defer) OVERRIDE;
+  virtual bool OnResponseStarted(int request_id,
+                                 ResourceResponse* response) OVERRIDE;
+  virtual bool OnWillStart(int request_id,
+                           const GURL& url,
+                           bool* defer) OVERRIDE;
+  virtual bool OnWillRead(int request_id,
+                          net::IOBuffer** buf,
+                          int* buf_size,
+                          int min_size) OVERRIDE;
+  virtual bool OnReadCompleted(int request_id,
+                               int* bytes_read) OVERRIDE;
   virtual bool OnResponseCompleted(int request_id,
                                    const net::URLRequestStatus& status,
-                                   const std::string& security_info);
-  virtual void OnRequestClosed();
-  virtual void OnDataDownloaded(int request_id, int bytes_downloaded);
+                                   const std::string& security_info) OVERRIDE;
+  virtual void OnRequestClosed() OVERRIDE;
+  virtual void OnDataDownloaded(int request_id,
+                                int bytes_downloaded) OVERRIDE;
 
   static void GlobalCleanup();
 
diff --git a/content/browser/renderer_host/backing_store_gtk.h b/content/browser/renderer_host/backing_store_gtk.h
index eeeb771..b69862e 100644
--- a/content/browser/renderer_host/backing_store_gtk.h
+++ b/content/browser/renderer_host/backing_store_gtk.h
@@ -56,19 +56,19 @@ class CONTENT_EXPORT BackingStoreGtk : public BackingStore {
 #endif
 
   // BackingStore implementation.
-  virtual size_t MemorySize();
+  virtual size_t MemorySize() OVERRIDE;
   virtual void PaintToBackingStore(
       RenderProcessHost* process,
       TransportDIB::Id bitmap,
       const gfx::Rect& bitmap_rect,
       const std::vector<gfx::Rect>& copy_rects,
       const base::Closure& completion_callback,
-      bool* scheduled_completion_callback);
+      bool* scheduled_completion_callback) OVERRIDE;
   virtual bool CopyFromBackingStore(const gfx::Rect& rect,
-                                    skia::PlatformCanvas* output);
+                                    skia::PlatformCanvas* output) OVERRIDE;
   virtual void ScrollBackingStore(int dx, int dy,
                                   const gfx::Rect& clip_rect,
-                                  const gfx::Size& view_size);
+                                  const gfx::Size& view_size) OVERRIDE;
 
  private:
   // Paints the bitmap from the renderer onto the backing store without
diff --git a/content/browser/renderer_host/backing_store_mac.h b/content/browser/renderer_host/backing_store_mac.h
index a2707eb..ed6801d 100644
--- a/content/browser/renderer_host/backing_store_mac.h
+++ b/content/browser/renderer_host/backing_store_mac.h
@@ -30,12 +30,12 @@ class BackingStoreMac : public BackingStore {
       const gfx::Rect& bitmap_rect,
       const std::vector<gfx::Rect>& copy_rects,
       const base::Closure& completion_callback,
-      bool* scheduled_completion_callback);
+      bool* scheduled_completion_callback) OVERRIDE;
   virtual bool CopyFromBackingStore(const gfx::Rect& rect,
-                                    skia::PlatformCanvas* output);
+                                    skia::PlatformCanvas* output) OVERRIDE;
   virtual void ScrollBackingStore(int dx, int dy,
                                   const gfx::Rect& clip_rect,
-                                  const gfx::Size& view_size);
+                                  const gfx::Size& view_size) OVERRIDE;
 
  private:
   // Creates a CGLayer associated with its owner view's window's graphics
diff --git a/content/browser/renderer_host/backing_store_skia.h b/content/browser/renderer_host/backing_store_skia.h
index 5251093..da3a81d 100644
--- a/content/browser/renderer_host/backing_store_skia.h
+++ b/content/browser/renderer_host/backing_store_skia.h
@@ -33,19 +33,19 @@ class BackingStoreSkia : public BackingStore {
                                    gfx::Canvas* canvas);
 
   // BackingStore implementation.
-  virtual size_t MemorySize();
+  virtual size_t MemorySize() OVERRIDE;
   virtual void PaintToBackingStore(
       RenderProcessHost* process,
       TransportDIB::Id bitmap,
       const gfx::Rect& bitmap_rect,
       const std::vector<gfx::Rect>& copy_rects,
       const base::Closure& completion_callback,
-      bool* scheduled_completion_callback);
+      bool* scheduled_completion_callback) OVERRIDE;
   virtual bool CopyFromBackingStore(const gfx::Rect& rect,
-                                    skia::PlatformCanvas* output);
+                                    skia::PlatformCanvas* output) OVERRIDE;
   virtual void ScrollBackingStore(int dx, int dy,
                                   const gfx::Rect& clip_rect,
-                                  const gfx::Size& view_size);
+                                  const gfx::Size& view_size) OVERRIDE;
 
  private:
   SkBitmap bitmap_;
diff --git a/content/browser/renderer_host/backing_store_win.h b/content/browser/renderer_host/backing_store_win.h
index b5910f2..6690cc2 100644
--- a/content/browser/renderer_host/backing_store_win.h
+++ b/content/browser/renderer_host/backing_store_win.h
@@ -22,18 +22,19 @@ class BackingStoreWin : public BackingStore {
   static bool ColorManagementEnabled();
 
   // BackingStore implementation.
-  virtual size_t MemorySize();
-  virtual void PaintToBackingStore(RenderProcessHost* process,
-                                   TransportDIB::Id bitmap,
-                                   const gfx::Rect& bitmap_rect,
-                                   const std::vector<gfx::Rect>& copy_rects,
-                                   const base::Closure& completion_callback,
-                                   bool* scheduled_completion_callback);
+  virtual size_t MemorySize() OVERRIDE;
+  virtual void PaintToBackingStore(
+      RenderProcessHost* process,
+      TransportDIB::Id bitmap,
+      const gfx::Rect& bitmap_rect,
+      const std::vector<gfx::Rect>& copy_rects,
+      const base::Closure& completion_callback,
+      bool* scheduled_completion_callback) OVERRIDE;
   virtual bool CopyFromBackingStore(const gfx::Rect& rect,
-                                    skia::PlatformCanvas* output);
+                                    skia::PlatformCanvas* output) OVERRIDE;
   virtual void ScrollBackingStore(int dx, int dy,
                                   const gfx::Rect& clip_rect,
-                                  const gfx::Size& view_size);
+                                  const gfx::Size& view_size) OVERRIDE;
 
  private:
   // The backing store dc.
diff --git a/content/browser/renderer_host/blob_message_filter.h b/content/browser/renderer_host/blob_message_filter.h
index 24758ac..762763a 100644
--- a/content/browser/renderer_host/blob_message_filter.h
+++ b/content/browser/renderer_host/blob_message_filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -24,9 +24,9 @@ class BlobMessageFilter : public BrowserMessageFilter {
   virtual ~BlobMessageFilter();
 
   // BrowserMessageFilter implementation.
-  virtual void OnChannelClosing();
+  virtual void OnChannelClosing() OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
  private:
   void OnStartBuildingBlob(const GURL& url);
diff --git a/content/browser/renderer_host/browser_render_process_host.h b/content/browser/renderer_host/browser_render_process_host.h
index 68c2d47..9303cbf 100644
--- a/content/browser/renderer_host/browser_render_process_host.h
+++ b/content/browser/renderer_host/browser_render_process_host.h
@@ -50,28 +50,29 @@ class CONTENT_EXPORT BrowserRenderProcessHost
   virtual ~BrowserRenderProcessHost();
 
   // RenderProcessHost implementation (public portion).
-  virtual void EnableSendQueue();
-  virtual bool Init(bool is_accessibility_enabled);
-  virtual int GetNextRoutingID();
-  virtual void CancelResourceRequests(int render_widget_id);
-  virtual void CrossSiteSwapOutACK(const ViewMsg_SwapOut_Params& params);
+  virtual void EnableSendQueue() OVERRIDE;
+  virtual bool Init(bool is_accessibility_enabled) OVERRIDE;
+  virtual int GetNextRoutingID() OVERRIDE;
+  virtual void CancelResourceRequests(int render_widget_id) OVERRIDE;
+  virtual void CrossSiteSwapOutACK(
+      const ViewMsg_SwapOut_Params& params) OVERRIDE;
   virtual bool WaitForUpdateMsg(int render_widget_id,
                                 const base::TimeDelta& max_delay,
-                                IPC::Message* msg);
-  virtual void ReceivedBadMessage();
-  virtual void WidgetRestored();
-  virtual void WidgetHidden();
-  virtual int VisibleWidgetCount() const;
-  virtual bool FastShutdownIfPossible();
-  virtual void DumpHandles();
-  virtual base::ProcessHandle GetHandle();
-  virtual TransportDIB* GetTransportDIB(TransportDIB::Id dib_id);
+                                IPC::Message* msg) OVERRIDE;
+  virtual void ReceivedBadMessage() OVERRIDE;
+  virtual void WidgetRestored() OVERRIDE;
+  virtual void WidgetHidden() OVERRIDE;
+  virtual int VisibleWidgetCount() const OVERRIDE;
+  virtual bool FastShutdownIfPossible() OVERRIDE;
+  virtual void DumpHandles() OVERRIDE;
+  virtual base::ProcessHandle GetHandle() OVERRIDE;
+  virtual TransportDIB* GetTransportDIB(TransportDIB::Id dib_id) OVERRIDE;
   virtual void SetCompositingSurface(
       int render_widget_id,
-      gfx::PluginWindowHandle compositing_surface);
+      gfx::PluginWindowHandle compositing_surface) OVERRIDE;
 
   // IPC::Channel::Sender via RenderProcessHost.
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // IPC::Channel::Listener via RenderProcessHost.
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
@@ -79,7 +80,7 @@ class CONTENT_EXPORT BrowserRenderProcessHost
   virtual void OnChannelError() OVERRIDE;
 
   // ChildProcessLauncher::Client implementation.
-  virtual void OnProcessLaunched();
+  virtual void OnProcessLaunched() OVERRIDE;
 
   // base::WaitableEventWatcher::Delegate implementation.
   virtual void OnWaitableEventSignaled(
diff --git a/content/browser/renderer_host/buffered_resource_handler.h b/content/browser/renderer_host/buffered_resource_handler.h
index 59688a1..f9afcb9 100644
--- a/content/browser/renderer_host/buffered_resource_handler.h
+++ b/content/browser/renderer_host/buffered_resource_handler.h
@@ -28,18 +28,27 @@ class BufferedResourceHandler : public ResourceHandler {
                           net::URLRequest* request);
 
   // ResourceHandler implementation:
-  virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
-  virtual bool OnRequestRedirected(int request_id, const GURL& new_url,
-                                   ResourceResponse* response, bool* defer);
-  virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
-  virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
-  virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
-                          int min_size);
-  virtual bool OnReadCompleted(int request_id, int* bytes_read);
+  virtual bool OnUploadProgress(int request_id,
+                                uint64 position,
+                                uint64 size) OVERRIDE;
+  virtual bool OnRequestRedirected(int request_id,
+                                   const GURL& new_url,
+                                   ResourceResponse* response,
+                                   bool* defer) OVERRIDE;
+  virtual bool OnResponseStarted(int request_id,
+                                 ResourceResponse* response) OVERRIDE;
+  virtual bool OnWillStart(int request_id,
+                           const GURL& url,
+                           bool* defer) OVERRIDE;
+  virtual bool OnWillRead(int request_id,
+                          net::IOBuffer** buf,
+                          int* buf_size,
+                          int min_size) OVERRIDE;
+  virtual bool OnReadCompleted(int request_id, int* bytes_read) OVERRIDE;
   virtual bool OnResponseCompleted(int request_id,
                                    const net::URLRequestStatus& status,
-                                   const std::string& security_info);
-  virtual void OnRequestClosed();
+                                   const std::string& security_info) OVERRIDE;
+  virtual void OnRequestClosed() OVERRIDE;
 
  private:
   virtual ~BufferedResourceHandler();
diff --git a/content/browser/renderer_host/clipboard_message_filter.h b/content/browser/renderer_host/clipboard_message_filter.h
index 0d96aca..b4f24bb 100644
--- a/content/browser/renderer_host/clipboard_message_filter.h
+++ b/content/browser/renderer_host/clipboard_message_filter.h
@@ -18,10 +18,11 @@ class ClipboardMessageFilter : public BrowserMessageFilter {
  public:
   ClipboardMessageFilter();
 
-  virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        content::BrowserThread::ID* thread);
+  virtual void OverrideThreadForMessage(
+      const IPC::Message& message,
+      content::BrowserThread::ID* thread) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
  private:
   virtual ~ClipboardMessageFilter();
 
diff --git a/content/browser/renderer_host/cross_site_resource_handler.h b/content/browser/renderer_host/cross_site_resource_handler.h
index 9fee1b9..eadbf64 100644
--- a/content/browser/renderer_host/cross_site_resource_handler.h
+++ b/content/browser/renderer_host/cross_site_resource_handler.h
@@ -25,19 +25,28 @@ class CrossSiteResourceHandler : public ResourceHandler {
                            ResourceDispatcherHost* resource_dispatcher_host);
 
   // ResourceHandler implementation:
-  virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
-  virtual bool OnRequestRedirected(int request_id, const GURL& new_url,
-                                   ResourceResponse* response, bool* defer);
+  virtual bool OnUploadProgress(int request_id,
+                                uint64 position,
+                                uint64 size) OVERRIDE;
+  virtual bool OnRequestRedirected(int request_id,
+                                   const GURL& new_url,
+                                   ResourceResponse* response,
+                                   bool* defer) OVERRIDE;
   virtual bool OnResponseStarted(int request_id,
-                                 ResourceResponse* response);
-  virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
-  virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
-                          int min_size);
-  virtual bool OnReadCompleted(int request_id, int* bytes_read);
+                                 ResourceResponse* response) OVERRIDE;
+  virtual bool OnWillStart(int request_id,
+                           const GURL& url,
+                           bool* defer) OVERRIDE;
+  virtual bool OnWillRead(int request_id,
+                          net::IOBuffer** buf,
+                          int* buf_size,
+                          int min_size) OVERRIDE;
+  virtual bool OnReadCompleted(int request_id,
+                               int* bytes_read) OVERRIDE;
   virtual bool OnResponseCompleted(int request_id,
                                    const net::URLRequestStatus& status,
-                                   const std::string& security_info);
-  virtual void OnRequestClosed();
+                                   const std::string& security_info) OVERRIDE;
+  virtual void OnRequestClosed() OVERRIDE;
 
   // We can now send the response to the new renderer, which will cause
   // TabContents to swap in the new renderer and destroy the old one.
diff --git a/content/browser/renderer_host/database_message_filter.h b/content/browser/renderer_host/database_message_filter.h
index 2b71428..a9a1aa6 100644
--- a/content/browser/renderer_host/database_message_filter.h
+++ b/content/browser/renderer_host/database_message_filter.h
@@ -20,11 +20,12 @@ class DatabaseMessageFilter
   explicit DatabaseMessageFilter(webkit_database::DatabaseTracker* db_tracker);
 
   // BrowserMessageFilter implementation.
-  virtual void OnChannelClosing();
-  virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        content::BrowserThread::ID* thread);
+  virtual void OnChannelClosing() OVERRIDE;
+  virtual void OverrideThreadForMessage(
+      const IPC::Message& message,
+      content::BrowserThread::ID* thread) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
   webkit_database::DatabaseTracker* database_tracker() const {
     return db_tracker_.get();
@@ -71,9 +72,10 @@ class DatabaseMessageFilter
   // DatabaseTracker::Observer callbacks (file thread)
   virtual void OnDatabaseSizeChanged(const string16& origin_identifier,
                                      const string16& database_name,
-                                     int64 database_size);
-  virtual void OnDatabaseScheduledForDeletion(const string16& origin_identifier,
-                                              const string16& database_name);
+                                     int64 database_size) OVERRIDE;
+  virtual void OnDatabaseScheduledForDeletion(
+      const string16& origin_identifier,
+      const string16& database_name) OVERRIDE;
 
   void DatabaseDeleteFile(const string16& vfs_file_name,
                           bool sync_dir,
diff --git a/content/browser/renderer_host/file_utilities_message_filter.h b/content/browser/renderer_host/file_utilities_message_filter.h
index fc42962..47a1926 100644
--- a/content/browser/renderer_host/file_utilities_message_filter.h
+++ b/content/browser/renderer_host/file_utilities_message_filter.h
@@ -23,10 +23,11 @@ class FileUtilitiesMessageFilter : public BrowserMessageFilter {
   explicit FileUtilitiesMessageFilter(int process_id);
 
   // BrowserMessageFilter implementation.
-  virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        content::BrowserThread::ID* thread);
+  virtual void OverrideThreadForMessage(
+      const IPC::Message& message,
+      content::BrowserThread::ID* thread) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
  private:
   virtual ~FileUtilitiesMessageFilter();
 
diff --git a/content/browser/renderer_host/gpu_message_filter.h b/content/browser/renderer_host/gpu_message_filter.h
index e6eafb5..ccc7dbb 100644
--- a/content/browser/renderer_host/gpu_message_filter.h
+++ b/content/browser/renderer_host/gpu_message_filter.h
@@ -26,7 +26,7 @@ class GpuMessageFilter : public BrowserMessageFilter,
 
   // BrowserMessageFilter methods:
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
  private:
   friend class content::BrowserThread;
diff --git a/content/browser/renderer_host/media/audio_input_device_manager.h b/content/browser/renderer_host/media/audio_input_device_manager.h
index 342e1c0..c8c6014 100644
--- a/content/browser/renderer_host/media/audio_input_device_manager.h
+++ b/content/browser/renderer_host/media/audio_input_device_manager.h
@@ -39,11 +39,11 @@ class CONTENT_EXPORT AudioInputDeviceManager : public MediaStreamProvider {
   virtual ~AudioInputDeviceManager();
 
   // MediaStreamProvider implementation, called on IO thread.
-  virtual void Register(MediaStreamProviderListener* listener);
-  virtual void Unregister();
-  virtual void EnumerateDevices();
-  virtual int Open(const StreamDeviceInfo& device);
-  virtual void Close(int session_id);
+  virtual void Register(MediaStreamProviderListener* listener) OVERRIDE;
+  virtual void Unregister() OVERRIDE;
+  virtual void EnumerateDevices() OVERRIDE;
+  virtual int Open(const StreamDeviceInfo& device) OVERRIDE;
+  virtual void Close(int session_id) OVERRIDE;
 
   // Functions used by AudioInputRenderHost, called on IO thread.
   // Start the device referenced by the session id.
diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h
index 8daa31f..b03556e 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.h
@@ -107,23 +107,23 @@ class CONTENT_EXPORT AudioInputRendererHost
       const content::ResourceContext* resource_context);
 
   // BrowserMessageFilter implementation.
-  virtual void OnChannelClosing();
-  virtual void OnDestruct() const;
+  virtual void OnChannelClosing() OVERRIDE;
+  virtual void OnDestruct() const OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
   // AudioInputController::EventHandler implementation.
-  virtual void OnCreated(media::AudioInputController* controller);
-  virtual void OnRecording(media::AudioInputController* controller);
+  virtual void OnCreated(media::AudioInputController* controller) OVERRIDE;
+  virtual void OnRecording(media::AudioInputController* controller) OVERRIDE;
   virtual void OnError(media::AudioInputController* controller,
-                       int error_code);
+                       int error_code) OVERRIDE;
   virtual void OnData(media::AudioInputController* controller,
                       const uint8* data,
-                      uint32 size);
+                      uint32 size) OVERRIDE;
 
   // media_stream::AudioInputDeviceManagerEventHandler implementation.
-  virtual void OnDeviceStarted(int session_id, int index);
-  virtual void OnDeviceStopped(int session_id);
+  virtual void OnDeviceStarted(int session_id, int index) OVERRIDE;
+  virtual void OnDeviceStopped(int session_id) OVERRIDE;
 
  private:
   // TODO(henrika): extend test suite (compare AudioRenderHost)
diff --git a/content/browser/renderer_host/media/audio_input_sync_writer.h b/content/browser/renderer_host/media/audio_input_sync_writer.h
index 5dc89df..b3f69a8b 100644
--- a/content/browser/renderer_host/media/audio_input_sync_writer.h
+++ b/content/browser/renderer_host/media/audio_input_sync_writer.h
@@ -26,9 +26,9 @@ class AudioInputSyncWriter : public media::AudioInputController::SyncWriter {
   virtual ~AudioInputSyncWriter();
 
   // media::AudioOutputController::SyncWriter implementation.
-  virtual void UpdateRecordedBytes(uint32 bytes);
-  virtual uint32 Write(const void* data, uint32 size);
-  virtual void Close();
+  virtual void UpdateRecordedBytes(uint32 bytes) OVERRIDE;
+  virtual uint32 Write(const void* data, uint32 size) OVERRIDE;
+  virtual void Close() OVERRIDE;
 
   bool Init();
   bool PrepareForeignSocketHandle(base::ProcessHandle process_handle,
diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h
index 6709111..cfa6245 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_renderer_host.h
@@ -108,19 +108,19 @@ class CONTENT_EXPORT AudioRendererHost
   AudioRendererHost(const content::ResourceContext* resource_context);
 
   // BrowserMessageFilter implementation.
-  virtual void OnChannelClosing();
-  virtual void OnDestruct() const;
+  virtual void OnChannelClosing() OVERRIDE;
+  virtual void OnDestruct() const OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
   // AudioOutputController::EventHandler implementations.
-  virtual void OnCreated(media::AudioOutputController* controller);
-  virtual void OnPlaying(media::AudioOutputController* controller);
-  virtual void OnPaused(media::AudioOutputController* controller);
+  virtual void OnCreated(media::AudioOutputController* controller) OVERRIDE;
+  virtual void OnPlaying(media::AudioOutputController* controller) OVERRIDE;
+  virtual void OnPaused(media::AudioOutputController* controller) OVERRIDE;
   virtual void OnError(media::AudioOutputController* controller,
-                       int error_code);
+                       int error_code) OVERRIDE;
   virtual void OnMoreData(media::AudioOutputController* controller,
-                          AudioBuffersState buffers_state);
+                          AudioBuffersState buffers_state) OVERRIDE;
 
  private:
   friend class AudioRendererHostTest;
diff --git a/content/browser/renderer_host/media/audio_sync_reader.h b/content/browser/renderer_host/media/audio_sync_reader.h
index 809e117..4aff8aa9 100644
--- a/content/browser/renderer_host/media/audio_sync_reader.h
+++ b/content/browser/renderer_host/media/audio_sync_reader.h
@@ -28,10 +28,10 @@ class AudioSyncReader : public media::AudioOutputController::SyncReader {
   virtual ~AudioSyncReader();
 
   // media::AudioOutputController::SyncReader implementations.
-  virtual void UpdatePendingBytes(uint32 bytes);
-  virtual uint32 Read(void* data, uint32 size);
-  virtual void Close();
-  virtual bool DataReady();
+  virtual void UpdatePendingBytes(uint32 bytes) OVERRIDE;
+  virtual uint32 Read(void* data, uint32 size) OVERRIDE;
+  virtual void Close() OVERRIDE;
+  virtual bool DataReady() OVERRIDE;
 
   bool Init();
   bool PrepareForeignSocketHandle(base::ProcessHandle process_handle,
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.h b/content/browser/renderer_host/media/media_stream_dispatcher_host.h
index cc315ed..b57ea58 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.h
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.h
@@ -33,18 +33,19 @@ class CONTENT_EXPORT MediaStreamDispatcherHost
   virtual ~MediaStreamDispatcherHost();
 
   // MediaStreamRequester implementation.
-  virtual void StreamGenerated(const std::string& label,
-                               const StreamDeviceInfoArray& audio_devices,
-                               const StreamDeviceInfoArray& video_devices);
+  virtual void StreamGenerated(
+      const std::string& label,
+      const StreamDeviceInfoArray& audio_devices,
+      const StreamDeviceInfoArray& video_devices) OVERRIDE;
 
-  virtual void StreamGenerationFailed(const std::string& label);
-  virtual void AudioDeviceFailed(const std::string& label, int index);
-  virtual void VideoDeviceFailed(const std::string& label, int index);
+  virtual void StreamGenerationFailed(const std::string& label) OVERRIDE;
+  virtual void AudioDeviceFailed(const std::string& label, int index) OVERRIDE;
+  virtual void VideoDeviceFailed(const std::string& label, int index) OVERRIDE;
 
   // BrowserMessageFilter implementation.
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
-  virtual void OnChannelClosing();
+                                 bool* message_was_ok) OVERRIDE;
+  virtual void OnChannelClosing() OVERRIDE;
 
  private:
   friend class MockMediaStreamDispatcherHost;
diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
index 4edc6dd..0f48afe 100644
--- a/content/browser/renderer_host/media/media_stream_manager.h
+++ b/content/browser/renderer_host/media/media_stream_manager.h
@@ -69,19 +69,22 @@ class CONTENT_EXPORT MediaStreamManager
   void StopGeneratedStream(const std::string& label);
 
   // Implements MediaStreamProviderListener.
-  virtual void Opened(MediaStreamType stream_type, int capture_session_id);
-  virtual void Closed(MediaStreamType stream_type, int capture_session_id);
+  virtual void Opened(MediaStreamType stream_type,
+                      int capture_session_id) OVERRIDE;
+  virtual void Closed(MediaStreamType stream_type,
+                      int capture_session_id) OVERRIDE;
   virtual void DevicesEnumerated(MediaStreamType stream_type,
-                                 const StreamDeviceInfoArray& devices);
-  virtual void Error(MediaStreamType stream_type, int capture_session_id,
-                     MediaStreamProviderError error);
+                                 const StreamDeviceInfoArray& devices) OVERRIDE;
+  virtual void Error(MediaStreamType stream_type,
+                     int capture_session_id,
+                     MediaStreamProviderError error) OVERRIDE;
 
   // Implements SettingsRequester.
   virtual void GetDevices(const std::string& label,
-                          MediaStreamType stream_type);
+                          MediaStreamType stream_type) OVERRIDE;
   virtual void DevicesAccepted(const std::string& label,
-                               const StreamDeviceInfoArray& devices);
-  virtual void SettingsError(const std::string& label);
+                               const StreamDeviceInfoArray& devices) OVERRIDE;
+  virtual void SettingsError(const std::string& label) OVERRIDE;
 
   // Used by unit test to make sure fake devices are used instead of a real
   // devices, which is needed for server based testing.
diff --git a/content/browser/renderer_host/media/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h
index 5306e55..168c4f3 100644
--- a/content/browser/renderer_host/media/video_capture_host.h
+++ b/content/browser/renderer_host/media/video_capture_host.h
@@ -55,24 +55,24 @@ class CONTENT_EXPORT VideoCaptureHost
   explicit VideoCaptureHost(const content::ResourceContext* resource_context);
 
   // BrowserMessageFilter implementation.
-  virtual void OnChannelClosing();
-  virtual void OnDestruct() const;
+  virtual void OnChannelClosing() OVERRIDE;
+  virtual void OnDestruct() const OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
   // VideoCaptureControllerEventHandler implementation.
-  virtual void OnError(const VideoCaptureControllerID& id);
+  virtual void OnError(const VideoCaptureControllerID& id) OVERRIDE;
   virtual void OnBufferCreated(const VideoCaptureControllerID& id,
                                base::SharedMemoryHandle handle,
-                               int length, int buffer_id);
+                               int length, int buffer_id) OVERRIDE;
   virtual void OnBufferReady(const VideoCaptureControllerID& id,
                              int buffer_id,
-                             base::Time timestamp);
+                             base::Time timestamp) OVERRIDE;
   virtual void OnFrameInfo(const VideoCaptureControllerID& id,
                            int width,
                            int height,
-                           int frame_per_second);
-  virtual void OnReadyToDelete(const VideoCaptureControllerID& id);
+                           int frame_per_second) OVERRIDE;
+  virtual void OnReadyToDelete(const VideoCaptureControllerID& id) OVERRIDE;
 
  private:
   friend class content::BrowserThread;
diff --git a/content/browser/renderer_host/media/video_capture_manager.h b/content/browser/renderer_host/media/video_capture_manager.h
index 58870ef..dbce623 100644
--- a/content/browser/renderer_host/media/video_capture_manager.h
+++ b/content/browser/renderer_host/media/video_capture_manager.h
@@ -38,15 +38,15 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
   virtual ~VideoCaptureManager();
 
   // Implements MediaStreamProvider.
-  virtual void Register(MediaStreamProviderListener* listener);
+  virtual void Register(MediaStreamProviderListener* listener) OVERRIDE;
 
-  virtual void Unregister();
+  virtual void Unregister() OVERRIDE;
 
-  virtual void EnumerateDevices();
+  virtual void EnumerateDevices() OVERRIDE;
 
-  virtual int Open(const StreamDeviceInfo& device);
+  virtual int Open(const StreamDeviceInfo& device) OVERRIDE;
 
-  virtual void Close(int capture_session_id);
+  virtual void Close(int capture_session_id) OVERRIDE;
 
   // Functions used to start and stop media flow.
   // Start allocates the device and no other application can use the device
diff --git a/content/browser/renderer_host/mock_render_process_host.h b/content/browser/renderer_host/mock_render_process_host.h
index fbbfc74..f3f8fc9 100644
--- a/content/browser/renderer_host/mock_render_process_host.h
+++ b/content/browser/renderer_host/mock_render_process_host.h
@@ -32,29 +32,30 @@ class MockRenderProcessHost : public RenderProcessHost {
   int bad_msg_count() const { return bad_msg_count_; }
 
   // RenderProcessHost implementation (public portion).
-  virtual void EnableSendQueue();
-  virtual bool Init(bool is_accessibility_enabled);
-  virtual int GetNextRoutingID();
-  virtual void CancelResourceRequests(int render_widget_id);
-  virtual void CrossSiteSwapOutACK(const ViewMsg_SwapOut_Params& params);
+  virtual void EnableSendQueue() OVERRIDE;
+  virtual bool Init(bool is_accessibility_enabled) OVERRIDE;
+  virtual int GetNextRoutingID() OVERRIDE;
+  virtual void CancelResourceRequests(int render_widget_id) OVERRIDE;
+  virtual void CrossSiteSwapOutACK(
+      const ViewMsg_SwapOut_Params& params) OVERRIDE;
   virtual bool WaitForUpdateMsg(int render_widget_id,
                                 const base::TimeDelta& max_delay,
-                                IPC::Message* msg);
-  virtual void ReceivedBadMessage();
-  virtual void WidgetRestored();
-  virtual void WidgetHidden();
-  virtual int VisibleWidgetCount() const;
+                                IPC::Message* msg) OVERRIDE;
+  virtual void ReceivedBadMessage() OVERRIDE;
+  virtual void WidgetRestored() OVERRIDE;
+  virtual void WidgetHidden() OVERRIDE;
+  virtual int VisibleWidgetCount() const OVERRIDE;
   virtual void AddWord(const string16& word);
-  virtual bool FastShutdownIfPossible();
-  virtual void DumpHandles();
-  virtual base::ProcessHandle GetHandle();
-  virtual TransportDIB* GetTransportDIB(TransportDIB::Id dib_id);
+  virtual bool FastShutdownIfPossible() OVERRIDE;
+  virtual void DumpHandles() OVERRIDE;
+  virtual base::ProcessHandle GetHandle() OVERRIDE;
+  virtual TransportDIB* GetTransportDIB(TransportDIB::Id dib_id) OVERRIDE;
   virtual void SetCompositingSurface(
       int render_widget_id,
-      gfx::PluginWindowHandle compositing_surface);
+      gfx::PluginWindowHandle compositing_surface) OVERRIDE;
 
   // IPC::Channel::Sender via RenderProcessHost.
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // IPC::Channel::Listener via RenderProcessHost.
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
diff --git a/content/browser/renderer_host/pepper_file_message_filter.h b/content/browser/renderer_host/pepper_file_message_filter.h
index d281ff4..29b98a6 100644
--- a/content/browser/renderer_host/pepper_file_message_filter.h
+++ b/content/browser/renderer_host/pepper_file_message_filter.h
@@ -35,11 +35,12 @@ class PepperFileMessageFilter : public BrowserMessageFilter {
                           content::BrowserContext* browser_context);
 
   // BrowserMessageFilter methods:
-  virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        content::BrowserThread::ID* thread);
+  virtual void OverrideThreadForMessage(
+      const IPC::Message& message,
+      content::BrowserThread::ID* thread) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
-  virtual void OnDestruct() const;
+                                 bool* message_was_ok) OVERRIDE;
+  virtual void OnDestruct() const OVERRIDE;
 
   int child_id() const { return child_id_; }
 
diff --git a/content/browser/renderer_host/pepper_message_filter.h b/content/browser/renderer_host/pepper_message_filter.h
index a328a4a..00240db 100644
--- a/content/browser/renderer_host/pepper_message_filter.h
+++ b/content/browser/renderer_host/pepper_message_filter.h
@@ -39,7 +39,7 @@ class PepperMessageFilter : public BrowserMessageFilter {
 
   // BrowserMessageFilter methods.
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
  private:
   template<class SocketType> class SocketManager;
diff --git a/content/browser/renderer_host/quota_dispatcher_host.h b/content/browser/renderer_host/quota_dispatcher_host.h
index 4e44b0f..1d90ef5 100644
--- a/content/browser/renderer_host/quota_dispatcher_host.h
+++ b/content/browser/renderer_host/quota_dispatcher_host.h
@@ -29,7 +29,7 @@ class QuotaDispatcherHost : public BrowserMessageFilter {
                       QuotaPermissionContext* permission_context);
   virtual ~QuotaDispatcherHost();
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
  private:
   class RequestDispatcher;
diff --git a/content/browser/renderer_host/redirect_to_file_resource_handler.h b/content/browser/renderer_host/redirect_to_file_resource_handler.h
index 4fca6b2..63ed429 100644
--- a/content/browser/renderer_host/redirect_to_file_resource_handler.h
+++ b/content/browser/renderer_host/redirect_to_file_resource_handler.h
@@ -34,18 +34,28 @@ class RedirectToFileResourceHandler : public ResourceHandler {
       ResourceDispatcherHost* resource_dispatcher_host);
 
   // ResourceHandler implementation:
-  virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
-  virtual bool OnRequestRedirected(int request_id, const GURL& new_url,
-                                   ResourceResponse* response, bool* defer);
-  virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
-  virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
-  virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
-                          int min_size);
-  virtual bool OnReadCompleted(int request_id, int* bytes_read);
+  virtual bool OnUploadProgress(int request_id,
+                                uint64 position,
+                                uint64 size) OVERRIDE;
+  virtual bool OnRequestRedirected(int request_id,
+                                   const GURL& new_url,
+                                   ResourceResponse* response,
+                                   bool* defer) OVERRIDE;
+  virtual bool OnResponseStarted(int request_id,
+                                 ResourceResponse* response) OVERRIDE;
+  virtual bool OnWillStart(int request_id,
+                           const GURL& url,
+                           bool* defer) OVERRIDE;
+  virtual bool OnWillRead(int request_id,
+                          net::IOBuffer** buf,
+                          int* buf_size,
+                          int min_size) OVERRIDE;
+  virtual bool OnReadCompleted(int request_id,
+                               int* bytes_read) OVERRIDE;
   virtual bool OnResponseCompleted(int request_id,
                                    const net::URLRequestStatus& status,
-                                   const std::string& security_info);
-  virtual void OnRequestClosed();
+                                   const std::string& security_info) OVERRIDE;
+  virtual void OnRequestClosed() OVERRIDE;
 
  private:
   virtual ~RedirectToFileResourceHandler();
diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h
index d391d2c..1aff504 100644
--- a/content/browser/renderer_host/render_message_filter.h
+++ b/content/browser/renderer_host/render_message_filter.h
@@ -79,8 +79,8 @@ class RenderMessageFilter : public BrowserMessageFilter {
 
   // BrowserMessageFilter methods:
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
-  virtual void OnDestruct() const;
+                                 bool* message_was_ok) OVERRIDE;
+  virtual void OnDestruct() const OVERRIDE;
 
   bool OffTheRecord() const;
 
diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h
index de74088..9ebe5fd 100644
--- a/content/browser/renderer_host/render_view_host.h
+++ b/content/browser/renderer_host/render_view_host.h
@@ -82,7 +82,7 @@ class ExecuteNotificationObserver : public content::NotificationObserver {
   virtual ~ExecuteNotificationObserver();
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   int id() const { return id_; }
 
diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h
index 702816a..824cb19 100644
--- a/content/browser/renderer_host/render_view_host_delegate.h
+++ b/content/browser/renderer_host/render_view_host_delegate.h
@@ -191,7 +191,7 @@ class CONTENT_EXPORT RenderViewHostDelegate : public IPC::Channel::Listener {
 
   // IPC::Channel::Listener implementation.
   // This is used to give the delegate a chance to filter IPC messages.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Gets the URL that is currently being displayed, if there is one.
   virtual const GURL& GetURL() const;
diff --git a/content/browser/renderer_host/render_widget_host.h b/content/browser/renderer_host/render_widget_host.h
index c196cee..c282cc3 100644
--- a/content/browser/renderer_host/render_widget_host.h
+++ b/content/browser/renderer_host/render_widget_host.h
@@ -178,10 +178,10 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Channel::Listener,
   virtual bool IsRenderView() const;
 
   // IPC::Channel::Listener
-  virtual bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   // Sends a message to the corresponding object in the renderer.
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // Called to notify the RenderWidget that it has been hidden or restored from
   // having been hidden.
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
index 04a0876..b674a37 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -278,7 +278,8 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {
   // to be reloaded.
   void ForceTextureReload();
 
-  virtual void SetVisuallyDeemphasized(const SkColor* color, bool animate);
+  virtual void SetVisuallyDeemphasized(const SkColor* color,
+                                       bool animate) OVERRIDE;
 
   virtual void UnhandledWheelEvent(
       const WebKit::WebMouseWheelEvent& event) OVERRIDE;
diff --git a/content/browser/renderer_host/resource_message_filter.h b/content/browser/renderer_host/resource_message_filter.h
index afa4bc4..3c14ddd 100644
--- a/content/browser/renderer_host/resource_message_filter.h
+++ b/content/browser/renderer_host/resource_message_filter.h
@@ -48,9 +48,9 @@ class CONTENT_EXPORT ResourceMessageFilter : public BrowserMessageFilter {
                         ResourceDispatcherHost* resource_dispatcher_host);
 
   // BrowserMessageFilter implementation.
-  virtual void OnChannelClosing();
+  virtual void OnChannelClosing() OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
   const content::ResourceContext& resource_context() const {
     return *resource_context_;
diff --git a/content/browser/renderer_host/socket_stream_dispatcher_host.h b/content/browser/renderer_host/socket_stream_dispatcher_host.h
index fe7e349..f77ff2c 100644
--- a/content/browser/renderer_host/socket_stream_dispatcher_host.h
+++ b/content/browser/renderer_host/socket_stream_dispatcher_host.h
@@ -33,23 +33,24 @@ class SocketStreamDispatcherHost : public BrowserMessageFilter,
 
   // BrowserMessageFilter methods.
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
   // The object died, so cancel and detach all requests associated with it.
   void CancelRequestsForProcess(int host_id);
 
   // SocketStream::Delegate methods.
   virtual void OnConnected(net::SocketStream* socket,
-                           int max_pending_send_allowed);
-  virtual void OnSentData(net::SocketStream* socket, int amount_sent);
+                           int max_pending_send_allowed) OVERRIDE;
+  virtual void OnSentData(net::SocketStream* socket, int amount_sent) OVERRIDE;
   virtual void OnReceivedData(net::SocketStream* socket,
-                              const char* data, int len);
-  virtual void OnClose(net::SocketStream* socket);
-  virtual bool CanGetCookies(net::SocketStream* socket, const GURL& url);
+                              const char* data, int len) OVERRIDE;
+  virtual void OnClose(net::SocketStream* socket) OVERRIDE;
+  virtual bool CanGetCookies(net::SocketStream* socket,
+                             const GURL& url) OVERRIDE;
   virtual bool CanSetCookie(net::SocketStream* request,
                             const GURL& url,
                             const std::string& cookie_line,
-                            net::CookieOptions* options);
+                            net::CookieOptions* options) OVERRIDE;
 
  private:
   // Message handlers called by OnMessageReceived.
diff --git a/content/browser/renderer_host/sync_resource_handler.h b/content/browser/renderer_host/sync_resource_handler.h
index 24267da..0a1ee21 100644
--- a/content/browser/renderer_host/sync_resource_handler.h
+++ b/content/browser/renderer_host/sync_resource_handler.h
@@ -31,18 +31,28 @@ class SyncResourceHandler : public ResourceHandler {
                       IPC::Message* result_message,
                       ResourceDispatcherHost* resource_dispatcher_host);
 
-  virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
-  virtual bool OnRequestRedirected(int request_id, const GURL& new_url,
-                                   ResourceResponse* response, bool* defer);
-  virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
-  virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
-  virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
-                          int min_size);
-  virtual bool OnReadCompleted(int request_id, int* bytes_read);
+  virtual bool OnUploadProgress(int request_id,
+                                uint64 position,
+                                uint64 size) OVERRIDE;
+  virtual bool OnRequestRedirected(int request_id,
+                                   const GURL& new_url,
+                                   ResourceResponse* response,
+                                   bool* defer) OVERRIDE;
+  virtual bool OnResponseStarted(int request_id,
+                                 ResourceResponse* response) OVERRIDE;
+  virtual bool OnWillStart(int request_id,
+                           const GURL& url,
+                           bool* defer) OVERRIDE;
+  virtual bool OnWillRead(int request_id,
+                          net::IOBuffer** buf,
+                          int* buf_size,
+                          int min_size) OVERRIDE;
+  virtual bool OnReadCompleted(int request_id,
+                               int* bytes_read) OVERRIDE;
   virtual bool OnResponseCompleted(int request_id,
                                    const net::URLRequestStatus& status,
-                                   const std::string& security_info);
-  virtual void OnRequestClosed();
+                                   const std::string& security_info) OVERRIDE;
+  virtual void OnRequestClosed() OVERRIDE;
 
  private:
   enum { kReadBufSize = 3840 };
diff --git a/content/browser/renderer_host/test_backing_store.h b/content/browser/renderer_host/test_backing_store.h
index 2b78d72..5dbfa3f 100644
--- a/content/browser/renderer_host/test_backing_store.h
+++ b/content/browser/renderer_host/test_backing_store.h
@@ -15,17 +15,18 @@ class TestBackingStore : public BackingStore {
   virtual ~TestBackingStore();
 
   // BackingStore implementation.
-  virtual void PaintToBackingStore(RenderProcessHost* process,
-                                   TransportDIB::Id bitmap,
-                                   const gfx::Rect& bitmap_rect,
-                                   const std::vector<gfx::Rect>& copy_rects,
-                                   const base::Closure& completion_callback,
-                                   bool* scheduled_completion_callback);
+  virtual void PaintToBackingStore(
+      RenderProcessHost* process,
+      TransportDIB::Id bitmap,
+      const gfx::Rect& bitmap_rect,
+      const std::vector<gfx::Rect>& copy_rects,
+      const base::Closure& completion_callback,
+      bool* scheduled_completion_callback) OVERRIDE;
   virtual bool CopyFromBackingStore(const gfx::Rect& rect,
-                                    skia::PlatformCanvas* output);
+                                    skia::PlatformCanvas* output) OVERRIDE;
   virtual void ScrollBackingStore(int dx, int dy,
                                   const gfx::Rect& clip_rect,
-                                  const gfx::Size& view_size);
+                                  const gfx::Size& view_size) OVERRIDE;
  private:
   DISALLOW_COPY_AND_ASSIGN(TestBackingStore);
 };
diff --git a/content/browser/renderer_host/test_render_view_host.h b/content/browser/renderer_host/test_render_view_host.h
index 0894288..5a64703 100644
--- a/content/browser/renderer_host/test_render_view_host.h
+++ b/content/browser/renderer_host/test_render_view_host.h
@@ -125,13 +125,14 @@ class TestRenderWidgetHostView : public RenderWidgetHostView {
   virtual void GetScreenInfo(WebKit::WebScreenInfo* results) OVERRIDE {}
   virtual gfx::Rect GetRootWindowBounds() OVERRIDE;
 #endif
-  virtual void SetVisuallyDeemphasized(const SkColor* color, bool animate) { }
+  virtual void SetVisuallyDeemphasized(const SkColor* color,
+                                       bool animate) OVERRIDE { }
   virtual void UnhandledWheelEvent(
-      const WebKit::WebMouseWheelEvent& event) { }
+      const WebKit::WebMouseWheelEvent& event) OVERRIDE { }
   virtual void SetHasHorizontalScrollbar(
-      bool has_horizontal_scrollbar) { }
+      bool has_horizontal_scrollbar) OVERRIDE { }
   virtual void SetScrollOffsetPinning(
-      bool is_pinned_to_left, bool is_pinned_to_right) { }
+      bool is_pinned_to_left, bool is_pinned_to_right) OVERRIDE { }
 
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   virtual void AcceleratedSurfaceNew(
@@ -231,8 +232,8 @@ class TestRenderViewHost : public RenderViewHost {
 
   // RenderViewHost overrides --------------------------------------------------
 
-  virtual bool CreateRenderView(const string16& frame_name);
-  virtual bool IsRenderViewLive() const;
+  virtual bool CreateRenderView(const string16& frame_name) OVERRIDE;
+  virtual bool IsRenderViewLive() const OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(RenderViewHostTest, FilterNavigate);
@@ -270,7 +271,7 @@ class TestRenderViewHostFactory : public RenderViewHostFactory {
       SiteInstance* instance,
       RenderViewHostDelegate* delegate,
       int routing_id,
-      SessionStorageNamespace* session_storage);
+      SessionStorageNamespace* session_storage) OVERRIDE;
 
  private:
   // This is a bit of a hack. With the current design of the site instances /
@@ -319,8 +320,8 @@ class RenderViewHostTestHarness : public testing::Test {
 
  protected:
   // testing::Test
-  virtual void SetUp();
-  virtual void TearDown();
+  virtual void SetUp() OVERRIDE;
+  virtual void TearDown() OVERRIDE;
 
   // This browser context will be created in SetUp if it has not already been
   // created.  This allows tests to override the browser context if they so
diff --git a/content/browser/renderer_host/text_input_client_message_filter.h b/content/browser/renderer_host/text_input_client_message_filter.h
index 2f85140..4b5ecb1 100644
--- a/content/browser/renderer_host/text_input_client_message_filter.h
+++ b/content/browser/renderer_host/text_input_client_message_filter.h
@@ -27,7 +27,7 @@ class TextInputClientMessageFilter : public BrowserMessageFilter {
 
   // BrowserMessageFilter override:
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
  private:
   // IPC Message handlers:
diff --git a/content/browser/renderer_host/x509_user_cert_resource_handler.h b/content/browser/renderer_host/x509_user_cert_resource_handler.h
index 11524d5..179ec01 100644
--- a/content/browser/renderer_host/x509_user_cert_resource_handler.h
+++ b/content/browser/renderer_host/x509_user_cert_resource_handler.h
@@ -29,33 +29,44 @@ class X509UserCertResourceHandler : public ResourceHandler {
  public:
   X509UserCertResourceHandler(ResourceDispatcherHost* host,
                               net::URLRequest* request,
-                              int render_process_host_id, int render_view_id);
+                              int render_process_host_id,
+                              int render_view_id);
 
-  virtual bool OnUploadProgress(int request_id, uint64 position, uint64 size);
+  virtual bool OnUploadProgress(int request_id,
+                                uint64 position,
+                                uint64 size) OVERRIDE;
 
   // Not needed, as this event handler ought to be the final resource.
-  virtual bool OnRequestRedirected(int request_id, const GURL& url,
-                                   ResourceResponse* resp, bool* defer);
+  virtual bool OnRequestRedirected(int request_id,
+                                   const GURL& url,
+                                   ResourceResponse* resp,
+                                   bool* defer) OVERRIDE;
 
   // Check if this indeed an X509 cert.
-  virtual bool OnResponseStarted(int request_id, ResourceResponse* resp);
+  virtual bool OnResponseStarted(int request_id,
+                                 ResourceResponse* resp) OVERRIDE;
 
   // Pass-through implementation.
-  virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
+  virtual bool OnWillStart(int request_id,
+                           const GURL& url,
+                           bool* defer) OVERRIDE;
 
   // Create a new buffer to store received data.
-  virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
-                          int min_size);
+  virtual bool OnWillRead(int request_id,
+                          net::IOBuffer** buf,
+                          int* buf_size,
+                          int min_size) OVERRIDE;
 
   // A read was completed, maybe allocate a new buffer for further data.
-  virtual bool OnReadCompleted(int request_id, int* bytes_read);
+  virtual bool OnReadCompleted(int request_id,
+                               int* bytes_read) OVERRIDE;
 
   // Done downloading the certificate.
   virtual bool OnResponseCompleted(int request_id,
                                    const net::URLRequestStatus& urs,
-                                   const std::string& sec_info);
+                                   const std::string& sec_info) OVERRIDE;
 
-  virtual void OnRequestClosed();
+  virtual void OnRequestClosed() OVERRIDE;
 
  private:
   virtual ~X509UserCertResourceHandler();
diff --git a/content/browser/resolve_proxy_msg_helper.h b/content/browser/resolve_proxy_msg_helper.h
index d89e1be..4c66fb7 100644
--- a/content/browser/resolve_proxy_msg_helper.h
+++ b/content/browser/resolve_proxy_msg_helper.h
@@ -42,7 +42,7 @@ class CONTENT_EXPORT ResolveProxyMsgHelper : public BrowserMessageFilter {
 
   // BrowserMessageFilter implementation
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
   void OnResolveProxy(const GURL& url, IPC::Message* reply_msg);
 
diff --git a/content/browser/site_instance.h b/content/browser/site_instance.h
index 7631f8c..7bf15f5 100644
--- a/content/browser/site_instance.h
+++ b/content/browser/site_instance.h
@@ -168,7 +168,7 @@ class CONTENT_EXPORT SiteInstance : public base::RefCounted<SiteInstance>,
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // The next available SiteInstance ID.
   static int32 next_site_instance_id_;
diff --git a/content/browser/speech/speech_input_dispatcher_host.h b/content/browser/speech/speech_input_dispatcher_host.h
index 1286634..052a1fe 100644
--- a/content/browser/speech/speech_input_dispatcher_host.h
+++ b/content/browser/speech/speech_input_dispatcher_host.h
@@ -30,13 +30,13 @@ class SpeechInputDispatcherHost : public BrowserMessageFilter,
 
   // SpeechInputManager::Delegate methods.
   virtual void SetRecognitionResult(int caller_id,
-                                    const SpeechInputResult& result);
-  virtual void DidCompleteRecording(int caller_id);
-  virtual void DidCompleteRecognition(int caller_id);
+                                    const SpeechInputResult& result) OVERRIDE;
+  virtual void DidCompleteRecording(int caller_id) OVERRIDE;
+  virtual void DidCompleteRecognition(int caller_id) OVERRIDE;
 
   // BrowserMessageFilter implementation.
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
   // Singleton manager setter useful for tests.
   CONTENT_EXPORT static void set_manager(SpeechInputManager* manager);
diff --git a/content/browser/speech/speech_recognizer.h b/content/browser/speech/speech_recognizer.h
index b62c558..c86da1c 100644
--- a/content/browser/speech/speech_recognizer.h
+++ b/content/browser/speech/speech_recognizer.h
@@ -105,15 +105,16 @@ class CONTENT_EXPORT SpeechRecognizer
   void CancelRecognition();
 
   // AudioInputController::EventHandler methods.
-  virtual void OnCreated(media::AudioInputController* controller) { }
-  virtual void OnRecording(media::AudioInputController* controller) { }
-  virtual void OnError(media::AudioInputController* controller, int error_code);
+  virtual void OnCreated(media::AudioInputController* controller) OVERRIDE { }
+  virtual void OnRecording(media::AudioInputController* controller) OVERRIDE { }
+  virtual void OnError(media::AudioInputController* controller,
+                       int error_code) OVERRIDE;
   virtual void OnData(media::AudioInputController* controller,
                       const uint8* data,
-                      uint32 size);
+                      uint32 size) OVERRIDE;
 
   // SpeechRecognitionRequest::Delegate methods.
-  virtual void SetRecognitionResult(const SpeechInputResult& result);
+  virtual void SetRecognitionResult(const SpeechInputResult& result) OVERRIDE;
 
   static const int kAudioSampleRate;
   static const int kAudioPacketIntervalMs;  // Duration of each audio packet.
diff --git a/content/browser/ssl/ssl_cert_error_handler.h b/content/browser/ssl/ssl_cert_error_handler.h
index e7beb2b..aa25b92 100644
--- a/content/browser/ssl/ssl_cert_error_handler.h
+++ b/content/browser/ssl/ssl_cert_error_handler.h
@@ -23,7 +23,7 @@ class SSLCertErrorHandler : public SSLErrorHandler {
                       const net::SSLInfo& ssl_info,
                       bool is_hsts_host);
 
-  virtual SSLCertErrorHandler* AsSSLCertErrorHandler();
+  virtual SSLCertErrorHandler* AsSSLCertErrorHandler() OVERRIDE;
 
   // These accessors are available on either thread
   const net::SSLInfo& ssl_info() const { return ssl_info_; }
@@ -32,8 +32,8 @@ class SSLCertErrorHandler : public SSLErrorHandler {
 
  protected:
   // SSLErrorHandler methods
-  virtual void OnDispatchFailed();
-  virtual void OnDispatched();
+  virtual void OnDispatchFailed() OVERRIDE;
+  virtual void OnDispatched() OVERRIDE;
 
  private:
   virtual ~SSLCertErrorHandler();
diff --git a/content/browser/ssl/ssl_client_auth_handler.h b/content/browser/ssl/ssl_client_auth_handler.h
index ac0c5a1..470da01 100644
--- a/content/browser/ssl/ssl_client_auth_handler.h
+++ b/content/browser/ssl/ssl_client_auth_handler.h
@@ -99,7 +99,7 @@ class CONTENT_EXPORT SSLClientAuthObserver
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Begins observing notifications from other SSLClientAuthHandler instances.
   // If another instance chooses a cert for a matching SSLCertRequestInfo, we
diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h
index 36849c9..a5c65c2 100644
--- a/content/browser/ssl/ssl_manager.h
+++ b/content/browser/ssl/ssl_manager.h
@@ -97,7 +97,7 @@ class SSLManager : public content::NotificationObserver {
   // Called on the UI thread.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
  private:
   // Entry points for notifications to which we subscribe. Note that
diff --git a/content/browser/tab_contents/interstitial_page.h b/content/browser/tab_contents/interstitial_page.h
index cafe719..47dc2b6 100644
--- a/content/browser/tab_contents/interstitial_page.h
+++ b/content/browser/tab_contents/interstitial_page.h
@@ -102,7 +102,7 @@ class CONTENT_EXPORT InterstitialPage : public content::NotificationObserver,
   // Called when tab traversing.
   void FocusThroughTabTraversal(bool reverse);
 
-  virtual content::ViewType GetRenderViewType() const;
+  virtual content::ViewType GetRenderViewType() const OVERRIDE;
 
   // See description above field.
   void set_reload_on_dont_proceed(bool value) {
@@ -114,7 +114,7 @@ class CONTENT_EXPORT InterstitialPage : public content::NotificationObserver,
   // content::NotificationObserver method:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // RenderViewHostDelegate implementation:
   virtual View* GetViewDelegate() OVERRIDE;
diff --git a/content/browser/tab_contents/popup_menu_helper_mac.h b/content/browser/tab_contents/popup_menu_helper_mac.h
index 0e134b2..63124e1 100644
--- a/content/browser/tab_contents/popup_menu_helper_mac.h
+++ b/content/browser/tab_contents/popup_menu_helper_mac.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/gfx/rect.h"
@@ -34,7 +35,7 @@ class PopupMenuHelper : public content::NotificationObserver {
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   content::NotificationRegistrar notification_registrar_;
 
diff --git a/content/browser/tab_contents/render_view_host_manager.h b/content/browser/tab_contents/render_view_host_manager.h
index 392fef9..8a35bcb 100644
--- a/content/browser/tab_contents/render_view_host_manager.h
+++ b/content/browser/tab_contents/render_view_host_manager.h
@@ -172,15 +172,16 @@ class CONTENT_EXPORT RenderViewHostManager
   }
 
   // RenderViewHostDelegate::RendererManagement implementation.
-  virtual void ShouldClosePage(bool for_cross_site_transition, bool proceed);
+  virtual void ShouldClosePage(bool for_cross_site_transition,
+                               bool proceed) OVERRIDE;
   virtual void OnCrossSiteResponse(int new_render_process_host_id,
-                                   int new_request_id);
-  virtual void OnCrossSiteNavigationCanceled();
+                                   int new_request_id) OVERRIDE;
+  virtual void OnCrossSiteNavigationCanceled() OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Called when a RenderViewHost is about to be deleted.
   void RenderViewDeleted(RenderViewHost* rvh);
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index a742ca0..d64cbaa 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -144,7 +144,7 @@ class CONTENT_EXPORT TabContents : public PageNavigator,
   // Returns the current navigation properties, which if a navigation is
   // pending may be provisional (e.g., the navigation could result in a
   // download, in which case the URL would revert to what it was previously).
-  virtual const GURL& GetURL() const;
+  virtual const GURL& GetURL() const OVERRIDE;
   virtual const string16& GetTitle() const;
 
   // The max PageID of any page that this TabContents has loaded.  PageIDs
@@ -315,13 +315,13 @@ class CONTENT_EXPORT TabContents : public PageNavigator,
   // Returns true if the location bar should be focused by default rather than
   // the page contents. The view calls this function when the tab is focused
   // to see what it should do.
-  virtual bool FocusLocationBarByDefault();
+  virtual bool FocusLocationBarByDefault() OVERRIDE;
 
   // Focuses the location bar.
-  virtual void SetFocusToLocationBar(bool select_all);
+  virtual void SetFocusToLocationBar(bool select_all) OVERRIDE;
 
   // Creates a view and sets the size for the specified RVH.
-  virtual void CreateViewAndSetSizeForRVH(RenderViewHost* rvh);
+  virtual void CreateViewAndSetSizeForRVH(RenderViewHost* rvh) OVERRIDE;
 
   // Toolbars and such ---------------------------------------------------------
 
@@ -546,9 +546,10 @@ class CONTENT_EXPORT TabContents : public PageNavigator,
   virtual void HandleMouseDown() OVERRIDE;
   virtual void HandleMouseUp() OVERRIDE;
   virtual void HandleMouseActivate() OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message);
-  virtual void RunFileChooser(RenderViewHost* render_view_host,
-                              const ViewHostMsg_RunFileChooser_Params& params);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void RunFileChooser(
+      RenderViewHost* render_view_host,
+      const ViewHostMsg_RunFileChooser_Params& params) OVERRIDE;
   virtual void ToggleFullscreenMode(bool enter_fullscreen) OVERRIDE;
   virtual bool IsFullscreenForCurrentTab() const OVERRIDE;
   virtual void UpdatePreferredSize(const gfx::Size& pref_size) OVERRIDE;
@@ -708,16 +709,17 @@ class CONTENT_EXPORT TabContents : public PageNavigator,
 
   virtual void BeforeUnloadFiredFromRenderManager(
       bool proceed,
-      bool* proceed_to_fire_unload);
+      bool* proceed_to_fire_unload) OVERRIDE;
   virtual void DidStartLoadingFromRenderManager(
-      RenderViewHost* render_view_host);
+      RenderViewHost* render_view_host) OVERRIDE;
   virtual void RenderViewGoneFromRenderManager(
-      RenderViewHost* render_view_host);
-  virtual void UpdateRenderViewSizeForRenderManager();
-  virtual void NotifySwappedFromRenderManager();
-  virtual NavigationController& GetControllerForRenderManager();
-  virtual WebUI* CreateWebUIForRenderManager(const GURL& url);
-  virtual NavigationEntry* GetLastCommittedNavigationEntryForRenderManager();
+      RenderViewHost* render_view_host) OVERRIDE;
+  virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE;
+  virtual void NotifySwappedFromRenderManager() OVERRIDE;
+  virtual NavigationController& GetControllerForRenderManager() OVERRIDE;
+  virtual WebUI* CreateWebUIForRenderManager(const GURL& url) OVERRIDE;
+  virtual NavigationEntry*
+      GetLastCommittedNavigationEntryForRenderManager() OVERRIDE;
 
   // Initializes the given renderer if necessary and creates the view ID
   // corresponding to this view host. If this method is not called and the
@@ -728,7 +730,7 @@ class CONTENT_EXPORT TabContents : public PageNavigator,
   // If you are attaching to an already-existing RenderView, you should call
   // InitWithExistingID.
   virtual bool CreateRenderViewForRenderManager(
-      RenderViewHost* render_view_host);
+      RenderViewHost* render_view_host) OVERRIDE;
 
   // Stores random bits of data for others to associate with this object.
   // WARNING: this needs to be deleted after NavigationController.
diff --git a/content/browser/tab_contents/tab_contents_observer.h b/content/browser/tab_contents/tab_contents_observer.h
index 322c45f..9e12f70 100644
--- a/content/browser/tab_contents/tab_contents_observer.h
+++ b/content/browser/tab_contents/tab_contents_observer.h
@@ -94,7 +94,7 @@ class CONTENT_EXPORT TabContentsObserver : public IPC::Channel::Listener,
 #endif
 
   // IPC::Message::Sender implementation.
-  virtual bool Send(IPC::Message* message);
+  virtual bool Send(IPC::Message* message) OVERRIDE;
   int routing_id() const;
 
  protected:
@@ -118,7 +118,7 @@ class CONTENT_EXPORT TabContentsObserver : public IPC::Channel::Listener,
   virtual void TabContentsDestroyed(TabContents* tab);
 
   // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   TabContents* tab_contents() const { return tab_contents_; }
 
diff --git a/content/browser/trace_message_filter.h b/content/browser/trace_message_filter.h
index 8317efd..42df726 100644
--- a/content/browser/trace_message_filter.h
+++ b/content/browser/trace_message_filter.h
@@ -19,12 +19,12 @@ class TraceMessageFilter : public BrowserMessageFilter {
   virtual ~TraceMessageFilter();
 
   // BrowserMessageFilter override.
-  virtual void OnFilterAdded(IPC::Channel* channel);
+  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
 
   // BrowserMessageFilter implementation.
-  virtual void OnChannelClosing();
+  virtual void OnChannelClosing() OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
   void SendBeginTracing(const std::vector<std::string>& included_categories,
                         const std::vector<std::string>& excluded_categories);
diff --git a/content/browser/trace_subscriber_stdio.h b/content/browser/trace_subscriber_stdio.h
index ab74c7d..b9742e2 100644
--- a/content/browser/trace_subscriber_stdio.h
+++ b/content/browser/trace_subscriber_stdio.h
@@ -28,8 +28,8 @@ class CONTENT_EXPORT TraceSubscriberStdio : public TraceSubscriber {
   bool IsValid();
 
   // Implementation of TraceSubscriber
-  virtual void OnEndTracingComplete();
-  virtual void OnTraceDataCollected(const std::string& trace_fragment);
+  virtual void OnEndTracingComplete() OVERRIDE;
+  virtual void OnTraceDataCollected(const std::string& trace_fragment) OVERRIDE;
 
   virtual ~TraceSubscriberStdio();
 
diff --git a/content/browser/utility_process_host.h b/content/browser/utility_process_host.h
index 82969aa..de53610 100644
--- a/content/browser/utility_process_host.h
+++ b/content/browser/utility_process_host.h
@@ -54,7 +54,7 @@ class CONTENT_EXPORT UtilityProcessHost : public BrowserChildProcessHost {
   virtual ~UtilityProcessHost();
 
   // BrowserChildProcessHost override
-  virtual bool Send(IPC::Message* message);
+  virtual bool Send(IPC::Message* message) OVERRIDE;
 
   // Starts utility process in batch mode. Caller must call EndBatchMode()
   // to finish the utility process.
@@ -80,11 +80,11 @@ class CONTENT_EXPORT UtilityProcessHost : public BrowserChildProcessHost {
   bool StartProcess();
 
   // IPC messages:
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // BrowserChildProcessHost:
-  virtual void OnProcessCrashed(int exit_code);
-  virtual bool CanShutdown();
+  virtual void OnProcessCrashed(int exit_code) OVERRIDE;
+  virtual bool CanShutdown() OVERRIDE;
 
   // A pointer to our client interface, who will be informed of progress.
   scoped_refptr<Client> client_;
diff --git a/content/browser/worker_host/worker_message_filter.h b/content/browser/worker_host/worker_message_filter.h
index 205e1eb..a2710ba 100644
--- a/content/browser/worker_host/worker_message_filter.h
+++ b/content/browser/worker_host/worker_message_filter.h
@@ -29,9 +29,9 @@ class WorkerMessageFilter : public BrowserMessageFilter {
       const NextRoutingIDCallback& callback);
 
   // BrowserMessageFilter implementation.
-  virtual void OnChannelClosing();
+  virtual void OnChannelClosing() OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
   int GetNextRoutingID();
   int render_process_id() const { return render_process_id_; }
diff --git a/content/browser/worker_host/worker_process_host.h b/content/browser/worker_host/worker_process_host.h
index 8faa6c4..e82e3d2 100644
--- a/content/browser/worker_host/worker_process_host.h
+++ b/content/browser/worker_host/worker_process_host.h
@@ -149,14 +149,14 @@ class WorkerProcessHost : public BrowserChildProcessHost {
 
  private:
   // Called when the process has been launched successfully.
-  virtual void OnProcessLaunched();
+  virtual void OnProcessLaunched() OVERRIDE;
 
   // Creates and adds the message filters.
   void CreateMessageFilters(int render_process_id);
 
   // IPC::Channel::Listener implementation:
   // Called when a message arrives from the worker process.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   void OnWorkerContextClosed(int worker_route_id);
   void OnAllowDatabase(int worker_route_id,
@@ -175,7 +175,7 @@ class WorkerProcessHost : public BrowserChildProcessHost {
                     WorkerMessageFilter* filter,
                     int route_id);
 
-  virtual bool CanShutdown();
+  virtual bool CanShutdown() OVERRIDE;
 
   // Updates the title shown in the task manager.
   void UpdateTitle();
diff --git a/content/common/appcache/appcache_backend_proxy.h b/content/common/appcache/appcache_backend_proxy.h
index af09abf..050c07d 100644
--- a/content/common/appcache/appcache_backend_proxy.h
+++ b/content/common/appcache/appcache_backend_proxy.h
@@ -18,28 +18,30 @@ class AppCacheBackendProxy : public appcache::AppCacheBackend {
   IPC::Message::Sender* sender() const { return sender_; }
 
   // AppCacheBackend methods
-  virtual void RegisterHost(int host_id);
-  virtual void UnregisterHost(int host_id);
-  virtual void SetSpawningHostId(int host_id, int spawning_host_id);
+  virtual void RegisterHost(int host_id) OVERRIDE;
+  virtual void UnregisterHost(int host_id) OVERRIDE;
+  virtual void SetSpawningHostId(int host_id, int spawning_host_id) OVERRIDE;
   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;
   virtual void SelectCacheForWorker(
                            int host_id,
                            int parent_process_id,
-                           int parent_host_id);
+                           int parent_host_id) OVERRIDE;
   virtual void SelectCacheForSharedWorker(
                            int host_id,
-                           int64 appcache_id);
-  virtual void MarkAsForeignEntry(int host_id, const GURL& document_url,
-                                  int64 cache_document_was_loaded_from);
-  virtual appcache::Status GetStatus(int host_id);
-  virtual bool StartUpdate(int host_id);
-  virtual bool SwapCache(int host_id);
+                           int64 appcache_id) OVERRIDE;
+  virtual void MarkAsForeignEntry(
+      int host_id,
+      const GURL& document_url,
+      int64 cache_document_was_loaded_from) OVERRIDE;
+  virtual appcache::Status GetStatus(int host_id) OVERRIDE;
+  virtual bool StartUpdate(int host_id) OVERRIDE;
+  virtual bool SwapCache(int host_id) OVERRIDE;
   virtual void GetResourceList(
       int host_id,
-      std::vector<appcache::AppCacheResourceInfo>* resource_infos);
+      std::vector<appcache::AppCacheResourceInfo>* resource_infos) OVERRIDE;
 
  private:
   IPC::Message::Sender* sender_;
diff --git a/content/common/appcache/appcache_dispatcher.h b/content/common/appcache/appcache_dispatcher.h
index aafaa395..88f1455 100644
--- a/content/common/appcache/appcache_dispatcher.h
+++ b/content/common/appcache/appcache_dispatcher.h
@@ -24,7 +24,7 @@ class AppCacheDispatcher : public IPC::Channel::Listener {
   AppCacheBackendProxy* backend_proxy() { return &backend_proxy_; }
 
   // IPC::Channel::Listener implementation
-  virtual bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
  private:
   // Ipc message handlers
diff --git a/content/common/child_process_host.h b/content/common/child_process_host.h
index 0c74fb93..148b2de 100644
--- a/content/common/child_process_host.h
+++ b/content/common/child_process_host.h
@@ -93,7 +93,7 @@ class CONTENT_EXPORT ChildProcessHost : public IPC::Channel::Listener,
 #endif  // defined(OS_WIN)
 
   // IPC::Message::Sender implementation.
-  virtual bool Send(IPC::Message* message);
+  virtual bool Send(IPC::Message* message) OVERRIDE;
 
   // Adds an IPC message filter.  A reference will be kept to the filter.
   void AddFilter(IPC::ChannelProxy::MessageFilter* filter);
diff --git a/content/common/child_thread.h b/content/common/child_thread.h
index 970ce97..a2b9864 100644
--- a/content/common/child_thread.h
+++ b/content/common/child_thread.h
@@ -35,7 +35,7 @@ class CONTENT_EXPORT ChildThread : public IPC::Channel::Listener,
   virtual ~ChildThread();
 
   // IPC::Message::Sender implementation:
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // See documentation on MessageRouter for AddRoute and RemoveRoute
   void AddRoute(int32 routing_id, IPC::Channel::Listener* listener);
@@ -103,8 +103,8 @@ class CONTENT_EXPORT ChildThread : public IPC::Channel::Listener,
   void Init();
 
   // IPC::Channel::Listener implementation:
-  virtual bool OnMessageReceived(const IPC::Message& msg);
-  virtual void OnChannelError();
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+  virtual void OnChannelError() OVERRIDE;
 
   std::string channel_name_;
   scoped_ptr<IPC::SyncChannel> channel_;
diff --git a/content/common/child_trace_message_filter.h b/content/common/child_trace_message_filter.h
index 242e299..19d3467 100644
--- a/content/common/child_trace_message_filter.h
+++ b/content/common/child_trace_message_filter.h
@@ -18,9 +18,9 @@ class ChildTraceMessageFilter : public IPC::ChannelProxy::MessageFilter {
   virtual ~ChildTraceMessageFilter();
 
   // IPC::ChannelProxy::MessageFilter implementation.
-  virtual void OnFilterAdded(IPC::Channel* channel);
-  virtual void OnFilterRemoved();
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
+  virtual void OnFilterRemoved() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
  private:
   // Message handlers.
diff --git a/content/common/db_message_filter.h b/content/common/db_message_filter.h
index 9547166..29d45d0 100644
--- a/content/common/db_message_filter.h
+++ b/content/common/db_message_filter.h
@@ -15,7 +15,7 @@ class DBMessageFilter : public IPC::ChannelProxy::MessageFilter {
   DBMessageFilter();
 
  private:
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   void OnDatabaseUpdateSize(const string16& origin_identifier,
                             const string16& database_name,
diff --git a/content/common/file_system/file_system_dispatcher.h b/content/common/file_system/file_system_dispatcher.h
index fe01733..ee436d1 100644
--- a/content/common/file_system/file_system_dispatcher.h
+++ b/content/common/file_system/file_system_dispatcher.h
@@ -33,7 +33,7 @@ class FileSystemDispatcher : public IPC::Channel::Listener {
   virtual ~FileSystemDispatcher();
 
   // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   bool OpenFileSystem(const GURL& origin_url,
                       fileapi::FileSystemType type,
diff --git a/content/common/file_system/webfilesystem_callback_dispatcher.h b/content/common/file_system/webfilesystem_callback_dispatcher.h
index b8c1aac..fa951d5 100644
--- a/content/common/file_system/webfilesystem_callback_dispatcher.h
+++ b/content/common/file_system/webfilesystem_callback_dispatcher.h
@@ -22,17 +22,17 @@ class WebFileSystemCallbackDispatcher
       WebKit::WebFileSystemCallbacks* callbacks);
 
   // FileSystemCallbackDispatcher implementation
-  virtual void DidSucceed();
+  virtual void DidSucceed() OVERRIDE;
   virtual void DidReadMetadata(
       const base::PlatformFileInfo& file_info,
-      const FilePath& platform_path);
+      const FilePath& platform_path) OVERRIDE;
   virtual void DidReadDirectory(
       const std::vector<base::FileUtilProxy::Entry>& entries,
-      bool has_more);
+      bool has_more) OVERRIDE;
   virtual void DidOpenFileSystem(const std::string&,
-                                 const GURL&);
-  virtual void DidFail(base::PlatformFileError);
-  virtual void DidWrite(int64 bytes, bool complete);
+                                 const GURL&) OVERRIDE;
+  virtual void DidFail(base::PlatformFileError) OVERRIDE;
+  virtual void DidWrite(int64 bytes, bool complete) OVERRIDE;
 
  private:
   WebKit::WebFileSystemCallbacks* callbacks_;
diff --git a/content/common/file_system/webfilewriter_impl.h b/content/common/file_system/webfilewriter_impl.h
index f5287f4..9c9440f 100644
--- a/content/common/file_system/webfilewriter_impl.h
+++ b/content/common/file_system/webfilewriter_impl.h
@@ -18,10 +18,10 @@ class WebFileWriterImpl : public fileapi::WebFileWriterBase,
 
  protected:
   // WebFileWriterBase overrides
-  virtual void DoTruncate(const GURL& path, int64 offset);
+  virtual void DoTruncate(const GURL& path, int64 offset) OVERRIDE;
   virtual void DoWrite(const GURL& path, const GURL& blob_url,
-                       int64 offset);
-  virtual void DoCancel();
+                       int64 offset) OVERRIDE;
+  virtual void DoCancel() OVERRIDE;
 
  private:
   class CallbackDispatcher;
diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h
index 8903b74..ece4163 100644
--- a/content/common/gpu/gpu_channel.h
+++ b/content/common/gpu/gpu_channel.h
@@ -70,7 +70,7 @@ class GpuChannel : public IPC::Channel::Listener,
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
 
   // IPC::Message::Sender implementation:
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // Whether this channel is able to handle IPC messages.
   bool IsScheduled();
diff --git a/content/common/gpu/gpu_channel_manager.h b/content/common/gpu/gpu_channel_manager.h
index c20d792..a1a46c3 100644
--- a/content/common/gpu/gpu_channel_manager.h
+++ b/content/common/gpu/gpu_channel_manager.h
@@ -50,10 +50,10 @@ class GpuChannelManager : public IPC::Channel::Listener,
   void RemoveChannel(int renderer_id);
 
   // Listener overrides.
-  virtual bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   // Sender overrides.
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   void LoseAllContexts();
 
diff --git a/content/common/gpu/gpu_command_buffer_stub.h b/content/common/gpu/gpu_command_buffer_stub.h
index 2e1dc34..86fd9d3 100644
--- a/content/common/gpu/gpu_command_buffer_stub.h
+++ b/content/common/gpu/gpu_command_buffer_stub.h
@@ -58,10 +58,10 @@ class GpuCommandBufferStub
   virtual ~GpuCommandBufferStub();
 
   // IPC::Channel::Listener implementation:
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // IPC::Message::Sender implementation:
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // Whether this command buffer can currently handle IPC messages.
   bool IsScheduled();
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.h b/content/common/gpu/media/gpu_video_decode_accelerator.h
index f065cff..3acf3f6 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.h
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.h
@@ -41,7 +41,7 @@ class GpuVideoDecodeAccelerator
   virtual void NotifyResetDone() OVERRIDE;
 
   // Function to delegate sending to actual sender.
-  virtual bool Send(IPC::Message* message);
+  virtual bool Send(IPC::Message* message) OVERRIDE;
 
   // Initialize the accelerator with the given profile and send the
   // |init_done_msg| when done.
diff --git a/content/common/hi_res_timer_manager.h b/content/common/hi_res_timer_manager.h
index ff2ff1f..210789f 100644
--- a/content/common/hi_res_timer_manager.h
+++ b/content/common/hi_res_timer_manager.h
@@ -18,7 +18,7 @@ class CONTENT_EXPORT HighResolutionTimerManager
   virtual ~HighResolutionTimerManager();
 
   // base::SystemMonitor::PowerObserver:
-  virtual void OnPowerStateChange(bool on_battery_power);
+  virtual void OnPowerStateChange(bool on_battery_power) OVERRIDE;
 
   // Returns true if the hi resolution clock could be used right now.
   bool hi_res_clock_available() const { return hi_res_clock_available_; }
diff --git a/content/common/message_router.h b/content/common/message_router.h
index cb97f3f..d0d9c75 100644
--- a/content/common/message_router.h
+++ b/content/common/message_router.h
@@ -37,7 +37,7 @@ class MessageRouter : public IPC::Channel::Listener,
   virtual bool OnControlMessageReceived(const IPC::Message& msg);
 
   // IPC::Channel::Listener implementation:
-  virtual bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   // Like OnMessageReceived, except it only handles routed messages.  Returns
   // true if the message was dispatched, or false if there was no listener for
@@ -45,7 +45,7 @@ class MessageRouter : public IPC::Channel::Listener,
   virtual bool RouteMessage(const IPC::Message& msg);
 
   // IPC::Message::Sender implementation:
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // Called to add/remove a listener for a particular message routing ID.
   void AddRoute(int32 routing_id, IPC::Channel::Listener* listener);
diff --git a/content/common/np_channel_base.h b/content/common/np_channel_base.h
index dacfb00..d02e9c6 100644
--- a/content/common/np_channel_base.h
+++ b/content/common/np_channel_base.h
@@ -73,7 +73,7 @@ class NPChannelBase : public IPC::Channel::Listener,
 
 
   // IPC::Message::Sender implementation:
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   int peer_pid() { return peer_pid_; }
   IPC::ChannelHandle channel_handle() const { return channel_handle_; }
diff --git a/content/common/npobject_proxy.h b/content/common/npobject_proxy.h
index 1902dd1..23e0183 100644
--- a/content/common/npobject_proxy.h
+++ b/content/common/npobject_proxy.h
@@ -39,7 +39,7 @@ class NPObjectProxy : public IPC::Channel::Listener,
                           const GURL& page_url);
 
   // IPC::Message::Sender implementation:
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
   int route_id() { return route_id_; }
   NPChannelBase* channel() { return channel_; }
 
@@ -91,9 +91,9 @@ class NPObjectProxy : public IPC::Channel::Listener,
   static const NPClass* npclass() { return &npclass_proxy_; }
 
   // NPObjectBase implementation.
-  virtual NPObject* GetUnderlyingNPObject();
+  virtual NPObject* GetUnderlyingNPObject() OVERRIDE;
 
-  virtual IPC::Channel::Listener* GetChannelListener();
+  virtual IPC::Channel::Listener* GetChannelListener() OVERRIDE;
 
  private:
   NPObjectProxy(NPChannelBase* channel,
@@ -102,8 +102,8 @@ class NPObjectProxy : public IPC::Channel::Listener,
                 const GURL& page_url);
 
   // IPC::Channel::Listener implementation:
-  virtual bool OnMessageReceived(const IPC::Message& msg);
-  virtual void OnChannelError();
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+  virtual void OnChannelError() OVERRIDE;
 
   static NPObject* NPAllocate(NPP, NPClass*);
   static void NPDeallocate(NPObject* npObj);
diff --git a/content/common/npobject_stub.h b/content/common/npobject_stub.h
index b99ef64..9b64ce8 100644
--- a/content/common/npobject_stub.h
+++ b/content/common/npobject_stub.h
@@ -45,16 +45,16 @@ class NPObjectStub : public IPC::Channel::Listener,
   void DeleteSoon();
 
   // IPC::Message::Sender implementation:
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // NPObjectBase implementation.
-  virtual NPObject* GetUnderlyingNPObject();
-  virtual IPC::Channel::Listener* GetChannelListener();
+  virtual NPObject* GetUnderlyingNPObject() OVERRIDE;
+  virtual IPC::Channel::Listener* GetChannelListener() OVERRIDE;
 
  private:
   // IPC::Channel::Listener implementation:
-  virtual bool OnMessageReceived(const IPC::Message& message);
-  virtual void OnChannelError();
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnChannelError() OVERRIDE;
 
   // message handlers
   void OnRelease(IPC::Message* reply_msg);
diff --git a/content/common/pepper_plugin_registry.h b/content/common/pepper_plugin_registry.h
index 922a6e0..c6a664e 100644
--- a/content/common/pepper_plugin_registry.h
+++ b/content/common/pepper_plugin_registry.h
@@ -64,7 +64,8 @@ class PepperPluginRegistry
   void AddLiveModule(const FilePath& path, webkit::ppapi::PluginModule* module);
 
   // ModuleLifetime implementation.
-  virtual void PluginModuleDead(webkit::ppapi::PluginModule* dead_module);
+  virtual void PluginModuleDead(
+      webkit::ppapi::PluginModule* dead_module) OVERRIDE;
 
  private:
   PepperPluginRegistry();
diff --git a/content/common/quota_dispatcher.h b/content/common/quota_dispatcher.h
index 4faa0e1..1d1c262 100644
--- a/content/common/quota_dispatcher.h
+++ b/content/common/quota_dispatcher.h
@@ -40,7 +40,7 @@ class QuotaDispatcher : public IPC::Channel::Listener {
   virtual ~QuotaDispatcher();
 
   // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   void QueryStorageUsageAndQuota(const GURL& gurl,
                                  quota::StorageType type,
diff --git a/content/common/resource_dispatcher.h b/content/common/resource_dispatcher.h
index 6cc7157..ba74b23 100644
--- a/content/common/resource_dispatcher.h
+++ b/content/common/resource_dispatcher.h
@@ -34,7 +34,7 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Channel::Listener {
   virtual ~ResourceDispatcher();
 
   // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Creates a ResourceLoaderBridge for this type of dispatcher, this is so
   // this can be tested regardless of the ResourceLoaderBridge::Create
diff --git a/content/common/socket_stream_dispatcher.h b/content/common/socket_stream_dispatcher.h
index 3ce0eba..10d8680 100644
--- a/content/common/socket_stream_dispatcher.h
+++ b/content/common/socket_stream_dispatcher.h
@@ -34,7 +34,7 @@ class SocketStreamDispatcher : public IPC::Channel::Listener {
       webkit_glue::WebSocketStreamHandleDelegate* delegate);
 
   // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
  private:
   void OnConnected(int socket_id, int max_amount_send_allowed);
diff --git a/content/common/webmessageportchannel_impl.h b/content/common/webmessageportchannel_impl.h
index adde1a4..a47ba24 100644
--- a/content/common/webmessageportchannel_impl.h
+++ b/content/common/webmessageportchannel_impl.h
@@ -48,7 +48,7 @@ class WebMessagePortChannelImpl
   void Send(IPC::Message* message);
 
   // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   void OnMessage(const string16& message,
                  const std::vector<int>& sent_message_port_ids,
diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h
index 3081239..111626a 100644
--- a/content/gpu/gpu_child_thread.h
+++ b/content/gpu/gpu_child_thread.h
@@ -45,8 +45,8 @@ class GpuChildThread : public ChildThread {
   void StopWatchdog();
 
   // ChildThread overrides.
-  virtual bool Send(IPC::Message* msg);
-  virtual bool OnControlMessageReceived(const IPC::Message& msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
+  virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
 
  private:
   // Message handlers.
diff --git a/content/gpu/gpu_watchdog_thread.h b/content/gpu/gpu_watchdog_thread.h
index e3054c3..894262a 100644
--- a/content/gpu/gpu_watchdog_thread.h
+++ b/content/gpu/gpu_watchdog_thread.h
@@ -27,11 +27,11 @@ class GpuWatchdogThread : public base::Thread,
   void PostAcknowledge();
 
   // Implement GpuWatchdog.
-  virtual void CheckArmed();
+  virtual void CheckArmed() OVERRIDE;
 
  protected:
-  virtual void Init();
-  virtual void CleanUp();
+  virtual void Init() OVERRIDE;
+  virtual void CleanUp() OVERRIDE;
 
  private:
 
diff --git a/content/plugin/plugin_channel.h b/content/plugin/plugin_channel.h
index c8665d9..27acc4c 100644
--- a/content/plugin/plugin_channel.h
+++ b/content/plugin/plugin_channel.h
@@ -33,18 +33,18 @@ class PluginChannel : public NPChannelBase {
 
   virtual ~PluginChannel();
 
-  virtual bool Send(IPC::Message* msg);
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   base::ProcessHandle renderer_handle() const { return renderer_handle_; }
   int renderer_id() { return renderer_id_; }
 
-  virtual int GenerateRouteID();
+  virtual int GenerateRouteID() OVERRIDE;
 
   // Returns the event that's set when a call to the renderer causes a modal
   // dialog to come up.
   virtual base::WaitableEvent* GetModalDialogEvent(
-      gfx::NativeViewId containing_window);
+      gfx::NativeViewId containing_window) OVERRIDE;
 
   bool in_send() { return in_send_ != 0; }
 
@@ -62,12 +62,12 @@ class PluginChannel : public NPChannelBase {
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
-  virtual void CleanUp();
+  virtual void CleanUp() OVERRIDE;
 
   // Overrides NPChannelBase::Init.
   virtual bool Init(base::MessageLoopProxy* ipc_message_loop,
                     bool create_pipe_now,
-                    base::WaitableEvent* shutdown_event);
+                    base::WaitableEvent* shutdown_event) OVERRIDE;
 
  private:
   class MessageFilter;
@@ -75,7 +75,7 @@ class PluginChannel : public NPChannelBase {
   // Called on the plugin thread
   PluginChannel();
 
-  virtual bool OnControlMessageReceived(const IPC::Message& msg);
+  virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   static NPChannelBase* ClassFactory() { return new PluginChannel(); }
 
diff --git a/content/plugin/plugin_thread.h b/content/plugin/plugin_thread.h
index 1a1183b..0143acf 100644
--- a/content/plugin/plugin_thread.h
+++ b/content/plugin/plugin_thread.h
@@ -29,7 +29,7 @@ class PluginThread : public ChildThread {
   static PluginThread* current();
 
  private:
-  virtual bool OnControlMessageReceived(const IPC::Message& msg);
+  virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   // Callback for when a channel has been created.
   void OnCreateChannel(int renderer_id, bool incognito);
diff --git a/content/plugin/webplugin_accelerated_surface_proxy_mac.h b/content/plugin/webplugin_accelerated_surface_proxy_mac.h
index d3ad9ec..f0290ba 100644
--- a/content/plugin/webplugin_accelerated_surface_proxy_mac.h
+++ b/content/plugin/webplugin_accelerated_surface_proxy_mac.h
@@ -6,6 +6,7 @@
 #define CONTENT_PLUGIN_WEBPLUGIN_ACCELERATED_SURFACE_PROXY_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "ui/gfx/gl/gpu_preference.h"
 #include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h"
 
@@ -24,11 +25,11 @@ class WebPluginAcceleratedSurfaceProxy
   virtual ~WebPluginAcceleratedSurfaceProxy();
 
   // WebPluginAcceleratedSurface implementation.
-  virtual void SetWindowHandle(gfx::PluginWindowHandle window);
-  virtual void SetSize(const gfx::Size& size);
-  virtual CGLContextObj context();
-  virtual void StartDrawing();
-  virtual void EndDrawing();
+  virtual void SetWindowHandle(gfx::PluginWindowHandle window) OVERRIDE;
+  virtual void SetSize(const gfx::Size& size) OVERRIDE;
+  virtual CGLContextObj context() OVERRIDE;
+  virtual void StartDrawing() OVERRIDE;
+  virtual void EndDrawing() OVERRIDE;
 
  private:
   WebPluginProxy* plugin_proxy_;  // Weak ref.
diff --git a/content/plugin/webplugin_delegate_stub.h b/content/plugin/webplugin_delegate_stub.h
index 669abcc..981febb 100644
--- a/content/plugin/webplugin_delegate_stub.h
+++ b/content/plugin/webplugin_delegate_stub.h
@@ -44,10 +44,10 @@ class WebPluginDelegateStub : public IPC::Channel::Listener,
                         PluginChannel* channel);
 
   // IPC::Channel::Listener implementation:
-  virtual bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   // IPC::Message::Sender implementation:
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   int instance_id() { return instance_id_; }
   WebPluginProxy* webplugin() { return webplugin_; }
diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h
index dbc33b0..2ee39c1 100644
--- a/content/plugin/webplugin_proxy.h
+++ b/content/plugin/webplugin_proxy.h
@@ -58,28 +58,29 @@ class WebPluginProxy : public webkit::npapi::WebPlugin {
   void set_delegate(webkit::npapi::WebPluginDelegateImpl* d) { delegate_ = d; }
 
   // WebPlugin overrides
-  virtual void SetWindow(gfx::PluginWindowHandle window);
+  virtual void SetWindow(gfx::PluginWindowHandle window) OVERRIDE;
 
   // Whether input events should be sent to the delegate.
-  virtual void SetAcceptsInputEvents(bool accepts);
+  virtual void SetAcceptsInputEvents(bool accepts) OVERRIDE;
 
-  virtual void WillDestroyWindow(gfx::PluginWindowHandle window);
+  virtual void WillDestroyWindow(gfx::PluginWindowHandle window) OVERRIDE;
 #if defined(OS_WIN)
   void SetWindowlessPumpEvent(HANDLE pump_messages_event);
   void ReparentPluginWindow(HWND window, HWND parent);
 #endif
 
-  virtual void CancelResource(unsigned long id);
-  virtual void Invalidate();
-  virtual void InvalidateRect(const gfx::Rect& rect);
-  virtual NPObject* GetWindowScriptNPObject();
-  virtual NPObject* GetPluginElement();
-  virtual bool FindProxyForUrl(const GURL& url, std::string* proxy_list);
+  virtual void CancelResource(unsigned long id) OVERRIDE;
+  virtual void Invalidate() OVERRIDE;
+  virtual void InvalidateRect(const gfx::Rect& rect) OVERRIDE;
+  virtual NPObject* GetWindowScriptNPObject() OVERRIDE;
+  virtual NPObject* GetPluginElement() OVERRIDE;
+  virtual bool FindProxyForUrl(const GURL& url,
+                               std::string* proxy_list) OVERRIDE;
   virtual void SetCookie(const GURL& url,
                          const GURL& first_party_for_cookies,
-                         const std::string& cookie);
+                         const std::string& cookie) OVERRIDE;
   virtual std::string GetCookies(const GURL& url,
-                                 const GURL& first_party_for_cookies);
+                                 const GURL& first_party_for_cookies) OVERRIDE;
 
   // class-specific methods
 
@@ -112,7 +113,7 @@ class WebPluginProxy : public webkit::npapi::WebPlugin {
                                 unsigned int len,
                                 int notify_id,
                                 bool popups_allowed,
-                                bool notify_redirects);
+                                bool notify_redirects) OVERRIDE;
   void UpdateGeometry(const gfx::Rect& window_rect,
                       const gfx::Rect& clip_rect,
                       const TransportDIB::Handle& windowless_buffer0,
@@ -120,24 +121,25 @@ class WebPluginProxy : public webkit::npapi::WebPlugin {
                       int windowless_buffer_index,
                       const TransportDIB::Handle& background_buffer,
                       bool transparent);
-  virtual void CancelDocumentLoad();
+  virtual void CancelDocumentLoad() OVERRIDE;
   virtual void InitiateHTTPRangeRequest(
-      const char* url, const char* range_info, int range_request_id);
-  virtual void SetDeferResourceLoading(unsigned long resource_id, bool defer);
-  virtual bool IsOffTheRecord();
+      const char* url, const char* range_info, int range_request_id) OVERRIDE;
+  virtual void SetDeferResourceLoading(unsigned long resource_id,
+                                       bool defer) OVERRIDE;
+  virtual bool IsOffTheRecord() OVERRIDE;
   virtual void ResourceClientDeleted(
-      webkit::npapi::WebPluginResourceClient* resource_client);
+      webkit::npapi::WebPluginResourceClient* resource_client) OVERRIDE;
   gfx::NativeViewId containing_window() { return containing_window_; }
 
 #if defined(OS_MACOSX)
-  virtual void FocusChanged(bool focused);
+  virtual void FocusChanged(bool focused) OVERRIDE;
 
-  virtual void StartIme();
+  virtual void StartIme() OVERRIDE;
 
-  virtual void BindFakePluginWindowHandle(bool opaque);
+  virtual void BindFakePluginWindowHandle(bool opaque) OVERRIDE;
 
   virtual webkit::npapi::WebPluginAcceleratedSurface*
-      GetAcceleratedSurface(gfx::GpuPreference gpu_preference);
+      GetAcceleratedSurface(gfx::GpuPreference gpu_preference) OVERRIDE;
 
   // Tell the browser (via the renderer) to invalidate because the
   // accelerated buffers have changed.
@@ -168,7 +170,7 @@ class WebPluginProxy : public webkit::npapi::WebPlugin {
   virtual void FreeSurfaceDIB(TransportDIB::Id dib_id);
 #endif
 
-  virtual void URLRedirectResponse(bool allow, int resource_id);
+  virtual void URLRedirectResponse(bool allow, int resource_id) OVERRIDE;
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Retrieves the IME status from a windowless plug-in and sends it to a
diff --git a/content/ppapi_plugin/ppapi_webkit_thread.h b/content/ppapi_plugin/ppapi_webkit_thread.h
index dabee23..a7606f6 100644
--- a/content/ppapi_plugin/ppapi_webkit_thread.h
+++ b/content/ppapi_plugin/ppapi_webkit_thread.h
@@ -33,8 +33,8 @@ class PpapiWebKitThread {
     virtual ~InternalWebKitThread();
     // Does the actual initialization and shutdown of WebKit.  Called at the
     // beginning and end of the thread's lifetime.
-    virtual void Init();
-    virtual void CleanUp();
+    virtual void Init() OVERRIDE;
+    virtual void CleanUp() OVERRIDE;
 
    private:
     // The WebKitPlatformSupport implementation.  Only access on WebKit thread.
diff --git a/content/public/renderer/render_view_observer.h b/content/public/renderer/render_view_observer.h
index 9e81c2d..471ce14 100644
--- a/content/public/renderer/render_view_observer.h
+++ b/content/public/renderer/render_view_observer.h
@@ -79,7 +79,7 @@ class CONTENT_EXPORT RenderViewObserver : public IPC::Channel::Listener,
   virtual void ClosePage() {}
 
   // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // This is called by the RenderView when it's going away so that this object
   // can null out its pointer.
@@ -90,7 +90,7 @@ class CONTENT_EXPORT RenderViewObserver : public IPC::Channel::Listener,
   virtual ~RenderViewObserver();
 
   // IPC::Message::Sender implementation.
-  virtual bool Send(IPC::Message* message);
+  virtual bool Send(IPC::Message* message) OVERRIDE;
 
   RenderView* render_view();
   int routing_id() { return routing_id_; }
diff --git a/content/renderer/device_orientation_dispatcher.h b/content/renderer/device_orientation_dispatcher.h
index f4521c5..0f80c26 100644
--- a/content/renderer/device_orientation_dispatcher.h
+++ b/content/renderer/device_orientation_dispatcher.h
@@ -26,7 +26,7 @@ class DeviceOrientationDispatcher : public content::RenderViewObserver,
 
  private:
   // RenderView::Observer implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // From WebKit::WebDeviceOrientationClient.
   virtual void setController(
diff --git a/content/renderer/devtools_agent.h b/content/renderer/devtools_agent.h
index e8c4bbe..e9e5276 100644
--- a/content/renderer/devtools_agent.h
+++ b/content/renderer/devtools_agent.h
@@ -39,7 +39,7 @@ class DevToolsAgent : public content::RenderViewObserver,
   friend class DevToolsAgentFilter;
 
   // RenderView::Observer implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // WebDevToolsAgentClient implementation
   virtual void sendMessageToInspectorFrontend(const WebKit::WebString& data);
diff --git a/content/renderer/devtools_agent_filter.h b/content/renderer/devtools_agent_filter.h
index 0583885..6284b6a 100644
--- a/content/renderer/devtools_agent_filter.h
+++ b/content/renderer/devtools_agent_filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -29,9 +29,9 @@ class DevToolsAgentFilter : public IPC::ChannelProxy::MessageFilter {
 
  private:
   // IPC::ChannelProxy::MessageFilter override. Called on IO thread.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
-  virtual void OnFilterAdded(IPC::Channel* channel);
+  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
 
   static void DispatchMessageLoop();
 
diff --git a/content/renderer/geolocation_dispatcher.h b/content/renderer/geolocation_dispatcher.h
index 2c50db6..ff38665 100644
--- a/content/renderer/geolocation_dispatcher.h
+++ b/content/renderer/geolocation_dispatcher.h
@@ -32,7 +32,7 @@ class GeolocationDispatcher : public content::RenderViewObserver,
 
  private:
   // RenderView::Observer implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // WebGeolocationClient
   virtual void geolocationDestroyed();
diff --git a/content/renderer/gpu/command_buffer_proxy.h b/content/renderer/gpu/command_buffer_proxy.h
index e86988a..551e1ca 100644
--- a/content/renderer/gpu/command_buffer_proxy.h
+++ b/content/renderer/gpu/command_buffer_proxy.h
@@ -37,29 +37,30 @@ class CommandBufferProxy : public gpu::CommandBuffer,
   virtual ~CommandBufferProxy();
 
   // IPC::Channel::Listener implementation:
-  virtual bool OnMessageReceived(const IPC::Message& message);
-  virtual void OnChannelError();
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnChannelError() OVERRIDE;
 
   int route_id() const { return route_id_; }
 
   // CommandBuffer implementation:
-  virtual bool Initialize(int32 size);
-  virtual bool Initialize(base::SharedMemory* buffer, int32 size);
-  virtual gpu::Buffer GetRingBuffer();
-  virtual State GetState();
-  virtual State GetLastState();
-  virtual void Flush(int32 put_offset);
-  virtual State FlushSync(int32 put_offset, int32 last_known_get);
-  virtual void SetGetOffset(int32 get_offset);
-  virtual int32 CreateTransferBuffer(size_t size, int32 id_request);
+  virtual bool Initialize(int32 size) OVERRIDE;
+  virtual bool Initialize(base::SharedMemory* buffer, int32 size) OVERRIDE;
+  virtual gpu::Buffer GetRingBuffer() OVERRIDE;
+  virtual State GetState() OVERRIDE;
+  virtual State GetLastState() OVERRIDE;
+  virtual void Flush(int32 put_offset) OVERRIDE;
+  virtual State FlushSync(int32 put_offset, int32 last_known_get) OVERRIDE;
+  virtual void SetGetOffset(int32 get_offset) OVERRIDE;
+  virtual int32 CreateTransferBuffer(size_t size, int32 id_request) OVERRIDE;
   virtual int32 RegisterTransferBuffer(base::SharedMemory* shared_memory,
                                        size_t size,
-                                       int32 id_request);
-  virtual void DestroyTransferBuffer(int32 id);
-  virtual gpu::Buffer GetTransferBuffer(int32 handle);
-  virtual void SetToken(int32 token);
-  virtual void SetParseError(gpu::error::Error error);
-  virtual void SetContextLostReason(gpu::error::ContextLostReason reason);
+                                       int32 id_request) OVERRIDE;
+  virtual void DestroyTransferBuffer(int32 id) OVERRIDE;
+  virtual gpu::Buffer GetTransferBuffer(int32 handle) OVERRIDE;
+  virtual void SetToken(int32 token) OVERRIDE;
+  virtual void SetParseError(gpu::error::Error error) OVERRIDE;
+  virtual void SetContextLostReason(
+      gpu::error::ContextLostReason reason) OVERRIDE;
 
   // Invoke the task when the channel has been flushed. Takes care of deleting
   // the task whether the echo succeeds or not.
diff --git a/content/renderer/gpu/gpu_channel_host.h b/content/renderer/gpu/gpu_channel_host.h
index 0319dac..d42a152 100644
--- a/content/renderer/gpu/gpu_channel_host.h
+++ b/content/renderer/gpu/gpu_channel_host.h
@@ -72,7 +72,7 @@ class GpuChannelHost : public IPC::Message::Sender,
   void OnChannelError();
 
   // IPC::Message::Sender implementation:
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // Create and connect to a command buffer in the GPU process.
   CommandBufferProxy* CreateViewCommandBuffer(
@@ -158,8 +158,8 @@ class GpuChannelHost : public IPC::Message::Sender,
     void RemoveRoute(int route_id);
 
     // IPC::ChannelProxy::MessageFilter implementation:
-    virtual bool OnMessageReceived(const IPC::Message& msg);
-    virtual void OnChannelError();
+    virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+    virtual void OnChannelError() OVERRIDE;
 
    private:
     GpuChannelHost* parent_;
diff --git a/content/renderer/gpu/input_event_filter.h b/content/renderer/gpu/input_event_filter.h
index 5d2db67..51a4cd8 100644
--- a/content/renderer/gpu/input_event_filter.h
+++ b/content/renderer/gpu/input_event_filter.h
@@ -53,10 +53,10 @@ class CONTENT_EXPORT InputEventFilter
   void DidNotHandleInputEvent(bool send_to_widget);
 
   // IPC::ChannelProxy::MessageFilter methods:
-  virtual void OnFilterAdded(IPC::Channel* channel);
-  virtual void OnFilterRemoved();
-  virtual void OnChannelClosing();
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
+  virtual void OnFilterRemoved() OVERRIDE;
+  virtual void OnChannelClosing() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Expects a ViewMsg_HandleInputEvent message.
   static const WebKit::WebInputEvent* CrackMessage(const IPC::Message& message);
diff --git a/content/renderer/gpu/transport_texture_service.h b/content/renderer/gpu/transport_texture_service.h
index b4d67f5..09bbc76 100644
--- a/content/renderer/gpu/transport_texture_service.h
+++ b/content/renderer/gpu/transport_texture_service.h
@@ -26,10 +26,10 @@ class TransportTextureService : public IPC::ChannelProxy::MessageFilter,
   virtual ~TransportTextureService();
 
   // IPC::ChannelProxy::MessageFilter implementations.
-  virtual bool OnMessageReceived(const IPC::Message& message);
-  virtual void OnFilterAdded(IPC::Channel* channel);
-  virtual void OnFilterRemoved();
-  virtual void OnChannelClosing();
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
+  virtual void OnFilterRemoved() OVERRIDE;
+  virtual void OnChannelClosing() OVERRIDE;
 
   // Called on ChildThread to create a TransportTextureHost.
   //
@@ -43,7 +43,7 @@ class TransportTextureService : public IPC::ChannelProxy::MessageFilter,
   void RemoveRoute(int32 host_id);
 
   // IPC::Message::Sender Implementation.
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
  private:
   typedef std::pair<int32, IPC::Channel::Listener*> PendingRoute;
diff --git a/content/renderer/indexed_db_dispatcher.h b/content/renderer/indexed_db_dispatcher.h
index 43c8443..2807158 100644
--- a/content/renderer/indexed_db_dispatcher.h
+++ b/content/renderer/indexed_db_dispatcher.h
@@ -38,7 +38,7 @@ class IndexedDBDispatcher : public IPC::Channel::Listener {
   virtual ~IndexedDBDispatcher();
 
   // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   void RequestIDBFactoryGetDatabaseNames(
       WebKit::WebIDBCallbacks* callbacks,
diff --git a/content/renderer/media/audio_device.h b/content/renderer/media/audio_device.h
index 8c429d8..d07b751 100644
--- a/content/renderer/media/audio_device.h
+++ b/content/renderer/media/audio_device.h
@@ -106,13 +106,14 @@ class CONTENT_EXPORT AudioDevice
 
   // Methods called on IO thread ----------------------------------------------
   // AudioMessageFilter::Delegate methods, called by AudioMessageFilter.
-  virtual void OnRequestPacket(AudioBuffersState buffers_state);
-  virtual void OnStateChanged(AudioStreamState state);
-  virtual void OnCreated(base::SharedMemoryHandle handle, uint32 length);
+  virtual void OnRequestPacket(AudioBuffersState buffers_state) OVERRIDE;
+  virtual void OnStateChanged(AudioStreamState state) OVERRIDE;
+  virtual void OnCreated(base::SharedMemoryHandle handle,
+                         uint32 length) OVERRIDE;
   virtual void OnLowLatencyCreated(base::SharedMemoryHandle handle,
                                    base::SyncSocket::Handle socket_handle,
-                                   uint32 length);
-  virtual void OnVolume(double volume);
+                                   uint32 length) OVERRIDE;
+  virtual void OnVolume(double volume) OVERRIDE;
 
  private:
   // Methods called on IO thread ----------------------------------------------
@@ -132,7 +133,7 @@ class CONTENT_EXPORT AudioDevice
   void FireRenderCallback();
 
   // DelegateSimpleThread::Delegate implementation.
-  virtual void Run();
+  virtual void Run() OVERRIDE;
 
   // Format
   size_t buffer_size_;  // in sample-frames
diff --git a/content/renderer/media/audio_input_device.h b/content/renderer/media/audio_input_device.h
index c766cda..4f26061 100644
--- a/content/renderer/media/audio_input_device.h
+++ b/content/renderer/media/audio_input_device.h
@@ -148,10 +148,10 @@ class CONTENT_EXPORT AudioInputDevice
   // AudioInputMessageFilter::Delegate impl., called by AudioInputMessageFilter
   virtual void OnLowLatencyCreated(base::SharedMemoryHandle handle,
                                    base::SyncSocket::Handle socket_handle,
-                                   uint32 length);
-  virtual void OnVolume(double volume);
-  virtual void OnStateChanged(AudioStreamState state);
-  virtual void OnDeviceReady(int index);
+                                   uint32 length) OVERRIDE;
+  virtual void OnVolume(double volume) OVERRIDE;
+  virtual void OnStateChanged(AudioStreamState state) OVERRIDE;
+  virtual void OnDeviceReady(int index) OVERRIDE;
 
  private:
   // Methods called on IO thread ----------------------------------------------
@@ -171,7 +171,7 @@ class CONTENT_EXPORT AudioInputDevice
   void FireCaptureCallback();
 
   // DelegateSimpleThread::Delegate implementation.
-  virtual void Run();
+  virtual void Run() OVERRIDE;
 
   // Format
   AudioParameters audio_parameters_;
diff --git a/content/renderer/media/audio_input_message_filter.h b/content/renderer/media/audio_input_message_filter.h
index 71521f8..f3b1e43 100644
--- a/content/renderer/media/audio_input_message_filter.h
+++ b/content/renderer/media/audio_input_message_filter.h
@@ -61,10 +61,10 @@ class CONTENT_EXPORT AudioInputMessageFilter
 
  private:
   // IPC::ChannelProxy::MessageFilter override. Called on IO thread.
-  virtual bool OnMessageReceived(const IPC::Message& message);
-  virtual void OnFilterAdded(IPC::Channel* channel);
-  virtual void OnFilterRemoved();
-  virtual void OnChannelClosing();
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
+  virtual void OnFilterRemoved() OVERRIDE;
+  virtual void OnChannelClosing() OVERRIDE;
 
   // Received when browser process has created an audio input stream of low
   // latency.
diff --git a/content/renderer/media/audio_message_filter.h b/content/renderer/media/audio_message_filter.h
index b37e45e..5888a86 100644
--- a/content/renderer/media/audio_message_filter.h
+++ b/content/renderer/media/audio_message_filter.h
@@ -69,10 +69,10 @@ class CONTENT_EXPORT AudioMessageFilter
   FRIEND_TEST_ALL_PREFIXES(AudioMessageFilterTest, Delegates);
 
   // IPC::ChannelProxy::MessageFilter override. Called on IO thread.
-  virtual bool OnMessageReceived(const IPC::Message& message);
-  virtual void OnFilterAdded(IPC::Channel* channel);
-  virtual void OnFilterRemoved();
-  virtual void OnChannelClosing();
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
+  virtual void OnFilterRemoved() OVERRIDE;
+  virtual void OnChannelClosing() OVERRIDE;
 
   // Received when browser process wants more audio packet.
   void OnRequestPacket(int stream_id, AudioBuffersState buffers_state);
diff --git a/content/renderer/media/audio_renderer_impl.h b/content/renderer/media/audio_renderer_impl.h
index e38f407..0bff566 100644
--- a/content/renderer/media/audio_renderer_impl.h
+++ b/content/renderer/media/audio_renderer_impl.h
@@ -65,34 +65,37 @@ class CONTENT_EXPORT AudioRendererImpl
 
   // Methods called on IO thread ----------------------------------------------
   // AudioMessageFilter::Delegate methods, called by AudioMessageFilter.
-  virtual void OnRequestPacket(AudioBuffersState buffers_state);
-  virtual void OnStateChanged(AudioStreamState state);
-  virtual void OnCreated(base::SharedMemoryHandle handle, uint32 length);
+  virtual void OnRequestPacket(AudioBuffersState buffers_state) OVERRIDE;
+  virtual void OnStateChanged(AudioStreamState state) OVERRIDE;
+  virtual void OnCreated(base::SharedMemoryHandle handle,
+                         uint32 length) OVERRIDE;
   virtual void OnLowLatencyCreated(base::SharedMemoryHandle handle,
                                    base::SyncSocket::Handle socket_handle,
-                                   uint32 length);
-  virtual void OnVolume(double volume);
+                                   uint32 length) OVERRIDE;
+  virtual void OnVolume(double volume) OVERRIDE;
 
   // Methods called on pipeline thread ----------------------------------------
   // media::Filter implementation.
-  virtual void SetPlaybackRate(float rate);
-  virtual void Pause(const base::Closure& callback);
-  virtual void Seek(base::TimeDelta time, const media::FilterStatusCB& cb);
-  virtual void Play(const base::Closure& callback);
+  virtual void SetPlaybackRate(float rate) OVERRIDE;
+  virtual void Pause(const base::Closure& callback) OVERRIDE;
+  virtual void Seek(base::TimeDelta time,
+                    const media::FilterStatusCB& cb) OVERRIDE;
+  virtual void Play(const base::Closure& callback) OVERRIDE;
 
   // media::AudioRenderer implementation.
-  virtual void SetVolume(float volume);
+  virtual void SetVolume(float volume) OVERRIDE;
 
  protected:
   // Methods called on audio renderer thread ----------------------------------
   // These methods are called from AudioRendererBase.
   virtual bool OnInitialize(int bits_per_channel,
                             ChannelLayout channel_layout,
-                            int sample_rate);
-  virtual void OnStop();
+                            int sample_rate) OVERRIDE;
+  virtual void OnStop() OVERRIDE;
 
   // Called when the decoder completes a Read().
-  virtual void ConsumeAudioSamples(scoped_refptr<media::Buffer> buffer_in);
+  virtual void ConsumeAudioSamples(
+      scoped_refptr<media::Buffer> buffer_in) OVERRIDE;
 
  private:
   // We are using either low- or high-latency code path.
@@ -128,10 +131,10 @@ class CONTENT_EXPORT AudioRendererImpl
   void DestroyTask();
 
   // Called on IO thread when message loop is dying.
-  virtual void WillDestroyCurrentMessageLoop();
+  virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
 
   // DelegateSimpleThread::Delegate implementation.
-  virtual void Run();
+  virtual void Run() OVERRIDE;
 
   // (Re-)starts playback.
   void NotifyDataAvailableIfNecessary();
diff --git a/content/renderer/media/media_stream_dispatcher.h b/content/renderer/media/media_stream_dispatcher.h
index c91cf7e..6ff09c3 100644
--- a/content/renderer/media/media_stream_dispatcher.h
+++ b/content/renderer/media/media_stream_dispatcher.h
@@ -59,7 +59,7 @@ class CONTENT_EXPORT MediaStreamDispatcher
   struct Stream;
 
   // Messages from the browser.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   void OnStreamGenerated(
       int request_id,
       const std::string& label,
diff --git a/content/renderer/media/media_stream_impl.h b/content/renderer/media/media_stream_impl.h
index 99122c4..79dc948 100644
--- a/content/renderer/media/media_stream_impl.h
+++ b/content/renderer/media/media_stream_impl.h
@@ -22,7 +22,8 @@ class MediaStreamImpl
 
   // Implement webkit_media::StreamClient.
   virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder(
-      const GURL& url, media::MessageLoopFactory* message_loop_factory);
+      const GURL& url,
+      media::MessageLoopFactory* message_loop_factory) OVERRIDE;
 
  private:
   scoped_refptr<VideoCaptureImplManager> vc_manager_;
diff --git a/content/renderer/media/render_media_log.h b/content/renderer/media/render_media_log.h
index 62866e81..63032ae 100644
--- a/content/renderer/media/render_media_log.h
+++ b/content/renderer/media/render_media_log.h
@@ -19,7 +19,7 @@ class RenderMediaLog : public media::MediaLog {
   RenderMediaLog();
 
   // MediaLog implementation.
-  virtual void AddEvent(media::MediaLogEvent* event);
+  virtual void AddEvent(media::MediaLogEvent* event) OVERRIDE;
 
  private:
   virtual ~RenderMediaLog();
diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h
index b0f84f5..0bcb809 100644
--- a/content/renderer/media/video_capture_impl.h
+++ b/content/renderer/media/video_capture_impl.h
@@ -25,22 +25,22 @@ class CONTENT_EXPORT VideoCaptureImpl
  public:
   // media::VideoCapture interface.
   virtual void StartCapture(media::VideoCapture::EventHandler* handler,
-                            const VideoCaptureCapability& capability);
-  virtual void StopCapture(media::VideoCapture::EventHandler* handler);
-  virtual void FeedBuffer(scoped_refptr<VideoFrameBuffer> buffer);
-  virtual bool CaptureStarted();
-  virtual int CaptureWidth();
-  virtual int CaptureHeight();
-  virtual int CaptureFrameRate();
+                            const VideoCaptureCapability& capability) OVERRIDE;
+  virtual void StopCapture(media::VideoCapture::EventHandler* handler) OVERRIDE;
+  virtual void FeedBuffer(scoped_refptr<VideoFrameBuffer> buffer) OVERRIDE;
+  virtual bool CaptureStarted() OVERRIDE;
+  virtual int CaptureWidth() OVERRIDE;
+  virtual int CaptureHeight() OVERRIDE;
+  virtual int CaptureFrameRate() OVERRIDE;
 
   // VideoCaptureMessageFilter::Delegate interface.
   virtual void OnBufferCreated(base::SharedMemoryHandle handle,
-                               int length, int buffer_id);
-  virtual void OnBufferReceived(int buffer_id, base::Time timestamp);
-  virtual void OnStateChanged(const media::VideoCapture::State& state);
+                               int length, int buffer_id) OVERRIDE;
+  virtual void OnBufferReceived(int buffer_id, base::Time timestamp) OVERRIDE;
+  virtual void OnStateChanged(const media::VideoCapture::State& state) OVERRIDE;
   virtual void OnDeviceInfoReceived(
-      const media::VideoCaptureParams& device_info);
-  virtual void OnDelegateAdded(int32 device_id);
+      const media::VideoCaptureParams& device_info) OVERRIDE;
+  virtual void OnDelegateAdded(int32 device_id) OVERRIDE;
 
  private:
   friend class VideoCaptureImplManager;
diff --git a/content/renderer/media/video_capture_message_filter.h b/content/renderer/media/video_capture_message_filter.h
index 6c67f8e..b23ddc8 100644
--- a/content/renderer/media/video_capture_message_filter.h
+++ b/content/renderer/media/video_capture_message_filter.h
@@ -66,10 +66,10 @@ class CONTENT_EXPORT VideoCaptureMessageFilter
   typedef std::map<int32, Delegate*> Delegates;
 
   // IPC::ChannelProxy::MessageFilter override. Called on IO thread.
-  virtual bool OnMessageReceived(const IPC::Message& message);
-  virtual void OnFilterAdded(IPC::Channel* channel);
-  virtual void OnFilterRemoved();
-  virtual void OnChannelClosing();
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
+  virtual void OnFilterRemoved() OVERRIDE;
+  virtual void OnChannelClosing() OVERRIDE;
 
   // Receive a newly created buffer from browser process.
   void OnBufferCreated(int device_id,
diff --git a/content/renderer/media/video_capture_module_impl.h b/content/renderer/media/video_capture_module_impl.h
index ca56e85..d86727e 100644
--- a/content/renderer/media/video_capture_module_impl.h
+++ b/content/renderer/media/video_capture_module_impl.h
@@ -37,17 +37,17 @@ class VideoCaptureModuleImpl
       webrtc::VideoCaptureCapability& settings) OVERRIDE;
 
   // media::VideoCapture::EventHandler implementation.
-  virtual void OnStarted(media::VideoCapture* capture);
-  virtual void OnStopped(media::VideoCapture* capture);
-  virtual void OnPaused(media::VideoCapture* capture);
-  virtual void OnError(media::VideoCapture* capture, int error_code);
-  virtual void OnRemoved(media::VideoCapture* capture);
+  virtual void OnStarted(media::VideoCapture* capture) OVERRIDE;
+  virtual void OnStopped(media::VideoCapture* capture) OVERRIDE;
+  virtual void OnPaused(media::VideoCapture* capture) OVERRIDE;
+  virtual void OnError(media::VideoCapture* capture, int error_code) OVERRIDE;
+  virtual void OnRemoved(media::VideoCapture* capture) OVERRIDE;
   virtual void OnBufferReady(
       media::VideoCapture* capture,
-      scoped_refptr<media::VideoCapture::VideoFrameBuffer> buf);
+      scoped_refptr<media::VideoCapture::VideoFrameBuffer> buf) OVERRIDE;
   virtual void OnDeviceInfoReceived(
       media::VideoCapture* capture,
-      const media::VideoCaptureParams& device_info);
+      const media::VideoCaptureParams& device_info) OVERRIDE;
 
  private:
   virtual ~VideoCaptureModuleImpl();
diff --git a/content/renderer/media/webrtc_audio_device_impl.h b/content/renderer/media/webrtc_audio_device_impl.h
index 0ee233f..6e63401 100644
--- a/content/renderer/media/webrtc_audio_device_impl.h
+++ b/content/renderer/media/webrtc_audio_device_impl.h
@@ -121,8 +121,8 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl
                        size_t audio_delay_milliseconds) OVERRIDE;
 
   // AudioInputDevice::CaptureEventHandler implementation.
-  virtual void OnDeviceStarted(int device_index);
-  virtual void OnDeviceStopped();
+  virtual void OnDeviceStarted(int device_index) OVERRIDE;
+  virtual void OnDeviceStopped() OVERRIDE;
 
   // webrtc::Module implementation.
   virtual int32_t Version(char* version,
@@ -164,7 +164,7 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl
   virtual int32_t InitPlayout() OVERRIDE;
   virtual bool PlayoutIsInitialized() const OVERRIDE;
   virtual int32_t RecordingIsAvailable(bool* available) OVERRIDE;
-  virtual int32_t InitRecording();
+  virtual int32_t InitRecording() OVERRIDE;
   virtual bool RecordingIsInitialized() const OVERRIDE;
 
   virtual int32_t StartPlayout() OVERRIDE;
diff --git a/content/renderer/mhtml_generator.h b/content/renderer/mhtml_generator.h
index 0e0c878..faec63b 100644
--- a/content/renderer/mhtml_generator.h
+++ b/content/renderer/mhtml_generator.h
@@ -18,7 +18,7 @@ class MHTMLGenerator : public content::RenderViewObserver {
 
  private:
   // RenderViewObserver implementation:
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   void OnSavePageAsMHTML(int job_id,
                          IPC::PlatformFileForTransit file_for_transit);
diff --git a/content/renderer/notification_provider.h b/content/renderer/notification_provider.h
index 1e100b1..9b393ae 100644
--- a/content/renderer/notification_provider.h
+++ b/content/renderer/notification_provider.h
@@ -27,7 +27,7 @@ class NotificationProvider : public content::RenderViewObserver,
 
  private:
   // RenderView::Observer implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // WebKit::WebNotificationPresenter interface.
   virtual bool show(const WebKit::WebNotification& proxy);
diff --git a/content/renderer/p2p/ipc_socket_factory.h b/content/renderer/p2p/ipc_socket_factory.h
index 9c20fbb..1e41977 100644
--- a/content/renderer/p2p/ipc_socket_factory.h
+++ b/content/renderer/p2p/ipc_socket_factory.h
@@ -27,18 +27,18 @@ class IpcPacketSocketFactory : public talk_base::PacketSocketFactory {
 
   virtual talk_base::AsyncPacketSocket* CreateUdpSocket(
       const talk_base::SocketAddress& local_address,
-      int min_port, int max_port);
+      int min_port, int max_port) OVERRIDE;
   virtual talk_base::AsyncPacketSocket* CreateServerTcpSocket(
       const talk_base::SocketAddress& local_address,
       int min_port,
       int max_port,
-      bool ssl);
+      bool ssl) OVERRIDE;
   virtual talk_base::AsyncPacketSocket* CreateClientTcpSocket(
       const talk_base::SocketAddress& local_address,
       const talk_base::SocketAddress& remote_address,
       const talk_base::ProxyInfo& proxy_info,
       const std::string& user_agent,
-      bool ssl);
+      bool ssl) OVERRIDE;
 
  private:
   P2PSocketDispatcher* socket_dispatcher_;
diff --git a/content/renderer/p2p/socket_dispatcher.h b/content/renderer/p2p/socket_dispatcher.h
index b853e20..0f3a0a9 100644
--- a/content/renderer/p2p/socket_dispatcher.h
+++ b/content/renderer/p2p/socket_dispatcher.h
@@ -76,7 +76,7 @@ class P2PSocketDispatcher : public content::RenderViewObserver {
   void RemoveNetworkListObserver(NetworkListObserver* network_list_observer);
 
   // RenderViewObserver overrides.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
  private:
   friend class P2PHostAddressRequest;
diff --git a/content/renderer/pepper_platform_context_3d_impl.h b/content/renderer/pepper_platform_context_3d_impl.h
index 8f8937e..cac5c3c 100644
--- a/content/renderer/pepper_platform_context_3d_impl.h
+++ b/content/renderer/pepper_platform_context_3d_impl.h
@@ -29,12 +29,12 @@ class PlatformContext3DImpl
       PepperParentContextProvider* parent_context_provider);
   virtual ~PlatformContext3DImpl();
 
-  virtual bool Init(const int32* attrib_list);
-  virtual unsigned GetBackingTextureId();
-  virtual gpu::CommandBuffer* GetCommandBuffer();
-  virtual int GetCommandBufferRouteId();
-  virtual void SetContextLostCallback(const base::Closure& callback);
-  virtual bool Echo(const base::Closure& task);
+  virtual bool Init(const int32* attrib_list) OVERRIDE;
+  virtual unsigned GetBackingTextureId() OVERRIDE;
+  virtual gpu::CommandBuffer* GetCommandBuffer() OVERRIDE;
+  virtual int GetCommandBufferRouteId() OVERRIDE;
+  virtual void SetContextLostCallback(const base::Closure& callback) OVERRIDE;
+  virtual bool Echo(const base::Closure& task) OVERRIDE;
 
  private:
   bool InitRaw();
diff --git a/content/renderer/pepper_platform_video_decoder_impl.h b/content/renderer/pepper_platform_video_decoder_impl.h
index d90d352..2771756 100644
--- a/content/renderer/pepper_platform_video_decoder_impl.h
+++ b/content/renderer/pepper_platform_video_decoder_impl.h
@@ -26,7 +26,7 @@ class PlatformVideoDecoderImpl
       const media::BitstreamBuffer& bitstream_buffer) OVERRIDE;
   virtual void AssignPictureBuffers(
       const std::vector<media::PictureBuffer>& buffers) OVERRIDE;
-  virtual void ReusePictureBuffer(int32 picture_buffer_id);
+  virtual void ReusePictureBuffer(int32 picture_buffer_id) OVERRIDE;
   virtual void Flush() OVERRIDE;
   virtual void Reset() OVERRIDE;
   virtual void Destroy() OVERRIDE;
diff --git a/content/renderer/pepper_plugin_delegate_impl.h b/content/renderer/pepper_plugin_delegate_impl.h
index 52d657d..d1e830d 100644
--- a/content/renderer/pepper_plugin_delegate_impl.h
+++ b/content/renderer/pepper_plugin_delegate_impl.h
@@ -83,8 +83,8 @@ class PpapiBrokerImpl : public webkit::ppapi::PluginDelegate::PpapiBroker,
                   PepperPluginDelegateImpl* delegate_);
 
   // PpapiBroker implementation.
-  virtual void Connect(webkit::ppapi::PPB_Broker_Impl* client);
-  virtual void Disconnect(webkit::ppapi::PPB_Broker_Impl* client);
+  virtual void Connect(webkit::ppapi::PPB_Broker_Impl* client) OVERRIDE;
+  virtual void Disconnect(webkit::ppapi::PPB_Broker_Impl* client) OVERRIDE;
 
   // Called when the channel to the broker has been established.
   void OnBrokerChannelConnected(base::ProcessHandle broker_process_handle,
@@ -204,35 +204,35 @@ class PepperPluginDelegateImpl
       webkit::ppapi::PluginInstance* instance) OVERRIDE;
   virtual void PluginRequestedCancelComposition(
       webkit::ppapi::PluginInstance* instance) OVERRIDE;
-  virtual void PluginCrashed(webkit::ppapi::PluginInstance* instance);
+  virtual void PluginCrashed(webkit::ppapi::PluginInstance* instance) OVERRIDE;
   virtual void InstanceCreated(
-      webkit::ppapi::PluginInstance* instance);
+      webkit::ppapi::PluginInstance* instance) OVERRIDE;
   virtual void InstanceDeleted(
-      webkit::ppapi::PluginInstance* instance);
-  virtual SkBitmap* GetSadPluginBitmap();
+      webkit::ppapi::PluginInstance* instance) OVERRIDE;
+  virtual SkBitmap* GetSadPluginBitmap() OVERRIDE;
   virtual PlatformAudio* CreateAudio(
       uint32_t sample_rate,
       uint32_t sample_count,
-      PlatformAudio::Client* client);
-  virtual PlatformImage2D* CreateImage2D(int width, int height);
-  virtual PlatformContext3D* CreateContext3D();
+      PlatformAudio::Client* client) OVERRIDE;
+  virtual PlatformImage2D* CreateImage2D(int width, int height) OVERRIDE;
+  virtual PlatformContext3D* CreateContext3D() OVERRIDE;
   virtual PlatformVideoCapture* CreateVideoCapture(
       media::VideoCapture::EventHandler* handler) OVERRIDE;
   virtual PlatformVideoDecoder* CreateVideoDecoder(
       media::VideoDecodeAccelerator::Client* client,
-      int32 command_buffer_route_id);
+      int32 command_buffer_route_id) OVERRIDE;
   virtual PpapiBroker* ConnectToPpapiBroker(
-      webkit::ppapi::PPB_Broker_Impl* client);
+      webkit::ppapi::PPB_Broker_Impl* client) OVERRIDE;
   virtual void NumberOfFindResultsChanged(int identifier,
                                           int total,
-                                          bool final_result);
-  virtual void SelectedFindResultChanged(int identifier, int index);
+                                          bool final_result) OVERRIDE;
+  virtual void SelectedFindResultChanged(int identifier, int index) OVERRIDE;
   virtual bool RunFileChooser(
       const WebKit::WebFileChooserParams& params,
-      WebKit::WebFileChooserCompletion* chooser_completion);
+      WebKit::WebFileChooserCompletion* chooser_completion) OVERRIDE;
   virtual bool AsyncOpenFile(const FilePath& path,
                              int flags,
-                             const AsyncOpenFileCallback& callback);
+                             const AsyncOpenFileCallback& callback) OVERRIDE;
   virtual bool AsyncOpenFileSystemURL(
       const GURL& path,
       int flags,
@@ -356,7 +356,7 @@ class PepperPluginDelegateImpl
   }
 
   // Implementation of PepperParentContextProvider.
-  virtual RendererGLContext* GetParentContextForPlatformContext3D();
+  virtual RendererGLContext* GetParentContextForPlatformContext3D() OVERRIDE;
 
   // Pointer to the RenderView that owns us.
   RenderViewImpl* render_view_;
diff --git a/content/renderer/plugin_channel_host.h b/content/renderer/plugin_channel_host.h
index 0c191ff..486098d 100644
--- a/content/renderer/plugin_channel_host.h
+++ b/content/renderer/plugin_channel_host.h
@@ -23,19 +23,19 @@ class PluginChannelHost : public NPChannelBase {
 
   virtual bool Init(base::MessageLoopProxy* ipc_message_loop,
                     bool create_pipe_now,
-                    base::WaitableEvent* shutdown_event);
+                    base::WaitableEvent* shutdown_event) OVERRIDE;
 
-  virtual int GenerateRouteID();
+  virtual int GenerateRouteID() OVERRIDE;
 
   void AddRoute(int route_id, IPC::Channel::Listener* listener,
                 NPObjectBase* npobject);
   void RemoveRoute(int route_id);
 
   // NPChannelBase override:
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // IPC::Channel::Listener override
-  virtual void OnChannelError();
+  virtual void OnChannelError() OVERRIDE;
 
   static void SetListening(bool flag);
 
@@ -54,7 +54,7 @@ class PluginChannelHost : public NPChannelBase {
 
   static NPChannelBase* ClassFactory() { return new PluginChannelHost(); }
 
-  virtual bool OnControlMessageReceived(const IPC::Message& message);
+  virtual bool OnControlMessageReceived(const IPC::Message& message) OVERRIDE;
   void OnSetException(const std::string& message);
   void OnPluginShuttingDown();
 
diff --git a/content/renderer/render_process_impl.h b/content/renderer/render_process_impl.h
index 7b74d6f..8761844 100644
--- a/content/renderer/render_process_impl.h
+++ b/content/renderer/render_process_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -23,10 +23,11 @@ class RenderProcessImpl : public RenderProcess {
   virtual ~RenderProcessImpl();
 
   // RenderProcess implementation.
-  virtual skia::PlatformCanvas* GetDrawingCanvas(TransportDIB** memory,
-                                                 const gfx::Rect& rect);
-  virtual void ReleaseTransportDIB(TransportDIB* memory);
-  virtual bool UseInProcessPlugins() const;
+  virtual skia::PlatformCanvas* GetDrawingCanvas(
+      TransportDIB** memory,
+      const gfx::Rect& rect) OVERRIDE;
+  virtual void ReleaseTransportDIB(TransportDIB* memory) OVERRIDE;
+  virtual bool UseInProcessPlugins() const OVERRIDE;
 
   // Like UseInProcessPlugins(), but called before RenderProcess is created
   // and does not allow overriding by tests. This just checks the command line
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index e3fdac3..615161a 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -169,7 +169,7 @@ class CONTENT_EXPORT RenderThreadImpl : public content::RenderThread,
   scoped_refptr<base::MessageLoopProxy> GetFileThreadMessageLoopProxy();
 
  private:
-  virtual bool OnControlMessageReceived(const IPC::Message& msg);
+  virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   void Init();
 
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 6b7d4df..c69df6a 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -288,7 +288,7 @@ class RenderViewImpl : public RenderWidget,
 
   // IPC::Channel::Listener implementation -------------------------------------
 
-  virtual bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   // WebKit::WebWidgetClient implementation ------------------------------------
 
@@ -578,13 +578,14 @@ class RenderViewImpl : public RenderWidget,
 
   virtual webkit::npapi::WebPluginDelegate* CreatePluginDelegate(
       const FilePath& file_path,
-      const std::string& mime_type);
-  virtual void CreatedPluginWindow(gfx::PluginWindowHandle handle);
-  virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle);
-  virtual void DidMovePlugin(const webkit::npapi::WebPluginGeometry& move);
-  virtual void DidStartLoadingForPlugin();
-  virtual void DidStopLoadingForPlugin();
-  virtual WebKit::WebCookieJar* GetCookieJar();
+      const std::string& mime_type) OVERRIDE;
+  virtual void CreatedPluginWindow(gfx::PluginWindowHandle handle) OVERRIDE;
+  virtual void WillDestroyPluginWindow(gfx::PluginWindowHandle handle) OVERRIDE;
+  virtual void DidMovePlugin(
+      const webkit::npapi::WebPluginGeometry& move) OVERRIDE;
+  virtual void DidStartLoadingForPlugin() OVERRIDE;
+  virtual void DidStopLoadingForPlugin() OVERRIDE;
+  virtual WebKit::WebCookieJar* GetCookieJar() OVERRIDE;
 
   // webkit_media::WebMediaPlayerDelegate implementation -----------------------
 
@@ -595,7 +596,7 @@ class RenderViewImpl : public RenderWidget,
   // Please do not add your stuff randomly to the end here. If there is an
   // appropriate section, add it there. If not, there are some random functions
   // nearer to the top you can add it to.
-  virtual void DidFlushPaint();
+  virtual void DidFlushPaint() OVERRIDE;
 
   // Cannot use std::set unfortunately since linked_ptr<> does not support
   // operator<.
@@ -604,25 +605,25 @@ class RenderViewImpl : public RenderWidget,
 
  protected:
   // RenderWidget overrides:
-  virtual void Close();
+  virtual void Close() OVERRIDE;
   virtual void OnResize(const gfx::Size& new_size,
                         const gfx::Rect& resizer_rect,
-                        bool is_fullscreen);
-  virtual void DidInitiatePaint();
+                        bool is_fullscreen) OVERRIDE;
+  virtual void DidInitiatePaint() OVERRIDE;
   virtual webkit::ppapi::PluginInstance* GetBitmapForOptimizedPluginPaint(
       const gfx::Rect& paint_bounds,
       TransportDIB** dib,
       gfx::Rect* location,
-      gfx::Rect* clip);
-  virtual gfx::Point GetScrollOffset();
-  virtual void DidHandleKeyEvent();
+      gfx::Rect* clip) OVERRIDE;
+  virtual gfx::Point GetScrollOffset() OVERRIDE;
+  virtual void DidHandleKeyEvent() OVERRIDE;
   virtual bool WillHandleMouseEvent(
       const WebKit::WebMouseEvent& event) OVERRIDE;
-  virtual void DidHandleMouseEvent(const WebKit::WebMouseEvent& event);
-  virtual void DidHandleTouchEvent(const WebKit::WebTouchEvent& event);
-  virtual void OnSetFocus(bool enable);
-  virtual void OnWasHidden();
-  virtual void OnWasRestored(bool needs_repainting);
+  virtual void DidHandleMouseEvent(const WebKit::WebMouseEvent& event) OVERRIDE;
+  virtual void DidHandleTouchEvent(const WebKit::WebTouchEvent& event) OVERRIDE;
+  virtual void OnSetFocus(bool enable) OVERRIDE;
+  virtual void OnWasHidden() OVERRIDE;
+  virtual void OnWasRestored(bool needs_repainting) OVERRIDE;
   virtual bool SupportsAsynchronousSwapBuffers() OVERRIDE;
   virtual void OnImeSetComposition(
       const string16& text,
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h
index 93246a1..b13e8d3 100644
--- a/content/renderer/render_widget.h
+++ b/content/renderer/render_widget.h
@@ -96,10 +96,10 @@ class CONTENT_EXPORT RenderWidget
   bool is_fullscreen() const { return is_fullscreen_; }
 
   // IPC::Channel::Listener
-  virtual bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   // IPC::Message::Sender
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // WebKit::WebWidgetClient
   virtual void didInvalidateRect(const WebKit::WebRect&);
diff --git a/content/renderer/render_widget_fullscreen_pepper.h b/content/renderer/render_widget_fullscreen_pepper.h
index 5d47ec9..75e1fea 100644
--- a/content/renderer/render_widget_fullscreen_pepper.h
+++ b/content/renderer/render_widget_fullscreen_pepper.h
@@ -33,12 +33,13 @@ class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen,
       const GURL& active_url);
 
   // pepper::FullscreenContainer API.
-  virtual void Invalidate();
-  virtual void InvalidateRect(const WebKit::WebRect& rect);
-  virtual void ScrollRect(int dx, int dy, const WebKit::WebRect& rect);
-  virtual void Destroy();
-  virtual void DidChangeCursor(const WebKit::WebCursorInfo& cursor);
-  virtual webkit::ppapi::PluginDelegate::PlatformContext3D* CreateContext3D();
+  virtual void Invalidate() OVERRIDE;
+  virtual void InvalidateRect(const WebKit::WebRect& rect) OVERRIDE;
+  virtual void ScrollRect(int dx, int dy, const WebKit::WebRect& rect) OVERRIDE;
+  virtual void Destroy() OVERRIDE;
+  virtual void DidChangeCursor(const WebKit::WebCursorInfo& cursor) OVERRIDE;
+  virtual webkit::ppapi::PluginDelegate::PlatformContext3D*
+      CreateContext3D() OVERRIDE;
 
   RendererGLContext* context() const { return context_; }
   void SwapBuffers();
@@ -52,20 +53,20 @@ class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen,
   virtual ~RenderWidgetFullscreenPepper();
 
   // RenderWidget API.
-  virtual void DidInitiatePaint();
-  virtual void DidFlushPaint();
-  virtual void Close();
+  virtual void DidInitiatePaint() OVERRIDE;
+  virtual void DidFlushPaint() OVERRIDE;
+  virtual void Close() OVERRIDE;
   virtual webkit::ppapi::PluginInstance* GetBitmapForOptimizedPluginPaint(
       const gfx::Rect& paint_bounds,
       TransportDIB** dib,
       gfx::Rect* location,
-      gfx::Rect* clip);
+      gfx::Rect* clip) OVERRIDE;
   virtual void OnResize(const gfx::Size& new_size,
                         const gfx::Rect& resizer_rect,
-                        bool is_fullscreen);
+                        bool is_fullscreen) OVERRIDE;
 
   // RenderWidgetFullscreen API.
-  virtual WebKit::WebWidget* CreateWebWidget();
+  virtual WebKit::WebWidget* CreateWebWidget() OVERRIDE;
 
   // RenderWidget overrides.
   virtual bool SupportsAsynchronousSwapBuffers() OVERRIDE;
@@ -89,7 +90,7 @@ class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen,
   void OnSwapBuffersCompleteByRendererGLContext();
 
   // Implementation of PepperParentContextProvider.
-  virtual RendererGLContext* GetParentContextForPlatformContext3D();
+  virtual RendererGLContext* GetParentContextForPlatformContext3D() OVERRIDE;
 
   // URL that is responsible for this widget, passed to ggl::CreateViewContext.
   GURL active_url_;
diff --git a/content/renderer/renderer_accessibility.h b/content/renderer/renderer_accessibility.h
index 887876a..c6e4c17 100644
--- a/content/renderer/renderer_accessibility.h
+++ b/content/renderer/renderer_accessibility.h
@@ -36,9 +36,9 @@ class RendererAccessibility : public content::RenderViewObserver {
   virtual ~RendererAccessibility();
 
   // RenderView::Observer implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
-  virtual void FocusedNodeChanged(const WebKit::WebNode& node);
-  virtual void DidFinishLoad(WebKit::WebFrame* frame);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void FocusedNodeChanged(const WebKit::WebNode& node) OVERRIDE;
+  virtual void DidFinishLoad(WebKit::WebFrame* frame) OVERRIDE;
 
   // Called when an accessibility notification occurs in WebKit.
   virtual void PostAccessibilityNotification(
diff --git a/content/renderer/renderer_webapplicationcachehost_impl.h b/content/renderer/renderer_webapplicationcachehost_impl.h
index 4b434a9..885fb8a 100644
--- a/content/renderer/renderer_webapplicationcachehost_impl.h
+++ b/content/renderer/renderer_webapplicationcachehost_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -20,9 +20,9 @@ class RendererWebApplicationCacheHostImpl
 
   // appcache::WebApplicationCacheHostImpl methods.
   virtual void OnLogMessage(appcache::LogLevel log_level,
-                            const std::string& message);
-  virtual void OnContentBlocked(const GURL& manifest_url);
-  virtual void OnCacheSelected(const appcache::AppCacheInfo& info);
+                            const std::string& message) OVERRIDE;
+  virtual void OnContentBlocked(const GURL& manifest_url) OVERRIDE;
+  virtual void OnCacheSelected(const appcache::AppCacheInfo& info) OVERRIDE;
 
  private:
   RenderViewImpl* GetRenderView();
diff --git a/content/renderer/renderer_webaudiodevice_impl.h b/content/renderer/renderer_webaudiodevice_impl.h
index 70959e3..05f301c 100644
--- a/content/renderer/renderer_webaudiodevice_impl.h
+++ b/content/renderer/renderer_webaudiodevice_impl.h
@@ -29,7 +29,7 @@ class RendererWebAudioDeviceImpl : public WebKit::WebAudioDevice,
   // AudioDevice::RenderCallback implementation.
   virtual void Render(const std::vector<float*>& audio_data,
                       size_t number_of_frames,
-                      size_t audio_delay_milliseconds);
+                      size_t audio_delay_milliseconds) OVERRIDE;
 
  private:
   scoped_refptr<AudioDevice> audio_device_;
diff --git a/content/renderer/speech_input_dispatcher.h b/content/renderer/speech_input_dispatcher.h
index 5d9d14c..c7c031d 100644
--- a/content/renderer/speech_input_dispatcher.h
+++ b/content/renderer/speech_input_dispatcher.h
@@ -26,7 +26,7 @@ class SpeechInputDispatcher : public content::RenderViewObserver,
 
  private:
   // RenderView::Observer implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // WebKit::WebSpeechInputController.
   virtual bool startRecognition(int request_id,
diff --git a/content/renderer/text_input_client_observer.h b/content/renderer/text_input_client_observer.h
index 9fe9edc..9e5e86e 100644
--- a/content/renderer/text_input_client_observer.h
+++ b/content/renderer/text_input_client_observer.h
@@ -26,7 +26,7 @@ class TextInputClientObserver : public content::RenderViewObserver {
   virtual ~TextInputClientObserver();
 
   // RenderViewObserver overrides:
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
  private:
   // Returns the WebView of the RenderView.
diff --git a/content/renderer/webplugin_delegate_proxy.h b/content/renderer/webplugin_delegate_proxy.h
index 9e9914b..5c2592b 100644
--- a/content/renderer/webplugin_delegate_proxy.h
+++ b/content/renderer/webplugin_delegate_proxy.h
@@ -59,23 +59,23 @@ class WebPluginDelegateProxy
                          const base::WeakPtr<RenderViewImpl>& render_view);
 
   // WebPluginDelegate implementation:
-  virtual void PluginDestroyed();
+  virtual void PluginDestroyed() OVERRIDE;
   virtual bool Initialize(const GURL& url,
                           const std::vector<std::string>& arg_names,
                           const std::vector<std::string>& arg_values,
                           webkit::npapi::WebPlugin* plugin,
-                          bool load_manually);
+                          bool load_manually) OVERRIDE;
   virtual void UpdateGeometry(const gfx::Rect& window_rect,
-                              const gfx::Rect& clip_rect);
-  virtual void Paint(WebKit::WebCanvas* canvas, const gfx::Rect& rect);
-  virtual NPObject* GetPluginScriptableObject();
-  virtual bool GetFormValue(string16* value);
+                              const gfx::Rect& clip_rect) OVERRIDE;
+  virtual void Paint(WebKit::WebCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
+  virtual NPObject* GetPluginScriptableObject() OVERRIDE;
+  virtual bool GetFormValue(string16* value) OVERRIDE;
   virtual void DidFinishLoadWithReason(const GURL& url, NPReason reason,
-                                       int notify_id);
-  virtual void SetFocus(bool focused);
+                                       int notify_id) OVERRIDE;
+  virtual void SetFocus(bool focused) OVERRIDE;
   virtual bool HandleInputEvent(const WebKit::WebInputEvent& event,
-                                WebKit::WebCursorInfo* cursor);
-  virtual int GetProcessId();
+                                WebKit::WebCursorInfo* cursor) OVERRIDE;
+  virtual int GetProcessId() OVERRIDE;
 
   // Informs the plugin that its containing content view has gained or lost
   // first responder status.
@@ -105,29 +105,29 @@ class WebPluginDelegateProxy
 #endif
 
   // IPC::Channel::Listener implementation:
-  virtual bool OnMessageReceived(const IPC::Message& msg);
-  virtual void OnChannelError();
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+  virtual void OnChannelError() OVERRIDE;
 
   // IPC::Message::Sender implementation:
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   virtual void SendJavaScriptStream(const GURL& url,
                                     const std::string& result,
                                     bool success,
-                                    int notify_id);
+                                    int notify_id) OVERRIDE;
 
   virtual void DidReceiveManualResponse(const GURL& url,
                                         const std::string& mime_type,
                                         const std::string& headers,
                                         uint32 expected_length,
-                                        uint32 last_modified);
-  virtual void DidReceiveManualData(const char* buffer, int length);
-  virtual void DidFinishManualLoading();
-  virtual void DidManualLoadFail();
+                                        uint32 last_modified) OVERRIDE;
+  virtual void DidReceiveManualData(const char* buffer, int length) OVERRIDE;
+  virtual void DidFinishManualLoading() OVERRIDE;
+  virtual void DidManualLoadFail() OVERRIDE;
   virtual webkit::npapi::WebPluginResourceClient* CreateResourceClient(
-      unsigned long resource_id, const GURL& url, int notify_id);
+      unsigned long resource_id, const GURL& url, int notify_id) OVERRIDE;
   virtual webkit::npapi::WebPluginResourceClient* CreateSeekableResourceClient(
-      unsigned long resource_id, int range_request_id);
+      unsigned long resource_id, int range_request_id) OVERRIDE;
 
   gfx::PluginWindowHandle GetPluginWindowHandle();
 
diff --git a/content/renderer/websharedworker_proxy.h b/content/renderer/websharedworker_proxy.h
index 1c54cb0..23690c7 100644
--- a/content/renderer/websharedworker_proxy.h
+++ b/content/renderer/websharedworker_proxy.h
@@ -47,7 +47,7 @@ class WebSharedWorkerProxy : public WebKit::WebSharedWorker,
 
  private:
   // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Returns true if the worker is running (can send messages to it).
   bool IsStarted();
diff --git a/content/shell/shell_browser_main.h b/content/shell/shell_browser_main.h
index 55f725a..0e617ca 100644
--- a/content/shell/shell_browser_main.h
+++ b/content/shell/shell_browser_main.h
@@ -37,7 +37,7 @@ class ShellBrowserMainParts : public BrowserMainParts {
   virtual void PostMainMessageLoopStart() OVERRIDE {}
   virtual void PreMainMessageLoopRun() OVERRIDE;
   virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
-  virtual void PostMainMessageLoopRun() {}
+  virtual void PostMainMessageLoopRun() OVERRIDE {}
 
   ResourceDispatcherHost* GetResourceDispatcherHost();
   ui::Clipboard* GetClipboard();
diff --git a/content/test/browser_test.h b/content/test/browser_test.h
index 50a7f27..8df4173 100644
--- a/content/test/browser_test.h
+++ b/content/test/browser_test.h
@@ -21,15 +21,17 @@
 typedef ContentBrowserTest InProcessBrowserTest;
 #endif
 
+#include "base/compiler_specific.h"
+
 #define IN_PROC_BROWSER_TEST_(test_case_name, test_name, parent_class,\
                               parent_id)\
 class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) : public parent_class {\
  public:\
   GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {}\
  protected:\
-  virtual void RunTestOnMainThread();\
+  virtual void RunTestOnMainThread() OVERRIDE;\
  private:\
-  virtual void TestBody() {}\
+  virtual void TestBody() OVERRIDE {}\
   static ::testing::TestInfo* const test_info_;\
   GTEST_DISALLOW_COPY_AND_ASSIGN_(\
       GTEST_TEST_CLASS_NAME_(test_case_name, test_name));\
diff --git a/content/test/mock_render_process.h b/content/test/mock_render_process.h
index ef4db6c..589556f 100644
--- a/content/test/mock_render_process.h
+++ b/content/test/mock_render_process.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -16,10 +16,11 @@ class MockRenderProcess : public RenderProcess {
   virtual ~MockRenderProcess();
 
   // RenderProcess implementation.
-  virtual skia::PlatformCanvas* GetDrawingCanvas(TransportDIB** memory,
-                                                 const gfx::Rect& rect);
-  virtual void ReleaseTransportDIB(TransportDIB* memory);
-  virtual bool UseInProcessPlugins() const;
+  virtual skia::PlatformCanvas* GetDrawingCanvas(
+      TransportDIB** memory,
+      const gfx::Rect& rect) OVERRIDE;
+  virtual void ReleaseTransportDIB(TransportDIB* memory) OVERRIDE;
+  virtual bool UseInProcessPlugins() const OVERRIDE;
   virtual bool HasInitializedMediaLibrary() const;
 
  private:
diff --git a/content/test/render_view_test.h b/content/test/render_view_test.h
index 6710389..d3878db7 100644
--- a/content/test/render_view_test.h
+++ b/content/test/render_view_test.h
@@ -109,9 +109,9 @@ class RenderViewTest : public testing::Test {
   WebKit::WebWidget* GetWebWidget();
 
   // testing::Test
-  virtual void SetUp();
+  virtual void SetUp() OVERRIDE;
 
-  virtual void TearDown();
+  virtual void TearDown() OVERRIDE;
 
   MessageLoop msg_loop_;
   scoped_ptr<MockRenderProcess> mock_process_;
diff --git a/content/test/test_notification_tracker.h b/content/test/test_notification_tracker.h
index 16b91c2..ef1d7ce 100644
--- a/content/test/test_notification_tracker.h
+++ b/content/test/test_notification_tracker.h
@@ -8,6 +8,7 @@
 
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -69,7 +70,7 @@ class TestNotificationTracker : public content::NotificationObserver {
  protected:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
  private:
   content::NotificationRegistrar registrar_;
 
diff --git a/content/test/webrtc_audio_device_test.h b/content/test/webrtc_audio_device_test.h
index 6109d1d..39f54cf 100644
--- a/content/test/webrtc_audio_device_test.h
+++ b/content/test/webrtc_audio_device_test.h
@@ -134,8 +134,8 @@ class WebRTCAudioDeviceTest
   WebRTCAudioDeviceTest();
   virtual ~WebRTCAudioDeviceTest();
 
-  virtual void SetUp();
-  virtual void TearDown();
+  virtual void SetUp() OVERRIDE;
+  virtual void TearDown() OVERRIDE;
 
   // Sends an IPC message to the IO thread channel.
   bool Send(IPC::Message* message);
@@ -155,7 +155,7 @@ class WebRTCAudioDeviceTest
   void OnGetHardwareInputSampleRate(double* sample_rate);
 
   // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Posts a final task to the IO message loop and waits for completion.
   void WaitForIOThreadCompletion();
@@ -199,8 +199,8 @@ class WebRTCTransportImpl : public webrtc::Transport {
   explicit WebRTCTransportImpl(webrtc::VoENetwork* network);
   virtual ~WebRTCTransportImpl();
 
-  virtual int SendPacket(int channel, const void* data, int len);
-  virtual int SendRTCPPacket(int channel, const void* data, int len);
+  virtual int SendPacket(int channel, const void* data, int len) OVERRIDE;
+  virtual int SendRTCPPacket(int channel, const void* data, int len) OVERRIDE;
 
  private:
   webrtc::VoENetwork* network_;
diff --git a/content/worker/websharedworker_stub.h b/content/worker/websharedworker_stub.h
index c372fb2..77e063a 100644
--- a/content/worker/websharedworker_stub.h
+++ b/content/worker/websharedworker_stub.h
@@ -26,8 +26,8 @@ class WebSharedWorkerStub : public IPC::Channel::Listener {
                       const WorkerAppCacheInitInfo& appcache_init_info);
 
   // IPC::Channel::Listener implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
-  virtual void OnChannelError();
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnChannelError() OVERRIDE;
 
   // Invoked when the WebWorkerClientProxy is shutting down.
   void Shutdown();
diff --git a/content/worker/worker_thread.h b/content/worker/worker_thread.h
index 89d8f85..d1fb4ab 100644
--- a/content/worker/worker_thread.h
+++ b/content/worker/worker_thread.h
@@ -34,8 +34,8 @@ class WorkerThread : public ChildThread {
   }
 
  private:
-  virtual bool OnControlMessageReceived(const IPC::Message& msg);
-  virtual void OnChannelError();
+  virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
+  virtual void OnChannelError() OVERRIDE;
 
   void OnCreateWorker(const WorkerProcessMsg_CreateWorker_Params& params);