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

This step is a giant search and replace for OVERRIDE and FINAL to
replace them with their lowercase versions.

BUG=417463

Review URL: https://codereview.chromium.org/616603004

Cr-Commit-Position: refs/heads/master@{#298493}

133 files changed, 1092 insertions, 1092 deletions

diff --git a/content/browser/renderer_host/clipboard_message_filter.h b/content/browser/renderer_host/clipboard_message_filter.h
index 3fcb94e..98a2ca3 100644
--- a/content/browser/renderer_host/clipboard_message_filter.h
+++ b/content/browser/renderer_host/clipboard_message_filter.h
@@ -23,8 +23,8 @@ class ClipboardMessageFilter : public BrowserMessageFilter {
 
   virtual void OverrideThreadForMessage(
       const IPC::Message& message,
-      BrowserThread::ID* thread) OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+      BrowserThread::ID* thread) override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
  private:
   virtual ~ClipboardMessageFilter();
 
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index 0d6ee68..3a203ab 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -65,7 +65,7 @@ class OutputSurfaceWithoutParent : public cc::OutputSurface {
     main_thread_ = base::MessageLoopProxy::current();
   }
 
-  virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE {
+  virtual void SwapBuffers(cc::CompositorFrame* frame) override {
     for (size_t i = 0; i < frame->metadata.latency_info.size(); i++) {
       frame->metadata.latency_info[i].AddLatencyNumber(
           ui::INPUT_EVENT_BROWSER_SWAP_BUFFER_COMPONENT, 0, 0);
@@ -82,7 +82,7 @@ class OutputSurfaceWithoutParent : public cc::OutputSurface {
     OutputSurface::SwapBuffers(frame);
   }
 
-  virtual bool BindToClient(cc::OutputSurfaceClient* client) OVERRIDE {
+  virtual bool BindToClient(cc::OutputSurfaceClient* client) override {
     if (!OutputSurface::BindToClient(client))
       return false;
 
@@ -108,7 +108,7 @@ class SurfaceTextureTrackerImpl : public gfx::SurfaceTextureTracker {
   // Overridden from gfx::SurfaceTextureTracker:
   virtual scoped_refptr<gfx::SurfaceTexture> AcquireSurfaceTexture(
       int primary_id,
-      int secondary_id) OVERRIDE {
+      int secondary_id) override {
     base::AutoLock lock(surface_textures_lock_);
     SurfaceTextureMapKey key(primary_id, secondary_id);
     SurfaceTextureMap::iterator it = surface_textures_.find(key);
diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h
index b665ffc..932984e 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -60,53 +60,53 @@ class CONTENT_EXPORT CompositorImpl
 
  private:
   // Compositor implementation.
-  virtual void SetRootLayer(scoped_refptr<cc::Layer> root) OVERRIDE;
-  virtual void SetSurface(jobject surface) OVERRIDE;
-  virtual void SetVisible(bool visible) OVERRIDE;
-  virtual void setDeviceScaleFactor(float factor) OVERRIDE;
-  virtual void SetWindowBounds(const gfx::Size& size) OVERRIDE;
-  virtual void SetHasTransparentBackground(bool flag) OVERRIDE;
-  virtual void SetNeedsComposite() OVERRIDE;
-  virtual UIResourceProvider& GetUIResourceProvider() OVERRIDE;
+  virtual void SetRootLayer(scoped_refptr<cc::Layer> root) override;
+  virtual void SetSurface(jobject surface) override;
+  virtual void SetVisible(bool visible) override;
+  virtual void setDeviceScaleFactor(float factor) override;
+  virtual void SetWindowBounds(const gfx::Size& size) override;
+  virtual void SetHasTransparentBackground(bool flag) override;
+  virtual void SetNeedsComposite() override;
+  virtual UIResourceProvider& GetUIResourceProvider() override;
 
   // LayerTreeHostClient implementation.
-  virtual void WillBeginMainFrame(int frame_id) OVERRIDE {}
-  virtual void DidBeginMainFrame() OVERRIDE {}
-  virtual void BeginMainFrame(const cc::BeginFrameArgs& args) OVERRIDE {}
-  virtual void Layout() OVERRIDE;
+  virtual void WillBeginMainFrame(int frame_id) override {}
+  virtual void DidBeginMainFrame() override {}
+  virtual void BeginMainFrame(const cc::BeginFrameArgs& args) override {}
+  virtual void Layout() override;
   virtual void ApplyViewportDeltas(
       const gfx::Vector2d& inner_delta,
       const gfx::Vector2d& outer_delta,
       float page_scale,
-      float top_controls_delta) OVERRIDE {}
+      float top_controls_delta) override {}
   virtual void ApplyViewportDeltas(
       const gfx::Vector2d& scroll_delta,
       float page_scale,
-      float top_controls_delta) OVERRIDE {}
-  virtual void RequestNewOutputSurface(bool fallback) OVERRIDE;
-  virtual void DidInitializeOutputSurface() OVERRIDE {}
-  virtual void WillCommit() OVERRIDE {}
-  virtual void DidCommit() OVERRIDE;
-  virtual void DidCommitAndDrawFrame() OVERRIDE {}
-  virtual void DidCompleteSwapBuffers() OVERRIDE;
+      float top_controls_delta) override {}
+  virtual void RequestNewOutputSurface(bool fallback) override;
+  virtual void DidInitializeOutputSurface() override {}
+  virtual void WillCommit() override {}
+  virtual void DidCommit() override;
+  virtual void DidCommitAndDrawFrame() override {}
+  virtual void DidCompleteSwapBuffers() override;
 
   // LayerTreeHostSingleThreadClient implementation.
-  virtual void ScheduleComposite() OVERRIDE;
-  virtual void ScheduleAnimation() OVERRIDE;
-  virtual void DidPostSwapBuffers() OVERRIDE;
-  virtual void DidAbortSwapBuffers() OVERRIDE;
+  virtual void ScheduleComposite() override;
+  virtual void ScheduleAnimation() override;
+  virtual void DidPostSwapBuffers() override;
+  virtual void DidAbortSwapBuffers() override;
 
   // ImageTransportFactoryAndroidObserver implementation.
-  virtual void OnLostResources() OVERRIDE;
+  virtual void OnLostResources() override;
 
   // WindowAndroidCompositor implementation.
-  virtual void AttachLayerForReadback(scoped_refptr<cc::Layer> layer) OVERRIDE;
+  virtual void AttachLayerForReadback(scoped_refptr<cc::Layer> layer) override;
   virtual void RequestCopyOfOutputOnRootLayer(
-      scoped_ptr<cc::CopyOutputRequest> request) OVERRIDE;
+      scoped_ptr<cc::CopyOutputRequest> request) override;
   virtual void OnVSync(base::TimeTicks frame_time,
-                       base::TimeDelta vsync_period) OVERRIDE;
-  virtual void SetNeedsAnimate() OVERRIDE;
-  virtual ui::SystemUIResourceManager& GetSystemUIResourceManager() OVERRIDE;
+                       base::TimeDelta vsync_period) override;
+  virtual void SetNeedsAnimate() override;
+  virtual ui::SystemUIResourceManager& GetSystemUIResourceManager() override;
 
   void SetWindowSurface(ANativeWindow* window);
 
diff --git a/content/browser/renderer_host/compositor_resize_lock_aura.h b/content/browser/renderer_host/compositor_resize_lock_aura.h
index 70595f9..a9bf495 100644
--- a/content/browser/renderer_host/compositor_resize_lock_aura.h
+++ b/content/browser/renderer_host/compositor_resize_lock_aura.h
@@ -28,11 +28,11 @@ class CompositorResizeLock : public ResizeLock {
                        const base::TimeDelta& timeout);
   virtual ~CompositorResizeLock();
 
-  virtual bool GrabDeferredLock() OVERRIDE;
-  virtual void UnlockCompositor() OVERRIDE;
+  virtual bool GrabDeferredLock() override;
+  virtual void UnlockCompositor() override;
 
  protected:
-  virtual void LockCompositor() OVERRIDE;
+  virtual void LockCompositor() override;
   void CancelLock();
 
  private:
diff --git a/content/browser/renderer_host/database_message_filter.h b/content/browser/renderer_host/database_message_filter.h
index d145bb7..b61816c 100644
--- a/content/browser/renderer_host/database_message_filter.h
+++ b/content/browser/renderer_host/database_message_filter.h
@@ -20,11 +20,11 @@ class DatabaseMessageFilter : public BrowserMessageFilter,
   explicit DatabaseMessageFilter(storage::DatabaseTracker* db_tracker);
 
   // BrowserMessageFilter implementation.
-  virtual void OnChannelClosing() OVERRIDE;
+  virtual void OnChannelClosing() override;
   virtual void OverrideThreadForMessage(
       const IPC::Message& message,
-      BrowserThread::ID* thread) OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+      BrowserThread::ID* thread) override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   storage::DatabaseTracker* database_tracker() const {
     return db_tracker_.get();
@@ -74,10 +74,10 @@ class DatabaseMessageFilter : public BrowserMessageFilter,
   // DatabaseTracker::Observer callbacks (file thread)
   virtual void OnDatabaseSizeChanged(const std::string& origin_identifier,
                                      const base::string16& database_name,
-                                     int64 database_size) OVERRIDE;
+                                     int64 database_size) override;
   virtual void OnDatabaseScheduledForDeletion(
       const std::string& origin_identifier,
-      const base::string16& database_name) OVERRIDE;
+      const base::string16& database_name) override;
 
   void DatabaseDeleteFile(const base::string16& vfs_file_name,
                           bool sync_dir,
diff --git a/content/browser/renderer_host/delegated_frame_evictor.h b/content/browser/renderer_host/delegated_frame_evictor.h
index 64df6f7..7855b31 100644
--- a/content/browser/renderer_host/delegated_frame_evictor.h
+++ b/content/browser/renderer_host/delegated_frame_evictor.h
@@ -31,7 +31,7 @@ class CONTENT_EXPORT DelegatedFrameEvictor : public RendererFrameManagerClient {
 
  private:
   // RendererFrameManagerClient implementation.
-  virtual void EvictCurrentFrame() OVERRIDE;
+  virtual void EvictCurrentFrame() override;
 
   DelegatedFrameEvictorClient* client_;
   bool has_frame_;
diff --git a/content/browser/renderer_host/file_utilities_message_filter.h b/content/browser/renderer_host/file_utilities_message_filter.h
index ecfbfe0..515b4c4 100644
--- a/content/browser/renderer_host/file_utilities_message_filter.h
+++ b/content/browser/renderer_host/file_utilities_message_filter.h
@@ -23,8 +23,8 @@ class FileUtilitiesMessageFilter : public BrowserMessageFilter {
   // BrowserMessageFilter implementation.
   virtual void OverrideThreadForMessage(
       const IPC::Message& message,
-      BrowserThread::ID* thread) OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+      BrowserThread::ID* thread) override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
  private:
   virtual ~FileUtilitiesMessageFilter();
 
diff --git a/content/browser/renderer_host/gamepad_browser_message_filter.h b/content/browser/renderer_host/gamepad_browser_message_filter.h
index fefbf42..316676c 100644
--- a/content/browser/renderer_host/gamepad_browser_message_filter.h
+++ b/content/browser/renderer_host/gamepad_browser_message_filter.h
@@ -22,15 +22,15 @@ class GamepadBrowserMessageFilter :
   GamepadBrowserMessageFilter();
 
   // BrowserMessageFilter implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // GamepadConsumer implementation.
   virtual void OnGamepadConnected(
       unsigned index,
-      const blink::WebGamepad& gamepad) OVERRIDE;
+      const blink::WebGamepad& gamepad) override;
   virtual void OnGamepadDisconnected(
       unsigned index,
-      const blink::WebGamepad& gamepad) OVERRIDE;
+      const blink::WebGamepad& gamepad) override;
 
  private:
   virtual ~GamepadBrowserMessageFilter();
diff --git a/content/browser/renderer_host/gpu_message_filter.h b/content/browser/renderer_host/gpu_message_filter.h
index 43caf0c..d2f0ace 100644
--- a/content/browser/renderer_host/gpu_message_filter.h
+++ b/content/browser/renderer_host/gpu_message_filter.h
@@ -37,7 +37,7 @@ class GpuMessageFilter : public BrowserMessageFilter {
                    RenderWidgetHelper* render_widget_helper);
 
   // BrowserMessageFilter methods:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // This set of API is used to subscribe to frame presentation events.
   // See RenderWidgetHostViewFrameSubscriber for more details.
diff --git a/content/browser/renderer_host/image_transport_factory_android.cc b/content/browser/renderer_host/image_transport_factory_android.cc
index 17664a8..41e3156 100644
--- a/content/browser/renderer_host/image_transport_factory_android.cc
+++ b/content/browser/renderer_host/image_transport_factory_android.cc
@@ -24,7 +24,7 @@ class GLContextLostListener
     : public blink::WebGraphicsContext3D::WebGraphicsContextLostCallback {
  public:
   // WebGraphicsContextLostCallback implementation.
-  virtual void onContextLost() OVERRIDE;
+  virtual void onContextLost() override;
  private:
   static void DidLoseContext();
 };
@@ -38,8 +38,8 @@ class CmdBufferImageTransportFactory : public ImageTransportFactoryAndroid {
   CmdBufferImageTransportFactory();
   virtual ~CmdBufferImageTransportFactory();
 
-  virtual GLHelper* GetGLHelper() OVERRIDE;
-  virtual uint32 GetChannelID() OVERRIDE {
+  virtual GLHelper* GetGLHelper() override;
+  virtual uint32 GetChannelID() override {
     return BrowserGpuChannelHostFactory::instance()->GetGpuChannelId();
   }
 
diff --git a/content/browser/renderer_host/input/gesture_event_queue_unittest.cc b/content/browser/renderer_host/input/gesture_event_queue_unittest.cc
index 4a36a10..3fbae1e 100644
--- a/content/browser/renderer_host/input/gesture_event_queue_unittest.cc
+++ b/content/browser/renderer_host/input/gesture_event_queue_unittest.cc
@@ -34,11 +34,11 @@ class GestureEventQueueTest : public testing::Test,
   virtual ~GestureEventQueueTest() {}
 
   // testing::Test
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     queue_.reset(new GestureEventQueue(this, this, DefaultConfig()));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Process all pending tasks to avoid leaks.
     RunUntilIdle();
     queue_.reset();
@@ -46,7 +46,7 @@ class GestureEventQueueTest : public testing::Test,
 
   // GestureEventQueueClient
   virtual void SendGestureEventImmediately(
-      const GestureEventWithLatencyInfo& event) OVERRIDE {
+      const GestureEventWithLatencyInfo& event) override {
     ++sent_gesture_event_count_;
     if (sync_ack_result_) {
       scoped_ptr<InputEventAckState> ack_result = sync_ack_result_.Pass();
@@ -56,7 +56,7 @@ class GestureEventQueueTest : public testing::Test,
 
   virtual void OnGestureEventAck(
       const GestureEventWithLatencyInfo& event,
-      InputEventAckState ack_result) OVERRIDE {
+      InputEventAckState ack_result) override {
     ++acked_gesture_event_count_;
     last_acked_event_ = event.event;
     if (sync_followup_event_) {
@@ -67,7 +67,7 @@ class GestureEventQueueTest : public testing::Test,
 
   // TouchpadTapSuppressionControllerClient
   virtual void SendMouseEventImmediately(
-      const MouseEventWithLatencyInfo& event) OVERRIDE {
+      const MouseEventWithLatencyInfo& event) override {
   }
 
  protected:
diff --git a/content/browser/renderer_host/input/gesture_text_selector_unittest.cc b/content/browser/renderer_host/input/gesture_text_selector_unittest.cc
index 7978cb9..2d16245 100644
--- a/content/browser/renderer_host/input/gesture_text_selector_unittest.cc
+++ b/content/browser/renderer_host/input/gesture_text_selector_unittest.cc
@@ -26,26 +26,26 @@ class GestureTextSelectorTest : public testing::Test,
   virtual ~GestureTextSelectorTest() {}
 
   // Test implementation.
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     selector_.reset(new GestureTextSelector(this));
     event_log_.clear();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     selector_.reset();
     event_log_.clear();
   }
 
   // GestureTextSelectorClient implementation.
-  virtual void ShowSelectionHandlesAutomatically() OVERRIDE {
+  virtual void ShowSelectionHandlesAutomatically() override {
     event_log_.push_back("Show");
   }
 
-  virtual void SelectRange(float x1, float y1, float x2, float y2) OVERRIDE {
+  virtual void SelectRange(float x1, float y1, float x2, float y2) override {
     event_log_.push_back("SelectRange");
   }
 
-  virtual void LongPress(base::TimeTicks time, float x, float y) OVERRIDE {
+  virtual void LongPress(base::TimeTicks time, float x, float y) override {
     event_log_.push_back("LongPress");
   }
 
diff --git a/content/browser/renderer_host/input/input_router_impl.h b/content/browser/renderer_host/input/input_router_impl.h
index ed648f5..0f7b023 100644
--- a/content/browser/renderer_host/input/input_router_impl.h
+++ b/content/browser/renderer_host/input/input_router_impl.h
@@ -56,46 +56,46 @@ class CONTENT_EXPORT InputRouterImpl
   virtual ~InputRouterImpl();
 
   // InputRouter
-  virtual void Flush() OVERRIDE;
-  virtual bool SendInput(scoped_ptr<IPC::Message> message) OVERRIDE;
+  virtual void Flush() override;
+  virtual bool SendInput(scoped_ptr<IPC::Message> message) override;
   virtual void SendMouseEvent(
-      const MouseEventWithLatencyInfo& mouse_event) OVERRIDE;
+      const MouseEventWithLatencyInfo& mouse_event) override;
   virtual void SendWheelEvent(
-      const MouseWheelEventWithLatencyInfo& wheel_event) OVERRIDE;
+      const MouseWheelEventWithLatencyInfo& wheel_event) override;
   virtual void SendKeyboardEvent(
       const NativeWebKeyboardEvent& key_event,
       const ui::LatencyInfo& latency_info,
-      bool is_keyboard_shortcut) OVERRIDE;
+      bool is_keyboard_shortcut) override;
   virtual void SendGestureEvent(
-      const GestureEventWithLatencyInfo& gesture_event) OVERRIDE;
+      const GestureEventWithLatencyInfo& gesture_event) override;
   virtual void SendTouchEvent(
-      const TouchEventWithLatencyInfo& touch_event) OVERRIDE;
-  virtual const NativeWebKeyboardEvent* GetLastKeyboardEvent() const OVERRIDE;
-  virtual bool ShouldForwardTouchEvent() const OVERRIDE;
-  virtual void OnViewUpdated(int view_flags) OVERRIDE;
-  virtual bool HasPendingEvents() const OVERRIDE;
+      const TouchEventWithLatencyInfo& touch_event) override;
+  virtual const NativeWebKeyboardEvent* GetLastKeyboardEvent() const override;
+  virtual bool ShouldForwardTouchEvent() const override;
+  virtual void OnViewUpdated(int view_flags) override;
+  virtual bool HasPendingEvents() const override;
 
   // IPC::Listener
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
 private:
   friend class InputRouterImplTest;
 
   // TouchpadTapSuppressionControllerClient
   virtual void SendMouseEventImmediately(
-      const MouseEventWithLatencyInfo& mouse_event) OVERRIDE;
+      const MouseEventWithLatencyInfo& mouse_event) override;
 
   // TouchEventQueueClient
   virtual void SendTouchEventImmediately(
-      const TouchEventWithLatencyInfo& touch_event) OVERRIDE;
+      const TouchEventWithLatencyInfo& touch_event) override;
   virtual void OnTouchEventAck(const TouchEventWithLatencyInfo& event,
-                               InputEventAckState ack_result) OVERRIDE;
+                               InputEventAckState ack_result) override;
 
   // GetureEventFilterClient
   virtual void SendGestureEventImmediately(
-      const GestureEventWithLatencyInfo& gesture_event) OVERRIDE;
+      const GestureEventWithLatencyInfo& gesture_event) override;
   virtual void OnGestureEventAck(const GestureEventWithLatencyInfo& event,
-                                 InputEventAckState ack_result) OVERRIDE;
+                                 InputEventAckState ack_result) override;
 
   bool SendMoveCaret(scoped_ptr<IPC::Message> message);
   bool SendSelectRange(scoped_ptr<IPC::Message> message);
diff --git a/content/browser/renderer_host/input/input_router_impl_perftest.cc b/content/browser/renderer_host/input/input_router_impl_perftest.cc
index 0a8c89f..0538392 100644
--- a/content/browser/renderer_host/input/input_router_impl_perftest.cc
+++ b/content/browser/renderer_host/input/input_router_impl_perftest.cc
@@ -32,22 +32,22 @@ class NullInputAckHandler : public InputAckHandler {
 
   // InputAckHandler
   virtual void OnKeyboardEventAck(const NativeWebKeyboardEvent& event,
-                                  InputEventAckState ack_result) OVERRIDE {
+                                  InputEventAckState ack_result) override {
     ++ack_count_;
   }
   virtual void OnWheelEventAck(const MouseWheelEventWithLatencyInfo& event,
-                               InputEventAckState ack_result) OVERRIDE {
+                               InputEventAckState ack_result) override {
     ++ack_count_;
   }
   virtual void OnTouchEventAck(const TouchEventWithLatencyInfo& event,
-                               InputEventAckState ack_result) OVERRIDE {
+                               InputEventAckState ack_result) override {
     ++ack_count_;
   }
   virtual void OnGestureEventAck(const GestureEventWithLatencyInfo& event,
-                                 InputEventAckState ack_result) OVERRIDE {
+                                 InputEventAckState ack_result) override {
     ++ack_count_;
   }
-  virtual void OnUnexpectedEventAck(UnexpectedEventAckType type) OVERRIDE {
+  virtual void OnUnexpectedEventAck(UnexpectedEventAckType type) override {
     ++ack_count_;
   }
 
@@ -71,15 +71,15 @@ class NullInputRouterClient : public InputRouterClient {
   // InputRouterClient
   virtual InputEventAckState FilterInputEvent(
       const blink::WebInputEvent& input_event,
-      const ui::LatencyInfo& latency_info) OVERRIDE {
+      const ui::LatencyInfo& latency_info) override {
     return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
   }
-  virtual void IncrementInFlightEventCount() OVERRIDE {}
-  virtual void DecrementInFlightEventCount() OVERRIDE {}
-  virtual void OnHasTouchEventHandlers(bool has_handlers) OVERRIDE {}
-  virtual void DidFlush() OVERRIDE {}
-  virtual void SetNeedsFlush() OVERRIDE {}
-  virtual void DidOverscroll(const DidOverscrollParams& params) OVERRIDE {}
+  virtual void IncrementInFlightEventCount() override {}
+  virtual void DecrementInFlightEventCount() override {}
+  virtual void OnHasTouchEventHandlers(bool has_handlers) override {}
+  virtual void DidFlush() override {}
+  virtual void SetNeedsFlush() override {}
+  virtual void DidOverscroll(const DidOverscrollParams& params) override {}
 };
 
 class NullIPCSender : public IPC::Sender {
@@ -87,7 +87,7 @@ class NullIPCSender : public IPC::Sender {
   NullIPCSender() : sent_count_(0) {}
   virtual ~NullIPCSender() {}
 
-  virtual bool Send(IPC::Message* message) OVERRIDE {
+  virtual bool Send(IPC::Message* message) override {
     delete message;
     ++sent_count_;
     return true;
@@ -201,7 +201,7 @@ class InputRouterImplPerfTest : public testing::Test {
 
  protected:
   // testing::Test
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     sender_.reset(new NullIPCSender());
     client_.reset(new NullInputRouterClient());
     ack_handler_.reset(new NullInputAckHandler());
@@ -212,7 +212,7 @@ class InputRouterImplPerfTest : public testing::Test {
                                             InputRouterImpl::Config()));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     base::MessageLoop::current()->RunUntilIdle();
 
     input_router_.reset();
diff --git a/content/browser/renderer_host/input/input_router_impl_unittest.cc b/content/browser/renderer_host/input/input_router_impl_unittest.cc
index 1bed763..7326821 100644
--- a/content/browser/renderer_host/input/input_router_impl_unittest.cc
+++ b/content/browser/renderer_host/input/input_router_impl_unittest.cc
@@ -146,7 +146,7 @@ class InputRouterImplTest : public testing::Test {
 
  protected:
   // testing::Test
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     browser_context_.reset(new TestBrowserContext());
     process_.reset(new MockRenderProcessHost(browser_context_.get()));
     client_.reset(new MockInputRouterClient());
@@ -162,7 +162,7 @@ class InputRouterImplTest : public testing::Test {
     ack_handler_->set_input_router(input_router());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Process all pending tasks to avoid leaks.
     base::MessageLoop::current()->RunUntilIdle();
 
diff --git a/content/browser/renderer_host/input/mock_input_ack_handler.h b/content/browser/renderer_host/input/mock_input_ack_handler.h
index 875964a..126eaa9 100644
--- a/content/browser/renderer_host/input/mock_input_ack_handler.h
+++ b/content/browser/renderer_host/input/mock_input_ack_handler.h
@@ -19,14 +19,14 @@ class MockInputAckHandler : public InputAckHandler {
 
   // InputAckHandler
   virtual void OnKeyboardEventAck(const NativeWebKeyboardEvent& event,
-                                  InputEventAckState ack_result) OVERRIDE;
+                                  InputEventAckState ack_result) override;
   virtual void OnWheelEventAck(const MouseWheelEventWithLatencyInfo& event,
-                               InputEventAckState ack_result) OVERRIDE;
+                               InputEventAckState ack_result) override;
   virtual void OnTouchEventAck(const TouchEventWithLatencyInfo& event,
-                               InputEventAckState ack_result) OVERRIDE;
+                               InputEventAckState ack_result) override;
   virtual void OnGestureEventAck(const GestureEventWithLatencyInfo& event,
-                                 InputEventAckState ack_result) OVERRIDE;
-  virtual void OnUnexpectedEventAck(UnexpectedEventAckType type) OVERRIDE;
+                                 InputEventAckState ack_result) override;
+  virtual void OnUnexpectedEventAck(UnexpectedEventAckType type) override;
 
   size_t GetAndResetAckCount();
 
diff --git a/content/browser/renderer_host/input/mock_input_router_client.h b/content/browser/renderer_host/input/mock_input_router_client.h
index f0b3167..3eb5a25 100644
--- a/content/browser/renderer_host/input/mock_input_router_client.h
+++ b/content/browser/renderer_host/input/mock_input_router_client.h
@@ -22,13 +22,13 @@ class MockInputRouterClient : public InputRouterClient {
   // InputRouterClient
   virtual InputEventAckState FilterInputEvent(
       const blink::WebInputEvent& input_event,
-      const ui::LatencyInfo& latency_info) OVERRIDE;
-  virtual void IncrementInFlightEventCount() OVERRIDE;
-  virtual void DecrementInFlightEventCount() OVERRIDE;
-  virtual void OnHasTouchEventHandlers(bool has_handlers) OVERRIDE;
-  virtual void SetNeedsFlush() OVERRIDE;
-  virtual void DidFlush() OVERRIDE;
-  virtual void DidOverscroll(const DidOverscrollParams& params) OVERRIDE;
+      const ui::LatencyInfo& latency_info) override;
+  virtual void IncrementInFlightEventCount() override;
+  virtual void DecrementInFlightEventCount() override;
+  virtual void OnHasTouchEventHandlers(bool has_handlers) override;
+  virtual void SetNeedsFlush() override;
+  virtual void DidFlush() override;
+  virtual void DidOverscroll(const DidOverscrollParams& params) override;
 
   bool GetAndResetFilterEventCalled();
   size_t GetAndResetDidFlushCount();
diff --git a/content/browser/renderer_host/input/motion_event_android.h b/content/browser/renderer_host/input/motion_event_android.h
index 1774356..95224dc 100644
--- a/content/browser/renderer_host/input/motion_event_android.h
+++ b/content/browser/renderer_host/input/motion_event_android.h
@@ -52,34 +52,34 @@ class CONTENT_EXPORT MotionEventAndroid : public ui::MotionEvent {
   virtual ~MotionEventAndroid();
 
   // ui::MotionEvent methods.
-  virtual int GetId() const OVERRIDE;
-  virtual Action GetAction() const OVERRIDE;
-  virtual int GetActionIndex() const OVERRIDE;
-  virtual size_t GetPointerCount() const OVERRIDE;
-  virtual int GetPointerId(size_t pointer_index) const OVERRIDE;
-  virtual float GetX(size_t pointer_index) const OVERRIDE;
-  virtual float GetY(size_t pointer_index) const OVERRIDE;
-  virtual float GetRawX(size_t pointer_index) const OVERRIDE;
-  virtual float GetRawY(size_t pointer_index) const OVERRIDE;
-  virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE;
-  virtual float GetTouchMinor(size_t pointer_index) const OVERRIDE;
-  virtual float GetOrientation(size_t pointer_index) const OVERRIDE;
-  virtual float GetPressure(size_t pointer_index) const OVERRIDE;
-  virtual base::TimeTicks GetEventTime() const OVERRIDE;
-  virtual size_t GetHistorySize() const OVERRIDE;
+  virtual int GetId() const override;
+  virtual Action GetAction() const override;
+  virtual int GetActionIndex() const override;
+  virtual size_t GetPointerCount() const override;
+  virtual int GetPointerId(size_t pointer_index) const override;
+  virtual float GetX(size_t pointer_index) const override;
+  virtual float GetY(size_t pointer_index) const override;
+  virtual float GetRawX(size_t pointer_index) const override;
+  virtual float GetRawY(size_t pointer_index) const override;
+  virtual float GetTouchMajor(size_t pointer_index) const override;
+  virtual float GetTouchMinor(size_t pointer_index) const override;
+  virtual float GetOrientation(size_t pointer_index) const override;
+  virtual float GetPressure(size_t pointer_index) const override;
+  virtual base::TimeTicks GetEventTime() const override;
+  virtual size_t GetHistorySize() const override;
   virtual base::TimeTicks GetHistoricalEventTime(
-      size_t historical_index) const OVERRIDE;
+      size_t historical_index) const override;
   virtual float GetHistoricalTouchMajor(size_t pointer_index,
-                                        size_t historical_index) const OVERRIDE;
+                                        size_t historical_index) const override;
   virtual float GetHistoricalX(size_t pointer_index,
-                               size_t historical_index) const OVERRIDE;
+                               size_t historical_index) const override;
   virtual float GetHistoricalY(size_t pointer_index,
-                               size_t historical_index) const OVERRIDE;
-  virtual ToolType GetToolType(size_t pointer_index) const OVERRIDE;
-  virtual int GetButtonState() const OVERRIDE;
-  virtual int GetFlags() const OVERRIDE;
-  virtual scoped_ptr<MotionEvent> Clone() const OVERRIDE;
-  virtual scoped_ptr<MotionEvent> Cancel() const OVERRIDE;
+                               size_t historical_index) const override;
+  virtual ToolType GetToolType(size_t pointer_index) const override;
+  virtual int GetButtonState() const override;
+  virtual int GetFlags() const override;
+  virtual scoped_ptr<MotionEvent> Clone() const override;
+  virtual scoped_ptr<MotionEvent> Cancel() const override;
 
   // Additional Android MotionEvent methods.
   base::TimeTicks GetDownTime() const;
diff --git a/content/browser/renderer_host/input/motion_event_web.h b/content/browser/renderer_host/input/motion_event_web.h
index 5d61d13..4bd0be8 100644
--- a/content/browser/renderer_host/input/motion_event_web.h
+++ b/content/browser/renderer_host/input/motion_event_web.h
@@ -17,25 +17,25 @@ class MotionEventWeb : public ui::MotionEvent {
   virtual ~MotionEventWeb();
 
   // ui::MotionEvent
-  virtual int GetId() const OVERRIDE;
-  virtual Action GetAction() const OVERRIDE;
-  virtual int GetActionIndex() const OVERRIDE;
-  virtual size_t GetPointerCount() const OVERRIDE;
-  virtual int GetPointerId(size_t pointer_index) const OVERRIDE;
-  virtual float GetX(size_t pointer_index) const OVERRIDE;
-  virtual float GetY(size_t pointer_index) const OVERRIDE;
-  virtual float GetRawX(size_t pointer_index) const OVERRIDE;
-  virtual float GetRawY(size_t pointer_index) const OVERRIDE;
-  virtual float GetTouchMajor(size_t pointer_index) const OVERRIDE;
-  virtual float GetTouchMinor(size_t pointer_index) const OVERRIDE;
-  virtual float GetOrientation(size_t pointer_index) const OVERRIDE;
-  virtual float GetPressure(size_t pointer_index) const OVERRIDE;
-  virtual base::TimeTicks GetEventTime() const OVERRIDE;
-  virtual ToolType GetToolType(size_t pointer_index) const OVERRIDE;
-  virtual int GetButtonState() const OVERRIDE;
-  virtual int GetFlags() const OVERRIDE;
-  virtual scoped_ptr<MotionEvent> Clone() const OVERRIDE;
-  virtual scoped_ptr<MotionEvent> Cancel() const OVERRIDE;
+  virtual int GetId() const override;
+  virtual Action GetAction() const override;
+  virtual int GetActionIndex() const override;
+  virtual size_t GetPointerCount() const override;
+  virtual int GetPointerId(size_t pointer_index) const override;
+  virtual float GetX(size_t pointer_index) const override;
+  virtual float GetY(size_t pointer_index) const override;
+  virtual float GetRawX(size_t pointer_index) const override;
+  virtual float GetRawY(size_t pointer_index) const override;
+  virtual float GetTouchMajor(size_t pointer_index) const override;
+  virtual float GetTouchMinor(size_t pointer_index) const override;
+  virtual float GetOrientation(size_t pointer_index) const override;
+  virtual float GetPressure(size_t pointer_index) const override;
+  virtual base::TimeTicks GetEventTime() const override;
+  virtual ToolType GetToolType(size_t pointer_index) const override;
+  virtual int GetButtonState() const override;
+  virtual int GetFlags() const override;
+  virtual scoped_ptr<MotionEvent> Clone() const override;
+  virtual scoped_ptr<MotionEvent> Cancel() const override;
 
  private:
   blink::WebTouchEvent event_;
diff --git a/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc b/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc
index dceeb85..8c7beed 100644
--- a/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc
+++ b/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc
@@ -50,7 +50,7 @@ class MockSyntheticGesture : public SyntheticGesture {
   virtual ~MockSyntheticGesture() {}
 
   virtual Result ForwardInputEvents(const base::TimeTicks& timestamp,
-                                    SyntheticGestureTarget* target) OVERRIDE {
+                                    SyntheticGestureTarget* target) override {
     step_count_++;
     if (step_count_ == num_steps_) {
       *finished_ = true;
@@ -79,18 +79,18 @@ class MockSyntheticGestureTarget : public SyntheticGestureTarget {
 
   // SyntheticGestureTarget:
   virtual void DispatchInputEventToPlatform(
-      const WebInputEvent& event) OVERRIDE {}
+      const WebInputEvent& event) override {}
 
-  virtual void SetNeedsFlush() OVERRIDE {
+  virtual void SetNeedsFlush() override {
     flush_requested_ = true;
   }
 
   virtual SyntheticGestureParams::GestureSourceType
-  GetDefaultSyntheticGestureSourceType() const OVERRIDE {
+  GetDefaultSyntheticGestureSourceType() const override {
     return SyntheticGestureParams::TOUCH_INPUT;
   }
 
-  virtual base::TimeDelta PointerAssumedStoppedTime() const OVERRIDE {
+  virtual base::TimeDelta PointerAssumedStoppedTime() const override {
     return base::TimeDelta::FromMilliseconds(pointer_assumed_stopped_time_ms_);
   }
 
@@ -98,11 +98,11 @@ class MockSyntheticGestureTarget : public SyntheticGestureTarget {
     pointer_assumed_stopped_time_ms_ = time_ms;
   }
 
-  virtual float GetTouchSlopInDips() const OVERRIDE {
+  virtual float GetTouchSlopInDips() const override {
     return kTouchSlopInDips;
   }
 
-  virtual float GetMinScalingSpanInDips() const OVERRIDE {
+  virtual float GetMinScalingSpanInDips() const override {
     return kMinScalingSpanInDips;
   }
 
@@ -138,7 +138,7 @@ class MockScrollMouseTarget : public MockScrollGestureTarget {
   virtual ~MockScrollMouseTarget() {}
 
   virtual void DispatchInputEventToPlatform(
-      const WebInputEvent& event) OVERRIDE {
+      const WebInputEvent& event) override {
     ASSERT_EQ(event.type, WebInputEvent::MouseWheel);
     const WebMouseWheelEvent& mouse_wheel_event =
         static_cast<const WebMouseWheelEvent&>(event);
@@ -154,7 +154,7 @@ class MockScrollTouchTarget : public MockScrollGestureTarget {
   virtual ~MockScrollTouchTarget() {}
 
   virtual void DispatchInputEventToPlatform(
-      const WebInputEvent& event) OVERRIDE {
+      const WebInputEvent& event) override {
     ASSERT_TRUE(WebInputEvent::isTouchEventType(event.type));
     const WebTouchEvent& touch_event = static_cast<const WebTouchEvent&>(event);
     ASSERT_EQ(touch_event.touchesLength, 1U);
@@ -203,7 +203,7 @@ class MockSyntheticPinchTouchTarget : public MockSyntheticGestureTarget {
   virtual ~MockSyntheticPinchTouchTarget() {}
 
   virtual void DispatchInputEventToPlatform(
-      const WebInputEvent& event) OVERRIDE {
+      const WebInputEvent& event) override {
     ASSERT_TRUE(WebInputEvent::isTouchEventType(event.type));
     const WebTouchEvent& touch_event = static_cast<const WebTouchEvent&>(event);
     ASSERT_EQ(touch_event.touchesLength, 2U);
@@ -303,7 +303,7 @@ class MockSyntheticTapTouchTarget : public MockSyntheticTapGestureTarget {
   virtual ~MockSyntheticTapTouchTarget() {}
 
   virtual void DispatchInputEventToPlatform(
-        const WebInputEvent& event) OVERRIDE {
+        const WebInputEvent& event) override {
     ASSERT_TRUE(WebInputEvent::isTouchEventType(event.type));
     const WebTouchEvent& touch_event = static_cast<const WebTouchEvent&>(event);
     ASSERT_EQ(touch_event.touchesLength, 1U);
@@ -336,7 +336,7 @@ class MockSyntheticTapMouseTarget : public MockSyntheticTapGestureTarget {
   virtual ~MockSyntheticTapMouseTarget() {}
 
   virtual void DispatchInputEventToPlatform(
-        const WebInputEvent& event) OVERRIDE {
+        const WebInputEvent& event) override {
     ASSERT_TRUE(WebInputEvent::isMouseEventType(event.type));
     const WebMouseEvent& mouse_event = static_cast<const WebMouseEvent&>(event);
 
@@ -379,14 +379,14 @@ class SyntheticGestureControllerTest : public testing::Test {
         scoped_ptr<SyntheticGestureTarget>(target_)));
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     start_time_ = base::TimeTicks::Now();
     time_ = start_time_;
     num_success_ = 0;
     num_failure_ = 0;
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     controller_.reset();
     target_ = NULL;
     time_ = base::TimeTicks();
diff --git a/content/browser/renderer_host/input/synthetic_gesture_target_android.h b/content/browser/renderer_host/input/synthetic_gesture_target_android.h
index dcf146f..571fcbd 100644
--- a/content/browser/renderer_host/input/synthetic_gesture_target_android.h
+++ b/content/browser/renderer_host/input/synthetic_gesture_target_android.h
@@ -25,21 +25,21 @@ class SyntheticGestureTargetAndroid : public SyntheticGestureTargetBase {
   // SyntheticGestureTargetBase:
   virtual void DispatchWebTouchEventToPlatform(
       const blink::WebTouchEvent& web_touch,
-      const ui::LatencyInfo& latency_info) OVERRIDE;
+      const ui::LatencyInfo& latency_info) override;
   virtual void DispatchWebMouseWheelEventToPlatform(
       const blink::WebMouseWheelEvent& web_wheel,
-      const ui::LatencyInfo& latency_info) OVERRIDE;
+      const ui::LatencyInfo& latency_info) override;
   virtual void DispatchWebMouseEventToPlatform(
       const blink::WebMouseEvent& web_mouse,
-      const ui::LatencyInfo& latency_info) OVERRIDE;
+      const ui::LatencyInfo& latency_info) override;
 
   // SyntheticGestureTarget:
   virtual SyntheticGestureParams::GestureSourceType
-      GetDefaultSyntheticGestureSourceType() const OVERRIDE;
+      GetDefaultSyntheticGestureSourceType() const override;
 
-  virtual float GetTouchSlopInDips() const OVERRIDE;
+  virtual float GetTouchSlopInDips() const override;
 
-  virtual float GetMinScalingSpanInDips() const OVERRIDE;
+  virtual float GetMinScalingSpanInDips() const override;
 
  private:
   // Enum values below need to be kept in sync with TouchEventSynthesizer.java
diff --git a/content/browser/renderer_host/input/synthetic_gesture_target_aura.h b/content/browser/renderer_host/input/synthetic_gesture_target_aura.h
index f3634d61..61fc503 100644
--- a/content/browser/renderer_host/input/synthetic_gesture_target_aura.h
+++ b/content/browser/renderer_host/input/synthetic_gesture_target_aura.h
@@ -28,21 +28,21 @@ class SyntheticGestureTargetAura : public SyntheticGestureTargetBase {
   // SyntheticGestureTargetBase:
   virtual void DispatchWebTouchEventToPlatform(
       const blink::WebTouchEvent& web_touch,
-      const ui::LatencyInfo& latency_info) OVERRIDE;
+      const ui::LatencyInfo& latency_info) override;
   virtual void DispatchWebMouseWheelEventToPlatform(
       const blink::WebMouseWheelEvent& web_wheel,
-      const ui::LatencyInfo& latency_info) OVERRIDE;
+      const ui::LatencyInfo& latency_info) override;
   virtual void DispatchWebMouseEventToPlatform(
       const blink::WebMouseEvent& web_mouse,
-      const ui::LatencyInfo& latency_info) OVERRIDE;
+      const ui::LatencyInfo& latency_info) override;
 
   // SyntheticGestureTarget:
   virtual SyntheticGestureParams::GestureSourceType
-      GetDefaultSyntheticGestureSourceType() const OVERRIDE;
+      GetDefaultSyntheticGestureSourceType() const override;
 
-  virtual float GetTouchSlopInDips() const OVERRIDE;
+  virtual float GetTouchSlopInDips() const override;
 
-  virtual float GetMinScalingSpanInDips() const OVERRIDE;
+  virtual float GetMinScalingSpanInDips() const override;
 
  private:
   aura::Window* GetWindow() const;
diff --git a/content/browser/renderer_host/input/synthetic_gesture_target_base.h b/content/browser/renderer_host/input/synthetic_gesture_target_base.h
index a66a8d3..a95c5d4 100644
--- a/content/browser/renderer_host/input/synthetic_gesture_target_base.h
+++ b/content/browser/renderer_host/input/synthetic_gesture_target_base.h
@@ -41,18 +41,18 @@ class SyntheticGestureTargetBase : public SyntheticGestureTarget {
 
   // SyntheticGestureTarget:
   virtual void DispatchInputEventToPlatform(
-    const blink::WebInputEvent& event) OVERRIDE;
+    const blink::WebInputEvent& event) override;
 
-  virtual void SetNeedsFlush() OVERRIDE;
+  virtual void SetNeedsFlush() override;
 
   virtual SyntheticGestureParams::GestureSourceType
-      GetDefaultSyntheticGestureSourceType() const OVERRIDE;
+      GetDefaultSyntheticGestureSourceType() const override;
 
-  virtual base::TimeDelta PointerAssumedStoppedTime() const OVERRIDE;
+  virtual base::TimeDelta PointerAssumedStoppedTime() const override;
 
-  virtual float GetTouchSlopInDips() const OVERRIDE;
+  virtual float GetTouchSlopInDips() const override;
 
-  virtual float GetMinScalingSpanInDips() const OVERRIDE;
+  virtual float GetMinScalingSpanInDips() const override;
 
  protected:
   RenderWidgetHostImpl* render_widget_host() const { return host_; }
diff --git a/content/browser/renderer_host/input/synthetic_pinch_gesture.h b/content/browser/renderer_host/input/synthetic_pinch_gesture.h
index 76ee1da..60530c1 100644
--- a/content/browser/renderer_host/input/synthetic_pinch_gesture.h
+++ b/content/browser/renderer_host/input/synthetic_pinch_gesture.h
@@ -22,7 +22,7 @@ class CONTENT_EXPORT SyntheticPinchGesture : public SyntheticGesture {
 
   virtual SyntheticGesture::Result ForwardInputEvents(
       const base::TimeTicks& timestamp,
-      SyntheticGestureTarget* target) OVERRIDE;
+      SyntheticGestureTarget* target) override;
 
  private:
   enum GestureState {
diff --git a/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.h b/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.h
index a407855..5940f9a 100644
--- a/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.h
+++ b/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.h
@@ -32,7 +32,7 @@ class CONTENT_EXPORT SyntheticSmoothScrollGesture : public SyntheticGesture {
 
   virtual SyntheticGesture::Result ForwardInputEvents(
       const base::TimeTicks& timestamp,
-      SyntheticGestureTarget* target) OVERRIDE;
+      SyntheticGestureTarget* target) override;
 
  private:
   enum GestureState {
diff --git a/content/browser/renderer_host/input/synthetic_tap_gesture.h b/content/browser/renderer_host/input/synthetic_tap_gesture.h
index e67d198..b73f861 100644
--- a/content/browser/renderer_host/input/synthetic_tap_gesture.h
+++ b/content/browser/renderer_host/input/synthetic_tap_gesture.h
@@ -20,7 +20,7 @@ class CONTENT_EXPORT SyntheticTapGesture : public SyntheticGesture {
 
   virtual SyntheticGesture::Result ForwardInputEvents(
       const base::TimeTicks& timestamp,
-      SyntheticGestureTarget* target) OVERRIDE;
+      SyntheticGestureTarget* target) override;
 
  private:
   enum GestureState {
diff --git a/content/browser/renderer_host/input/tap_suppression_controller_unittest.cc b/content/browser/renderer_host/input/tap_suppression_controller_unittest.cc
index 702dc6f..cbe1521 100644
--- a/content/browser/renderer_host/input/tap_suppression_controller_unittest.cc
+++ b/content/browser/renderer_host/input/tap_suppression_controller_unittest.cc
@@ -89,26 +89,26 @@ class MockTapSuppressionController : public TapSuppressionController,
   int last_actions() { return last_actions_; }
 
  protected:
-  virtual base::TimeTicks Now() OVERRIDE {
+  virtual base::TimeTicks Now() override {
     return time_;
   }
 
-  virtual void StartTapDownTimer(const base::TimeDelta& delay) OVERRIDE {
+  virtual void StartTapDownTimer(const base::TimeDelta& delay) override {
     timer_expiry_time_ = time_ + delay;
     timer_started_ = true;
   }
 
-  virtual void StopTapDownTimer() OVERRIDE {
+  virtual void StopTapDownTimer() override {
     timer_started_ = false;
   }
 
  private:
   // TapSuppressionControllerClient implementation
-  virtual void DropStashedTapDown() OVERRIDE {
+  virtual void DropStashedTapDown() override {
     last_actions_ |= TAP_DOWN_DROPPED;
   }
 
-  virtual void ForwardStashedTapDown() OVERRIDE {
+  virtual void ForwardStashedTapDown() override {
     last_actions_ |= STASHED_TAP_DOWN_FORWARDED;
   }
 
diff --git a/content/browser/renderer_host/input/touch_action_browsertest.cc b/content/browser/renderer_host/input/touch_action_browsertest.cc
index b9749e5..797d3a9 100644
--- a/content/browser/renderer_host/input/touch_action_browsertest.cc
+++ b/content/browser/renderer_host/input/touch_action_browsertest.cc
@@ -97,7 +97,7 @@ class TouchActionBrowserTest : public ContentBrowserTest {
   }
 
   // ContentBrowserTest:
-  virtual void SetUpCommandLine(CommandLine* cmd) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* cmd) override {
     cmd->AppendSwitchASCII(switches::kTouchEvents,
                            switches::kTouchEventsEnabled);
     // TODO(rbyers): Remove this switch once touch-action ships.
diff --git a/content/browser/renderer_host/input/touch_emulator.h b/content/browser/renderer_host/input/touch_emulator.h
index 467dbda..7cadc52 100644
--- a/content/browser/renderer_host/input/touch_emulator.h
+++ b/content/browser/renderer_host/input/touch_emulator.h
@@ -45,7 +45,7 @@ class CONTENT_EXPORT TouchEmulator : public ui::GestureProviderClient {
 
  private:
   // ui::GestureProviderClient implementation.
-  virtual void OnGestureEvent(const ui::GestureEventData& gesture) OVERRIDE;
+  virtual void OnGestureEvent(const ui::GestureEventData& gesture) override;
 
   // Returns cursor size in DIP.
   gfx::SizeF InitCursorFromResource(
diff --git a/content/browser/renderer_host/input/touch_emulator_unittest.cc b/content/browser/renderer_host/input/touch_emulator_unittest.cc
index d91b1b5..498da56 100644
--- a/content/browser/renderer_host/input/touch_emulator_unittest.cc
+++ b/content/browser/renderer_host/input/touch_emulator_unittest.cc
@@ -46,7 +46,7 @@ class TouchEmulatorTest : public testing::Test,
   virtual ~TouchEmulatorTest() {}
 
   // testing::Test
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
 #if defined(USE_AURA)
     aura::Env::CreateInstance(true);
     screen_.reset(aura::TestScreen::Create(gfx::Size()));
@@ -57,7 +57,7 @@ class TouchEmulatorTest : public testing::Test,
     emulator_->Enable();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     emulator_->Disable();
     EXPECT_EQ("", ExpectedEvents());
 
@@ -68,12 +68,12 @@ class TouchEmulatorTest : public testing::Test,
   }
 
   virtual void ForwardGestureEvent(
-      const blink::WebGestureEvent& event) OVERRIDE {
+      const blink::WebGestureEvent& event) override {
     forwarded_events_.push_back(event.type);
   }
 
   virtual void ForwardEmulatedTouchEvent(
-      const blink::WebTouchEvent& event) OVERRIDE {
+      const blink::WebTouchEvent& event) override {
     forwarded_events_.push_back(event.type);
     EXPECT_EQ(1U, event.touchesLength);
     EXPECT_EQ(last_mouse_x_, event.touches[0].position.x);
@@ -86,9 +86,9 @@ class TouchEmulatorTest : public testing::Test,
     }
   }
 
-  virtual void SetCursor(const WebCursor& cursor) OVERRIDE {}
+  virtual void SetCursor(const WebCursor& cursor) override {}
 
-  virtual void ShowContextMenuAtPoint(const gfx::Point& point) OVERRIDE {}
+  virtual void ShowContextMenuAtPoint(const gfx::Point& point) override {}
 
  protected:
   TouchEmulator* emulator() const {
diff --git a/content/browser/renderer_host/input/touch_event_queue_unittest.cc b/content/browser/renderer_host/input/touch_event_queue_unittest.cc
index 88b6036..5e6f195 100644
--- a/content/browser/renderer_host/input/touch_event_queue_unittest.cc
+++ b/content/browser/renderer_host/input/touch_event_queue_unittest.cc
@@ -40,15 +40,15 @@ class TouchEventQueueTest : public testing::Test,
   virtual ~TouchEventQueueTest() {}
 
   // testing::Test
-  virtual void SetUp() OVERRIDE { ResetQueueWithConfig(CreateConfig()); }
+  virtual void SetUp() override { ResetQueueWithConfig(CreateConfig()); }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     queue_.reset();
   }
 
   // TouchEventQueueClient
   virtual void SendTouchEventImmediately(
-      const TouchEventWithLatencyInfo& event) OVERRIDE {
+      const TouchEventWithLatencyInfo& event) override {
     ++sent_event_count_;
     last_sent_event_ = event.event;
     if (sync_ack_result_) {
@@ -59,7 +59,7 @@ class TouchEventQueueTest : public testing::Test,
 
   virtual void OnTouchEventAck(
       const TouchEventWithLatencyInfo& event,
-      InputEventAckState ack_result) OVERRIDE {
+      InputEventAckState ack_result) override {
     ++acked_event_count_;
     last_acked_event_ = event.event;
     last_acked_event_state_ = ack_result;
diff --git a/content/browser/renderer_host/input/touch_handle_unittest.cc b/content/browser/renderer_host/input/touch_handle_unittest.cc
index b5dd2a2..03903c3 100644
--- a/content/browser/renderer_host/input/touch_handle_unittest.cc
+++ b/content/browser/renderer_host/input/touch_handle_unittest.cc
@@ -36,22 +36,22 @@ class MockTouchHandleDrawable : public TouchHandleDrawable {
   explicit MockTouchHandleDrawable(MockDrawableData* data) : data_(data) {}
   virtual ~MockTouchHandleDrawable() {}
 
-  virtual void SetEnabled(bool enabled) OVERRIDE { data_->enabled = enabled; }
+  virtual void SetEnabled(bool enabled) override { data_->enabled = enabled; }
 
-  virtual void SetOrientation(TouchHandleOrientation orientation) OVERRIDE {
+  virtual void SetOrientation(TouchHandleOrientation orientation) override {
     data_->orientation = orientation;
   }
 
-  virtual void SetAlpha(float alpha) OVERRIDE { data_->alpha = alpha; }
+  virtual void SetAlpha(float alpha) override { data_->alpha = alpha; }
 
-  virtual void SetFocus(const gfx::PointF& position) OVERRIDE {
+  virtual void SetFocus(const gfx::PointF& position) override {
     // Anchor focus to the top left of the rect (regardless of orientation).
     data_->rect.set_origin(position);
   }
 
-  virtual void SetVisible(bool visible) OVERRIDE { data_->visible = visible; }
+  virtual void SetVisible(bool visible) override { data_->visible = visible; }
 
-  virtual bool IntersectsWith(const gfx::RectF& rect) const OVERRIDE {
+  virtual bool IntersectsWith(const gfx::RectF& rect) const override {
     return data_->rect.Intersects(rect);
   }
 
@@ -72,36 +72,36 @@ class TouchHandleTest : public testing::Test, public TouchHandleClient {
   virtual ~TouchHandleTest() {}
 
   // TouchHandleClient implementation.
-  virtual void OnHandleDragBegin(const TouchHandle& handle) OVERRIDE {
+  virtual void OnHandleDragBegin(const TouchHandle& handle) override {
     dragging_ = true;
   }
 
   virtual void OnHandleDragUpdate(const TouchHandle& handle,
-                                  const gfx::PointF& new_position) OVERRIDE {
+                                  const gfx::PointF& new_position) override {
     dragged_ = true;
     drag_position_ = new_position;
   }
 
-  virtual void OnHandleDragEnd(const TouchHandle& handle) OVERRIDE {
+  virtual void OnHandleDragEnd(const TouchHandle& handle) override {
     dragging_ = false;
   }
 
-  virtual void OnHandleTapped(const TouchHandle& handle) OVERRIDE {
+  virtual void OnHandleTapped(const TouchHandle& handle) override {
     tapped_ = true;
   }
 
-  virtual void SetNeedsAnimate() OVERRIDE { needs_animate_ = true; }
+  virtual void SetNeedsAnimate() override { needs_animate_ = true; }
 
-  virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() OVERRIDE {
+  virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() override {
     return scoped_ptr<TouchHandleDrawable>(
         new MockTouchHandleDrawable(&drawable_data_));
   }
 
-  virtual base::TimeDelta GetTapTimeout() const OVERRIDE {
+  virtual base::TimeDelta GetTapTimeout() const override {
     return base::TimeDelta::FromMilliseconds(kDefaultTapTimeoutMs);
   }
 
-  virtual float GetTapSlop() const OVERRIDE { return kDefaultTapSlop; }
+  virtual float GetTapSlop() const override { return kDefaultTapSlop; }
 
   void Animate(TouchHandle& handle) {
     needs_animate_ = false;
diff --git a/content/browser/renderer_host/input/touch_input_browsertest.cc b/content/browser/renderer_host/input/touch_input_browsertest.cc
index 21254fe..e25b6be 100644
--- a/content/browser/renderer_host/input/touch_input_browsertest.cc
+++ b/content/browser/renderer_host/input/touch_input_browsertest.cc
@@ -108,7 +108,7 @@ class InputEventMessageFilter : public BrowserMessageFilter {
   }
 
   // BrowserMessageFilter:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& message) override {
     if (message.type() == InputHostMsg_HandleInputEvent_ACK::ID) {
       InputHostMsg_HandleInputEvent_ACK::Param params;
       InputHostMsg_HandleInputEvent_ACK::Read(&message, &params);
@@ -159,7 +159,7 @@ class TouchInputBrowserTest : public ContentBrowserTest {
     host->GetProcess()->AddFilter(filter_.get());
   }
 
-  virtual void SetUpCommandLine(CommandLine* cmd) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* cmd) override {
     cmd->AppendSwitchASCII(switches::kTouchEvents,
                            switches::kTouchEventsEnabled);
   }
diff --git a/content/browser/renderer_host/input/touch_selection_controller.h b/content/browser/renderer_host/input/touch_selection_controller.h
index 13031e1..4e33594 100644
--- a/content/browser/renderer_host/input/touch_selection_controller.h
+++ b/content/browser/renderer_host/input/touch_selection_controller.h
@@ -86,15 +86,15 @@ class CONTENT_EXPORT TouchSelectionController : public TouchHandleClient {
   enum InputEventType { TAP, LONG_PRESS, INPUT_EVENT_TYPE_NONE };
 
   // TouchHandleClient implementation.
-  virtual void OnHandleDragBegin(const TouchHandle& handle) OVERRIDE;
+  virtual void OnHandleDragBegin(const TouchHandle& handle) override;
   virtual void OnHandleDragUpdate(const TouchHandle& handle,
-                                  const gfx::PointF& new_position) OVERRIDE;
-  virtual void OnHandleDragEnd(const TouchHandle& handle) OVERRIDE;
-  virtual void OnHandleTapped(const TouchHandle& handle) OVERRIDE;
-  virtual void SetNeedsAnimate() OVERRIDE;
-  virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() OVERRIDE;
-  virtual base::TimeDelta GetTapTimeout() const OVERRIDE;
-  virtual float GetTapSlop() const OVERRIDE;
+                                  const gfx::PointF& new_position) override;
+  virtual void OnHandleDragEnd(const TouchHandle& handle) override;
+  virtual void OnHandleTapped(const TouchHandle& handle) override;
+  virtual void SetNeedsAnimate() override;
+  virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() override;
+  virtual base::TimeDelta GetTapTimeout() const override;
+  virtual float GetTapSlop() const override;
 
   void ShowInsertionHandleAutomatically();
   void ShowSelectionHandlesAutomatically();
diff --git a/content/browser/renderer_host/input/touch_selection_controller_unittest.cc b/content/browser/renderer_host/input/touch_selection_controller_unittest.cc
index 5bdf572..1ffd384 100644
--- a/content/browser/renderer_host/input/touch_selection_controller_unittest.cc
+++ b/content/browser/renderer_host/input/touch_selection_controller_unittest.cc
@@ -20,12 +20,12 @@ class MockTouchHandleDrawable : public TouchHandleDrawable {
   explicit MockTouchHandleDrawable(bool* contains_point)
       : intersects_rect_(contains_point) {}
   virtual ~MockTouchHandleDrawable() {}
-  virtual void SetEnabled(bool enabled) OVERRIDE {}
-  virtual void SetOrientation(TouchHandleOrientation orientation) OVERRIDE {}
-  virtual void SetAlpha(float alpha) OVERRIDE {}
-  virtual void SetFocus(const gfx::PointF& position) OVERRIDE {}
-  virtual void SetVisible(bool visible) OVERRIDE {}
-  virtual bool IntersectsWith(const gfx::RectF& rect) const OVERRIDE {
+  virtual void SetEnabled(bool enabled) override {}
+  virtual void SetOrientation(TouchHandleOrientation orientation) override {}
+  virtual void SetAlpha(float alpha) override {}
+  virtual void SetFocus(const gfx::PointF& position) override {}
+  virtual void SetVisible(bool visible) override {}
+  virtual bool IntersectsWith(const gfx::RectF& rect) const override {
     return *intersects_rect_;
   }
 
@@ -49,40 +49,40 @@ class TouchSelectionControllerTest : public testing::Test,
   virtual ~TouchSelectionControllerTest() {}
 
   // testing::Test implementation.
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     controller_.reset(new TouchSelectionController(
         this,
         base::TimeDelta::FromMilliseconds(kDefaultTapTimeoutMs),
         kDefaulTapSlop));
   }
 
-  virtual void TearDown() OVERRIDE { controller_.reset(); }
+  virtual void TearDown() override { controller_.reset(); }
 
   // TouchSelectionControllerClient implementation.
 
-  virtual bool SupportsAnimation() const OVERRIDE { return animation_enabled_; }
+  virtual bool SupportsAnimation() const override { return animation_enabled_; }
 
-  virtual void SetNeedsAnimate() OVERRIDE { needs_animate_ = true; }
+  virtual void SetNeedsAnimate() override { needs_animate_ = true; }
 
-  virtual void MoveCaret(const gfx::PointF& position) OVERRIDE {
+  virtual void MoveCaret(const gfx::PointF& position) override {
     caret_moved_ = true;
     caret_position_ = position;
   }
 
   virtual void SelectBetweenCoordinates(const gfx::PointF& start,
-                                        const gfx::PointF& end) OVERRIDE {
+                                        const gfx::PointF& end) override {
     selection_moved_ = true;
     selection_start_ = start;
     selection_end_ = end;
   }
 
   virtual void OnSelectionEvent(SelectionEventType event,
-                                const gfx::PointF& end_position) OVERRIDE {
+                                const gfx::PointF& end_position) override {
     last_event_ = event;
     last_event_start_ = end_position;
   }
 
-  virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() OVERRIDE {
+  virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() override {
     return scoped_ptr<TouchHandleDrawable>(
         new MockTouchHandleDrawable(&dragging_enabled_));
   }
diff --git a/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h b/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h
index da74dfd..6f93f1d 100644
--- a/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h
+++ b/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h
@@ -52,8 +52,8 @@ class TouchpadTapSuppressionController : public TapSuppressionControllerClient {
   friend class MockRenderWidgetHost;
 
   // TapSuppressionControllerClient implementation.
-  virtual void DropStashedTapDown() OVERRIDE;
-  virtual void ForwardStashedTapDown() OVERRIDE;
+  virtual void DropStashedTapDown() override;
+  virtual void ForwardStashedTapDown() override;
 
   TouchpadTapSuppressionControllerClient* client_;
   MouseEventWithLatencyInfo stashed_mouse_down_;
diff --git a/content/browser/renderer_host/input/touchscreen_tap_suppression_controller.h b/content/browser/renderer_host/input/touchscreen_tap_suppression_controller.h
index 706e9d8..2b3e21d 100644
--- a/content/browser/renderer_host/input/touchscreen_tap_suppression_controller.h
+++ b/content/browser/renderer_host/input/touchscreen_tap_suppression_controller.h
@@ -37,8 +37,8 @@ class TouchscreenTapSuppressionController
 
  private:
   // TapSuppressionControllerClient implementation.
-  virtual void DropStashedTapDown() OVERRIDE;
-  virtual void ForwardStashedTapDown() OVERRIDE;
+  virtual void DropStashedTapDown() override;
+  virtual void ForwardStashedTapDown() override;
 
   GestureEventQueue* gesture_event_queue_;
 
diff --git a/content/browser/renderer_host/legacy_render_widget_host_win.h b/content/browser/renderer_host/legacy_render_widget_host_win.h
index a7b9639..a78de28 100644
--- a/content/browser/renderer_host/legacy_render_widget_host_win.h
+++ b/content/browser/renderer_host/legacy_render_widget_host_win.h
@@ -107,7 +107,7 @@ class CONTENT_EXPORT LegacyRenderWidgetHostHWND
   }
 
  protected:
-  virtual void OnFinalMessage(HWND hwnd) OVERRIDE;
+  virtual void OnFinalMessage(HWND hwnd) override;
 
  private:
   LegacyRenderWidgetHostHWND(HWND parent);
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 8a5ba56..b744603 100644
--- a/content/browser/renderer_host/media/audio_input_device_manager.h
+++ b/content/browser/renderer_host/media/audio_input_device_manager.h
@@ -47,11 +47,11 @@ class CONTENT_EXPORT AudioInputDeviceManager : public MediaStreamProvider {
   // MediaStreamProvider implementation, called on IO thread.
   virtual void Register(MediaStreamProviderListener* listener,
                         const scoped_refptr<base::SingleThreadTaskRunner>&
-                            device_task_runner) OVERRIDE;
-  virtual void Unregister() OVERRIDE;
-  virtual void EnumerateDevices(MediaStreamType stream_type) OVERRIDE;
-  virtual int Open(const StreamDeviceInfo& device) OVERRIDE;
-  virtual void Close(int session_id) OVERRIDE;
+                            device_task_runner) override;
+  virtual void Unregister() override;
+  virtual void EnumerateDevices(MediaStreamType stream_type) override;
+  virtual int Open(const StreamDeviceInfo& device) override;
+  virtual void Close(int session_id) override;
 
   void UseFakeDevice();
   bool ShouldUseFakeDevice() const;
diff --git a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
index c2963ee..18052e1 100644
--- a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
+++ b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
@@ -55,7 +55,7 @@ class MAYBE_AudioInputDeviceManagerTest : public testing::Test {
   MAYBE_AudioInputDeviceManagerTest() {}
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // The test must run on Browser::IO.
     message_loop_.reset(new base::MessageLoopForIO);
     io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
@@ -84,7 +84,7 @@ class MAYBE_AudioInputDeviceManagerTest : public testing::Test {
     message_loop_->RunUntilIdle();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     manager_->Unregister();
     io_thread_.reset();
   }
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 50130b8..43dd3bb 100644
--- a/content/browser/renderer_host/media/audio_input_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_input_renderer_host.h
@@ -107,19 +107,19 @@ class CONTENT_EXPORT AudioInputRendererHost
                          media::UserInputMonitor* user_input_monitor);
 
   // BrowserMessageFilter implementation.
-  virtual void OnChannelClosing() OVERRIDE;
-  virtual void OnDestruct() const OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnChannelClosing() override;
+  virtual void OnDestruct() const override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // AudioInputController::EventHandler implementation.
-  virtual void OnCreated(media::AudioInputController* controller) OVERRIDE;
-  virtual void OnRecording(media::AudioInputController* controller) OVERRIDE;
+  virtual void OnCreated(media::AudioInputController* controller) override;
+  virtual void OnRecording(media::AudioInputController* controller) override;
   virtual void OnError(media::AudioInputController* controller,
-      media::AudioInputController::ErrorCode error_code) OVERRIDE;
+      media::AudioInputController::ErrorCode error_code) override;
   virtual void OnData(media::AudioInputController* controller,
-                      const media::AudioBus* data) OVERRIDE;
+                      const media::AudioBus* data) override;
   virtual void OnLog(media::AudioInputController* controller,
-                     const std::string& message) OVERRIDE;
+                     const std::string& message) 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 e7b39cd..65e8622 100644
--- a/content/browser/renderer_host/media/audio_input_sync_writer.h
+++ b/content/browser/renderer_host/media/audio_input_sync_writer.h
@@ -35,11 +35,11 @@ class AudioInputSyncWriter : public media::AudioInputController::SyncWriter {
   virtual ~AudioInputSyncWriter();
 
   // media::AudioInputController::SyncWriter implementation.
-  virtual void UpdateRecordedBytes(uint32 bytes) OVERRIDE;
+  virtual void UpdateRecordedBytes(uint32 bytes) override;
   virtual void Write(const media::AudioBus* data,
                      double volume,
-                     bool key_pressed) OVERRIDE;
-  virtual void Close() OVERRIDE;
+                     bool key_pressed) override;
+  virtual void Close() override;
 
   bool Init();
   bool PrepareForeignSocket(base::ProcessHandle process_handle,
diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc
index 8c06395..5952329 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.cc
+++ b/content/browser/renderer_host/media/audio_renderer_host.cc
@@ -67,12 +67,12 @@ class AudioRendererHost::AudioEntry
 
  private:
   // media::AudioOutputController::EventHandler implementation.
-  virtual void OnCreated() OVERRIDE;
-  virtual void OnPlaying() OVERRIDE;
-  virtual void OnPaused() OVERRIDE;
-  virtual void OnError() OVERRIDE;
+  virtual void OnCreated() override;
+  virtual void OnPlaying() override;
+  virtual void OnPaused() override;
+  virtual void OnError() override;
   virtual void OnDeviceChange(int new_buffer_size, int new_sample_rate)
-      OVERRIDE;
+      override;
 
   AudioRendererHost* const host_;
   const int stream_id_;
diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h
index 38317ef..f4be17f 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_renderer_host.h
@@ -81,9 +81,9 @@ class CONTENT_EXPORT AudioRendererHost : public BrowserMessageFilter {
       const RenderViewHost::GetAudioOutputControllersCallback& callback) const;
 
   // BrowserMessageFilter implementation.
-  virtual void OnChannelClosing() OVERRIDE;
-  virtual void OnDestruct() const OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnChannelClosing() override;
+  virtual void OnDestruct() const override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // Returns true if any streams managed by this host are actively playing.  Can
   // be called from any thread.
diff --git a/content/browser/renderer_host/media/audio_sync_reader.h b/content/browser/renderer_host/media/audio_sync_reader.h
index 63cffac..0a563cd 100644
--- a/content/browser/renderer_host/media/audio_sync_reader.h
+++ b/content/browser/renderer_host/media/audio_sync_reader.h
@@ -34,9 +34,9 @@ class AudioSyncReader : public media::AudioOutputController::SyncReader {
   virtual ~AudioSyncReader();
 
   // media::AudioOutputController::SyncReader implementations.
-  virtual void UpdatePendingBytes(uint32 bytes) OVERRIDE;
-  virtual void Read(media::AudioBus* dest) OVERRIDE;
-  virtual void Close() OVERRIDE;
+  virtual void UpdatePendingBytes(uint32 bytes) override;
+  virtual void Read(media::AudioBus* dest) override;
+  virtual void Close() override;
 
   bool Init();
   bool PrepareForeignSocket(base::ProcessHandle process_handle,
diff --git a/content/browser/renderer_host/media/device_request_message_filter.h b/content/browser/renderer_host/media/device_request_message_filter.h
index 4bf30aa..9e3c66b 100644
--- a/content/browser/renderer_host/media/device_request_message_filter.h
+++ b/content/browser/renderer_host/media/device_request_message_filter.h
@@ -34,27 +34,27 @@ class CONTENT_EXPORT DeviceRequestMessageFilter : public BrowserMessageFilter,
   virtual void StreamGenerated(
       int render_frame_id, int page_request_id, const std::string& label,
       const StreamDeviceInfoArray& audio_devices,
-      const StreamDeviceInfoArray& video_devices) OVERRIDE {}
+      const StreamDeviceInfoArray& video_devices) override {}
   virtual void StreamGenerationFailed(
       int render_frame_id,
       int page_request_id,
-      content::MediaStreamRequestResult result) OVERRIDE {}
+      content::MediaStreamRequestResult result) override {}
   virtual void DeviceStopped(int render_frame_id,
                              const std::string& label,
-                             const StreamDeviceInfo& device) OVERRIDE {}
+                             const StreamDeviceInfo& device) override {}
   virtual void DeviceOpened(int render_frame_id,
                             int page_request_id,
                             const std::string& label,
-                            const StreamDeviceInfo& video_device) OVERRIDE {}
+                            const StreamDeviceInfo& video_device) override {}
   // DevicesEnumerated() is the only callback we're interested in.
   virtual void DevicesEnumerated(int render_frame_id,
                                  int page_request_id,
                                  const std::string& label,
-                                 const StreamDeviceInfoArray& devices) OVERRIDE;
+                                 const StreamDeviceInfoArray& devices) override;
 
   // BrowserMessageFilter implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnChannelClosing() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnChannelClosing() override;
 
  protected:
   virtual ~DeviceRequestMessageFilter();
diff --git a/content/browser/renderer_host/media/device_request_message_filter_unittest.cc b/content/browser/renderer_host/media/device_request_message_filter_unittest.cc
index 0b1c45b..e40f8f8 100644
--- a/content/browser/renderer_host/media/device_request_message_filter_unittest.cc
+++ b/content/browser/renderer_host/media/device_request_message_filter_unittest.cc
@@ -62,7 +62,7 @@ class MockDeviceRequestMessageFilter : public DeviceRequestMessageFilter {
 
   // Override the Send() method to intercept the message that we're sending to
   // the renderer.
-  virtual bool Send(IPC::Message* reply_msg) OVERRIDE {
+  virtual bool Send(IPC::Message* reply_msg) override {
     CHECK(reply_msg);
 
     bool handled = true;
@@ -121,7 +121,7 @@ class DeviceRequestMessageFilterTest : public testing::Test {
  protected:
   virtual ~DeviceRequestMessageFilterTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     message_loop_.reset(new base::MessageLoopForIO);
     io_thread_.reset(
         new TestBrowserThread(BrowserThread::IO, message_loop_.get()));
diff --git a/content/browser/renderer_host/media/media_capture_devices_impl.h b/content/browser/renderer_host/media/media_capture_devices_impl.h
index 078f659..8fefa4d 100644
--- a/content/browser/renderer_host/media/media_capture_devices_impl.h
+++ b/content/browser/renderer_host/media/media_capture_devices_impl.h
@@ -15,8 +15,8 @@ class MediaCaptureDevicesImpl : public MediaCaptureDevices {
   static MediaCaptureDevicesImpl* GetInstance();
 
   // Overriden from MediaCaptureDevices
-  virtual const MediaStreamDevices& GetAudioCaptureDevices() OVERRIDE;
-  virtual const MediaStreamDevices& GetVideoCaptureDevices() OVERRIDE;
+  virtual const MediaStreamDevices& GetAudioCaptureDevices() override;
+  virtual const MediaStreamDevices& GetVideoCaptureDevices() override;
 
   // Called by MediaStreamManager to notify the change of media capture
   // devices, these 2 methods are called in IO thread.
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 a1dd74a..87c95d4 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.h
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.h
@@ -38,26 +38,26 @@ class CONTENT_EXPORT MediaStreamDispatcherHost : public BrowserMessageFilter,
       int page_request_id,
       const std::string& label,
       const StreamDeviceInfoArray& audio_devices,
-      const StreamDeviceInfoArray& video_devices) OVERRIDE;
+      const StreamDeviceInfoArray& video_devices) override;
   virtual void StreamGenerationFailed(
       int render_frame_id,
       int page_request_id,
-      content::MediaStreamRequestResult result) OVERRIDE;
+      content::MediaStreamRequestResult result) override;
   virtual void DeviceStopped(int render_frame_id,
                              const std::string& label,
-                             const StreamDeviceInfo& device) OVERRIDE;
+                             const StreamDeviceInfo& device) override;
   virtual void DevicesEnumerated(int render_frame_id,
                                  int page_request_id,
                                  const std::string& label,
-                                 const StreamDeviceInfoArray& devices) OVERRIDE;
+                                 const StreamDeviceInfoArray& devices) override;
   virtual void DeviceOpened(int render_frame_id,
                             int page_request_id,
                             const std::string& label,
-                            const StreamDeviceInfo& video_device) OVERRIDE;
+                            const StreamDeviceInfo& video_device) override;
 
   // BrowserMessageFilter implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnChannelClosing() OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnChannelClosing() override;
 
  protected:
   virtual ~MediaStreamDispatcherHost();
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
index 3418500..0ecc973 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
@@ -120,7 +120,7 @@ class MockMediaStreamDispatcherHost : public MediaStreamDispatcherHost,
   // This method is used to dispatch IPC messages to the renderer. We intercept
   // these messages here and dispatch to our mock methods to verify the
   // conversation between this object and the renderer.
-  virtual bool Send(IPC::Message* message) OVERRIDE {
+  virtual bool Send(IPC::Message* message) override {
     CHECK(message);
     current_ipc_ = message;
 
@@ -260,7 +260,7 @@ class MediaStreamDispatcherHostTest : public testing::Test {
 #endif
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     video_capture_device_factory_->GetDeviceNames(&physical_video_devices_);
     ASSERT_GT(physical_video_devices_.size(), 0u);
 
@@ -269,7 +269,7 @@ class MediaStreamDispatcherHostTest : public testing::Test {
     ASSERT_GT(physical_audio_devices_.size(), 0u);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     host_->OnChannelClosing();
   }
 
diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
index e23c73b..d5dbf9f 100644
--- a/content/browser/renderer_host/media/media_stream_manager.h
+++ b/content/browser/renderer_host/media/media_stream_manager.h
@@ -166,17 +166,17 @@ class CONTENT_EXPORT MediaStreamManager
 
   // Implements MediaStreamProviderListener.
   virtual void Opened(MediaStreamType stream_type,
-                      int capture_session_id) OVERRIDE;
+                      int capture_session_id) override;
   virtual void Closed(MediaStreamType stream_type,
-                      int capture_session_id) OVERRIDE;
+                      int capture_session_id) override;
   virtual void DevicesEnumerated(MediaStreamType stream_type,
-                                 const StreamDeviceInfoArray& devices) OVERRIDE;
+                                 const StreamDeviceInfoArray& devices) override;
   virtual void Aborted(MediaStreamType stream_type,
-                       int capture_session_id) OVERRIDE;
+                       int capture_session_id) override;
 
   // Implements base::SystemMonitor::DevicesChangedObserver.
   virtual void OnDevicesChanged(
-      base::SystemMonitor::DeviceType device_type) OVERRIDE;
+      base::SystemMonitor::DeviceType device_type) override;
 
   // Called by the tests to specify a fake UI that should be used for next
   // generated stream (or when using --use-fake-ui-for-media-stream).
@@ -195,7 +195,7 @@ class CONTENT_EXPORT MediaStreamManager
   // But for some tests which use TestBrowserThreadBundle, we need to call
   // WillDestroyCurrentMessageLoop explicitly because the notification happens
   // too late. (see http://crbug.com/247525#c14).
-  virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
+  virtual void WillDestroyCurrentMessageLoop() override;
 
   // Sends log messages to the render process hosts whose corresponding render
   // processes are making device requests, to be used by the
@@ -208,8 +208,8 @@ class CONTENT_EXPORT MediaStreamManager
   static void SendMessageToNativeLog(const std::string& message);
 
   // base::PowerObserver overrides.
-  virtual void OnSuspend() OVERRIDE;
-  virtual void OnResume() OVERRIDE;
+  virtual void OnSuspend() override;
+  virtual void OnResume() override;
 
  protected:
   // Used for testing.
diff --git a/content/browser/renderer_host/media/media_stream_manager_unittest.cc b/content/browser/renderer_host/media/media_stream_manager_unittest.cc
index cfaaf94..15da678 100644
--- a/content/browser/renderer_host/media/media_stream_manager_unittest.cc
+++ b/content/browser/renderer_host/media/media_stream_manager_unittest.cc
@@ -58,7 +58,7 @@ class MockAudioManager : public AudioManagerPlatform {
   virtual ~MockAudioManager() {}
 
   virtual void GetAudioInputDeviceNames(
-      media::AudioDeviceNames* device_names) OVERRIDE {
+      media::AudioDeviceNames* device_names) override {
     DCHECK(device_names->empty());
     if (HasAudioInputDevices()) {
       AudioManagerBase::GetAudioInputDeviceNames(device_names);
diff --git a/content/browser/renderer_host/media/media_stream_track_metrics_host.h b/content/browser/renderer_host/media/media_stream_track_metrics_host.h
index 081b0d5..5f36f26 100644
--- a/content/browser/renderer_host/media/media_stream_track_metrics_host.h
+++ b/content/browser/renderer_host/media/media_stream_track_metrics_host.h
@@ -34,7 +34,7 @@ class MediaStreamTrackMetricsHost
   virtual ~MediaStreamTrackMetricsHost();
 
   // BrowserMessageFilter override.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
   void OnAddTrack(uint64 id, bool is_audio, bool is_remote);
diff --git a/content/browser/renderer_host/media/media_stream_ui_controller_unittest.cc b/content/browser/renderer_host/media/media_stream_ui_controller_unittest.cc
index 048b078..990471f 100644
--- a/content/browser/renderer_host/media/media_stream_ui_controller_unittest.cc
+++ b/content/browser/renderer_host/media/media_stream_ui_controller_unittest.cc
@@ -30,7 +30,7 @@ class MediaStreamDeviceUIControllerTest
       const std::string&, const StreamDeviceInfoArray&));
   MOCK_METHOD1(SettingsError, void(const std::string&));
   MOCK_METHOD1(StopStreamFromUI, void(const std::string&));
-  void GetAvailableDevices(MediaStreamDevices* devices) OVERRIDE {
+  void GetAvailableDevices(MediaStreamDevices* devices) override {
     devices->push_back(MediaStreamDevice(MEDIA_DEVICE_AUDIO_CAPTURE,
                                          "mic",
                                          "mic_id",
diff --git a/content/browser/renderer_host/media/media_stream_ui_proxy.h b/content/browser/renderer_host/media/media_stream_ui_proxy.h
index cf5ba1a..c61bbfa 100644
--- a/content/browser/renderer_host/media/media_stream_ui_proxy.h
+++ b/content/browser/renderer_host/media/media_stream_ui_proxy.h
@@ -99,14 +99,14 @@ class CONTENT_EXPORT FakeMediaStreamUIProxy : public MediaStreamUIProxy {
   // MediaStreamUIProxy overrides.
   virtual void RequestAccess(
       const MediaStreamRequest& request,
-      const ResponseCallback& response_callback) OVERRIDE;
+      const ResponseCallback& response_callback) override;
   virtual void CheckAccess(const GURL& security_origin,
                            MediaStreamType type,
                            int render_process_id,
                            int render_frame_id,
-                           const base::Callback<void(bool)>& callback) OVERRIDE;
+                           const base::Callback<void(bool)>& callback) override;
   virtual void OnStarted(const base::Closure& stop_callback,
-                         const WindowIdCallback& window_id_callback) OVERRIDE;
+                         const WindowIdCallback& window_id_callback) override;
 
  private:
   // This is used for RequestAccess().
diff --git a/content/browser/renderer_host/media/peer_connection_tracker_host.h b/content/browser/renderer_host/media/peer_connection_tracker_host.h
index 07dda23..f1f3521 100644
--- a/content/browser/renderer_host/media/peer_connection_tracker_host.h
+++ b/content/browser/renderer_host/media/peer_connection_tracker_host.h
@@ -26,14 +26,14 @@ class PeerConnectionTrackerHost : public BrowserMessageFilter,
   PeerConnectionTrackerHost(int render_process_id);
 
   // content::BrowserMessageFilter override.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
   virtual void OverrideThreadForMessage(const IPC::Message& message,
-                                        BrowserThread::ID* thread) OVERRIDE;
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-  virtual void OnChannelClosing() OVERRIDE;
+                                        BrowserThread::ID* thread) override;
+  virtual void OnChannelConnected(int32 peer_pid) override;
+  virtual void OnChannelClosing() override;
 
   // base::PowerObserver override.
-  virtual void OnSuspend() OVERRIDE;
+  virtual void OnSuspend() override;
 
  protected:
   virtual ~PeerConnectionTrackerHost();
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc
index 021ce24..3f14c0e 100644
--- a/content/browser/renderer_host/media/video_capture_controller.cc
+++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -62,10 +62,10 @@ class SyncPointClientImpl : public media::VideoFrame::SyncPointClient {
  public:
   explicit SyncPointClientImpl(GLHelper* gl_helper) : gl_helper_(gl_helper) {}
   virtual ~SyncPointClientImpl() {}
-  virtual uint32 InsertSyncPoint() OVERRIDE {
+  virtual uint32 InsertSyncPoint() override {
     return gl_helper_->InsertSyncPoint();
   }
-  virtual void WaitSyncPoint(uint32 sync_point) OVERRIDE {
+  virtual void WaitSyncPoint(uint32 sync_point) override {
     gl_helper_->WaitSyncPoint(sync_point);
   }
 
@@ -161,19 +161,19 @@ class VideoCaptureController::VideoCaptureDeviceClient
   // VideoCaptureDevice::Client implementation.
   virtual scoped_refptr<Buffer> ReserveOutputBuffer(
       media::VideoFrame::Format format,
-      const gfx::Size& size) OVERRIDE;
+      const gfx::Size& size) override;
   virtual void OnIncomingCapturedData(const uint8* data,
                                       int length,
                                       const VideoCaptureFormat& frame_format,
                                       int rotation,
-                                      base::TimeTicks timestamp) OVERRIDE;
+                                      base::TimeTicks timestamp) override;
   virtual void OnIncomingCapturedVideoFrame(
       const scoped_refptr<Buffer>& buffer,
       const VideoCaptureFormat& buffer_format,
       const scoped_refptr<media::VideoFrame>& frame,
-      base::TimeTicks timestamp) OVERRIDE;
-  virtual void OnError(const std::string& reason) OVERRIDE;
-  virtual void OnLog(const std::string& message) OVERRIDE;
+      base::TimeTicks timestamp) override;
+  virtual void OnError(const std::string& reason) override;
+  virtual void OnLog(const std::string& message) override;
 
  private:
   scoped_refptr<Buffer> DoReserveOutputBuffer(media::VideoFrame::Format format,
diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
index 6a9f4b7..9f503ed 100644
--- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
@@ -53,23 +53,23 @@ class MockVideoCaptureControllerEventHandler
   MOCK_METHOD1(DoEnded, void(const VideoCaptureControllerID&));
   MOCK_METHOD1(DoError, void(const VideoCaptureControllerID&));
 
-  virtual void OnError(const VideoCaptureControllerID& id) OVERRIDE {
+  virtual void OnError(const VideoCaptureControllerID& id) override {
     DoError(id);
   }
   virtual void OnBufferCreated(const VideoCaptureControllerID& id,
                                base::SharedMemoryHandle handle,
-                               int length, int buffer_id) OVERRIDE {
+                               int length, int buffer_id) override {
     DoBufferCreated(id);
   }
   virtual void OnBufferDestroyed(const VideoCaptureControllerID& id,
-                                 int buffer_id) OVERRIDE {
+                                 int buffer_id) override {
     DoBufferDestroyed(id);
   }
   virtual void OnBufferReady(const VideoCaptureControllerID& id,
                              int buffer_id,
                              const media::VideoCaptureFormat& format,
                              const gfx::Rect& visible_rect,
-                             base::TimeTicks timestamp) OVERRIDE {
+                             base::TimeTicks timestamp) override {
     DoBufferReady(id);
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
@@ -84,7 +84,7 @@ class MockVideoCaptureControllerEventHandler
                                     int buffer_id,
                                     const gpu::MailboxHolder& mailbox_holder,
                                     const media::VideoCaptureFormat& format,
-                                    base::TimeTicks timestamp) OVERRIDE {
+                                    base::TimeTicks timestamp) override {
     DoMailboxBufferReady(id);
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
@@ -95,7 +95,7 @@ class MockVideoCaptureControllerEventHandler
                    buffer_id,
                    mailbox_holder.sync_point));
   }
-  virtual void OnEnded(const VideoCaptureControllerID& id) OVERRIDE {
+  virtual void OnEnded(const VideoCaptureControllerID& id) override {
     DoEnded(id);
     // OnEnded() must respond by (eventually) unregistering the client.
     base::MessageLoop::current()->PostTask(FROM_HERE,
@@ -115,7 +115,7 @@ class VideoCaptureControllerTest : public testing::Test {
  protected:
   static const int kPoolSize = 3;
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     controller_.reset(new VideoCaptureController(kPoolSize));
     device_ = controller_->NewDeviceClient().Pass();
     client_a_.reset(new MockVideoCaptureControllerEventHandler(
@@ -124,7 +124,7 @@ class VideoCaptureControllerTest : public testing::Test {
         controller_.get()));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     base::RunLoop().RunUntilIdle();
   }
 
diff --git a/content/browser/renderer_host/media/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h
index 68edae1..cf6e73f 100644
--- a/content/browser/renderer_host/media/video_capture_host.h
+++ b/content/browser/renderer_host/media/video_capture_host.h
@@ -71,29 +71,29 @@ class CONTENT_EXPORT VideoCaptureHost
   explicit VideoCaptureHost(MediaStreamManager* media_stream_manager);
 
   // BrowserMessageFilter implementation.
-  virtual void OnChannelClosing() OVERRIDE;
-  virtual void OnDestruct() const OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnChannelClosing() override;
+  virtual void OnDestruct() const override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // VideoCaptureControllerEventHandler implementation.
-  virtual void OnError(const VideoCaptureControllerID& id) OVERRIDE;
+  virtual void OnError(const VideoCaptureControllerID& id) override;
   virtual void OnBufferCreated(const VideoCaptureControllerID& id,
                                base::SharedMemoryHandle handle,
                                int length,
-                               int buffer_id) OVERRIDE;
+                               int buffer_id) override;
   virtual void OnBufferDestroyed(const VideoCaptureControllerID& id,
-                                 int buffer_id) OVERRIDE;
+                                 int buffer_id) override;
   virtual void OnBufferReady(const VideoCaptureControllerID& id,
                              int buffer_id,
                              const media::VideoCaptureFormat& format,
                              const gfx::Rect& visible_rect,
-                             base::TimeTicks timestamp) OVERRIDE;
+                             base::TimeTicks timestamp) override;
   virtual void OnMailboxBufferReady(const VideoCaptureControllerID& id,
                                     int buffer_id,
                                     const gpu::MailboxHolder& mailbox_holder,
                                     const media::VideoCaptureFormat& format,
-                                    base::TimeTicks timestamp) OVERRIDE;
-  virtual void OnEnded(const VideoCaptureControllerID& id) OVERRIDE;
+                                    base::TimeTicks timestamp) override;
+  virtual void OnEnded(const VideoCaptureControllerID& id) override;
 
  private:
   friend class BrowserThread;
diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc
index 933e7f0..6787a38 100644
--- a/content/browser/renderer_host/media/video_capture_host_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc
@@ -182,7 +182,7 @@ class MockVideoCaptureHost : public VideoCaptureHost {
   // This method is used to dispatch IPC messages to the renderer. We intercept
   // these messages here and dispatch to our mock methods to verify the
   // conversation between this object and the renderer.
-  virtual bool Send(IPC::Message* message) OVERRIDE {
+  virtual bool Send(IPC::Message* message) override {
     CHECK(message);
 
     // In this method we dispatch the messages to the according handlers as if
@@ -287,7 +287,7 @@ class VideoCaptureHostTest : public testing::Test {
         message_loop_(base::MessageLoopProxy::current()),
         opened_session_id_(kInvalidMediaCaptureSessionId) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     SetBrowserClientForTesting(&browser_client_);
 
 #if defined(OS_CHROMEOS)
@@ -310,7 +310,7 @@ class VideoCaptureHostTest : public testing::Test {
     OpenSession();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Verifies and removes the expectations on host_ and
     // returns true iff successful.
     Mock::VerifyAndClearExpectations(host_.get());
diff --git a/content/browser/renderer_host/media/video_capture_manager.h b/content/browser/renderer_host/media/video_capture_manager.h
index 74b4d30..b2b6360 100644
--- a/content/browser/renderer_host/media/video_capture_manager.h
+++ b/content/browser/renderer_host/media/video_capture_manager.h
@@ -46,15 +46,15 @@ class CONTENT_EXPORT VideoCaptureManager : public MediaStreamProvider {
   // Implements MediaStreamProvider.
   virtual void Register(MediaStreamProviderListener* listener,
                         const scoped_refptr<base::SingleThreadTaskRunner>&
-                            device_task_runner) OVERRIDE;
+                            device_task_runner) override;
 
-  virtual void Unregister() OVERRIDE;
+  virtual void Unregister() override;
 
-  virtual void EnumerateDevices(MediaStreamType stream_type) OVERRIDE;
+  virtual void EnumerateDevices(MediaStreamType stream_type) override;
 
-  virtual int Open(const StreamDeviceInfo& device) OVERRIDE;
+  virtual int Open(const StreamDeviceInfo& device) override;
 
-  virtual void Close(int capture_session_id) OVERRIDE;
+  virtual void Close(int capture_session_id) override;
 
   // Called by VideoCaptureHost to locate a capture device for |capture_params|,
   // adding the Host as a client of the device's controller if successful. The
diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
index f27f5a5..f033eff 100644
--- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
@@ -48,20 +48,20 @@ class MockFrameObserver : public VideoCaptureControllerEventHandler {
 
   virtual void OnBufferCreated(const VideoCaptureControllerID& id,
                                base::SharedMemoryHandle handle,
-                               int length, int buffer_id) OVERRIDE {}
+                               int length, int buffer_id) override {}
   virtual void OnBufferDestroyed(const VideoCaptureControllerID& id,
-                               int buffer_id) OVERRIDE {}
+                               int buffer_id) override {}
   virtual void OnBufferReady(const VideoCaptureControllerID& id,
                              int buffer_id,
                              const media::VideoCaptureFormat& format,
                              const gfx::Rect& visible_rect,
-                             base::TimeTicks timestamp) OVERRIDE {}
+                             base::TimeTicks timestamp) override {}
   virtual void OnMailboxBufferReady(const VideoCaptureControllerID& id,
                                     int buffer_id,
                                     const gpu::MailboxHolder& mailbox_holder,
                                     const media::VideoCaptureFormat& format,
-                                    base::TimeTicks timestamp) OVERRIDE {}
-  virtual void OnEnded(const VideoCaptureControllerID& id) OVERRIDE {}
+                                    base::TimeTicks timestamp) override {}
+  virtual void OnEnded(const VideoCaptureControllerID& id) override {}
 
   void OnGotControllerCallback(VideoCaptureControllerID) {}
 };
@@ -73,7 +73,7 @@ class VideoCaptureManagerTest : public testing::Test {
   virtual ~VideoCaptureManagerTest() {}
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     listener_.reset(new MockMediaStreamProviderListener());
     message_loop_.reset(new base::MessageLoopForIO);
     io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO,
@@ -89,7 +89,7 @@ class VideoCaptureManagerTest : public testing::Test {
     frame_observer_.reset(new MockFrameObserver());
   }
 
-  virtual void TearDown() OVERRIDE {}
+  virtual void TearDown() override {}
 
   void OnGotControllerCallback(
       VideoCaptureControllerID id,
diff --git a/content/browser/renderer_host/media/webrtc_identity_service_host.h b/content/browser/renderer_host/media/webrtc_identity_service_host.h
index 7bc8233..2033e67 100644
--- a/content/browser/renderer_host/media/webrtc_identity_service_host.h
+++ b/content/browser/renderer_host/media/webrtc_identity_service_host.h
@@ -33,7 +33,7 @@ class CONTENT_EXPORT WebRTCIdentityServiceHost : public BrowserMessageFilter {
   virtual ~WebRTCIdentityServiceHost();
 
   // content::BrowserMessageFilter override.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
   // |sequence_number| is the same as in the OnRequestIdentity call.
diff --git a/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc b/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc
index a785a22..b5fb68e 100644
--- a/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc
+++ b/content/browser/renderer_host/media/webrtc_identity_service_host_unittest.cc
@@ -33,7 +33,7 @@ class MockWebRTCIdentityStore : public WebRTCIdentityStore {
       const GURL& origin,
       const std::string& identity_name,
       const std::string& common_name,
-      const CompletionCallback& callback) OVERRIDE {
+      const CompletionCallback& callback) override {
     EXPECT_TRUE(callback_.is_null());
 
     callback_ = callback;
@@ -67,13 +67,13 @@ class WebRTCIdentityServiceHostForTest : public WebRTCIdentityServiceHost {
     policy->Add(FAKE_RENDERER_ID);
   }
 
-  virtual bool Send(IPC::Message* message) OVERRIDE {
+  virtual bool Send(IPC::Message* message) override {
     messages_.push_back(*message);
     delete message;
     return true;
   }
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& message) override {
     return WebRTCIdentityServiceHost::OnMessageReceived(message);
   }
 
diff --git a/content/browser/renderer_host/memory_benchmark_message_filter.h b/content/browser/renderer_host/memory_benchmark_message_filter.h
index 7255ab9..cd32ba4 100644
--- a/content/browser/renderer_host/memory_benchmark_message_filter.h
+++ b/content/browser/renderer_host/memory_benchmark_message_filter.h
@@ -15,7 +15,7 @@ class MemoryBenchmarkMessageFilter : public BrowserMessageFilter {
  public:
   MemoryBenchmarkMessageFilter();
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
  private:
   virtual ~MemoryBenchmarkMessageFilter();
 
diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.h b/content/browser/renderer_host/p2p/socket_dispatcher_host.h
index 11045f56..692a927 100644
--- a/content/browser/renderer_host/p2p/socket_dispatcher_host.h
+++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.h
@@ -39,12 +39,12 @@ class P2PSocketDispatcherHost
                           net::URLRequestContextGetter* url_context);
 
   // content::BrowserMessageFilter overrides.
-  virtual void OnChannelClosing() OVERRIDE;
-  virtual void OnDestruct() const OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void OnChannelClosing() override;
+  virtual void OnDestruct() const override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // net::NetworkChangeNotifier::IPAddressObserver interface.
-  virtual void OnIPAddressChanged() OVERRIDE;
+  virtual void OnIPAddressChanged() override;
 
   // Starts the RTP packet header dumping. Must be called on the IO thread.
   void StartRtpDump(
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.h b/content/browser/renderer_host/p2p/socket_host_tcp.h
index 005bebb..24aeb97 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp.h
+++ b/content/browser/renderer_host/p2p/socket_host_tcp.h
@@ -39,14 +39,14 @@ class CONTENT_EXPORT P2PSocketHostTcpBase : public P2PSocketHost {
 
   // P2PSocketHost overrides.
   virtual bool Init(const net::IPEndPoint& local_address,
-                    const P2PHostAndIPEndPoint& remote_address) OVERRIDE;
+                    const P2PHostAndIPEndPoint& remote_address) override;
   virtual void Send(const net::IPEndPoint& to,
                     const std::vector<char>& data,
                     const rtc::PacketOptions& options,
-                    uint64 packet_id) OVERRIDE;
+                    uint64 packet_id) override;
   virtual P2PSocketHost* AcceptIncomingTcpConnection(
-      const net::IPEndPoint& remote_address, int id) OVERRIDE;
-  virtual bool SetOption(P2PSocketOption option, int value) OVERRIDE;
+      const net::IPEndPoint& remote_address, int id) override;
+  virtual bool SetOption(P2PSocketOption option, int value) override;
 
  protected:
   // Derived classes will provide the implementation.
@@ -107,10 +107,10 @@ class CONTENT_EXPORT P2PSocketHostTcp : public P2PSocketHostTcpBase {
   virtual ~P2PSocketHostTcp();
 
  protected:
-  virtual int ProcessInput(char* input, int input_len) OVERRIDE;
+  virtual int ProcessInput(char* input, int input_len) override;
   virtual void DoSend(const net::IPEndPoint& to,
                       const std::vector<char>& data,
-                      const rtc::PacketOptions& options) OVERRIDE;
+                      const rtc::PacketOptions& options) override;
  private:
   DISALLOW_COPY_AND_ASSIGN(P2PSocketHostTcp);
 };
@@ -129,10 +129,10 @@ class CONTENT_EXPORT P2PSocketHostStunTcp : public P2PSocketHostTcpBase {
   virtual ~P2PSocketHostStunTcp();
 
  protected:
-  virtual int ProcessInput(char* input, int input_len) OVERRIDE;
+  virtual int ProcessInput(char* input, int input_len) override;
   virtual void DoSend(const net::IPEndPoint& to,
                       const std::vector<char>& data,
-                      const rtc::PacketOptions& options) OVERRIDE;
+                      const rtc::PacketOptions& options) override;
  private:
   int GetExpectedPacketSize(const char* data, int len, int* pad_bytes);
 
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server.h b/content/browser/renderer_host/p2p/socket_host_tcp_server.h
index 72ce6443..f34cf38 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp_server.h
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_server.h
@@ -35,14 +35,14 @@ class CONTENT_EXPORT P2PSocketHostTcpServer : public P2PSocketHost {
 
   // P2PSocketHost overrides.
   virtual bool Init(const net::IPEndPoint& local_address,
-                    const P2PHostAndIPEndPoint& remote_address) OVERRIDE;
+                    const P2PHostAndIPEndPoint& remote_address) override;
   virtual void Send(const net::IPEndPoint& to,
                     const std::vector<char>& data,
                     const rtc::PacketOptions& options,
-                    uint64 packet_id) OVERRIDE;
+                    uint64 packet_id) override;
   virtual P2PSocketHost* AcceptIncomingTcpConnection(
-      const net::IPEndPoint& remote_address, int id) OVERRIDE;
-  virtual bool SetOption(P2PSocketOption option, int value) OVERRIDE;
+      const net::IPEndPoint& remote_address, int id) override;
+  virtual bool SetOption(P2PSocketOption option, int value) override;
 
 
  private:
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc b/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc
index 270fad9..6db5c16 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc
@@ -47,19 +47,19 @@ class FakeServerSocket : public net::ServerSocket {
     }
   }
 
-  virtual int Listen(const net::IPEndPoint& address, int backlog) OVERRIDE {
+  virtual int Listen(const net::IPEndPoint& address, int backlog) override {
     local_address_ = address;
     listening_ = true;
     return net::OK;
   }
 
-  virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE {
+  virtual int GetLocalAddress(net::IPEndPoint* address) const override {
     *address = local_address_;
     return net::OK;
   }
 
   virtual int Accept(scoped_ptr<net::StreamSocket>* socket,
-                     const net::CompletionCallback& callback) OVERRIDE {
+                     const net::CompletionCallback& callback) override {
     DCHECK(socket);
     if (!incoming_sockets_.empty()) {
       socket->reset(incoming_sockets_.front());
@@ -89,7 +89,7 @@ namespace content {
 
 class P2PSocketHostTcpServerTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     socket_ = new FakeServerSocket();
     socket_host_.reset(
         new P2PSocketHostTcpServer(&sender_, 0, P2P_SOCKET_TCP_CLIENT));
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc b/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc
index f2d6146..28f7c0b 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc
@@ -25,7 +25,7 @@ class P2PSocketHostTcpTestBase : public testing::Test {
       : socket_type_(type) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     EXPECT_CALL(sender_, Send(
         MatchMessage(static_cast<uint32>(P2PMsg_OnSocketCreated::ID))))
         .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
diff --git a/content/browser/renderer_host/p2p/socket_host_test_utils.h b/content/browser/renderer_host/p2p/socket_host_test_utils.h
index b27b55b..5ba645d 100644
--- a/content/browser/renderer_host/p2p/socket_host_test_utils.h
+++ b/content/browser/renderer_host/p2p/socket_host_test_utils.h
@@ -42,25 +42,25 @@ class FakeSocket : public net::StreamSocket {
 
   // net::Socket implementation.
   virtual int Read(net::IOBuffer* buf, int buf_len,
-                   const net::CompletionCallback& callback) OVERRIDE;
+                   const net::CompletionCallback& callback) override;
   virtual int Write(net::IOBuffer* buf, int buf_len,
-                    const net::CompletionCallback& callback) OVERRIDE;
-  virtual int SetReceiveBufferSize(int32 size) OVERRIDE;
-  virtual int SetSendBufferSize(int32 size) OVERRIDE;
-  virtual int Connect(const net::CompletionCallback& callback) OVERRIDE;
-  virtual void Disconnect() OVERRIDE;
-  virtual bool IsConnected() const OVERRIDE;
-  virtual bool IsConnectedAndIdle() const OVERRIDE;
-  virtual int GetPeerAddress(net::IPEndPoint* address) const OVERRIDE;
-  virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE;
-  virtual const net::BoundNetLog& NetLog() const OVERRIDE;
-  virtual void SetSubresourceSpeculation() OVERRIDE;
-  virtual void SetOmniboxSpeculation() OVERRIDE;
-  virtual bool WasEverUsed() const OVERRIDE;
-  virtual bool UsingTCPFastOpen() const OVERRIDE;
-  virtual bool WasNpnNegotiated() const OVERRIDE;
-  virtual net::NextProto GetNegotiatedProtocol() const OVERRIDE;
-  virtual bool GetSSLInfo(net::SSLInfo* ssl_info) OVERRIDE;
+                    const net::CompletionCallback& callback) override;
+  virtual int SetReceiveBufferSize(int32 size) override;
+  virtual int SetSendBufferSize(int32 size) override;
+  virtual int Connect(const net::CompletionCallback& callback) override;
+  virtual void Disconnect() override;
+  virtual bool IsConnected() const override;
+  virtual bool IsConnectedAndIdle() const override;
+  virtual int GetPeerAddress(net::IPEndPoint* address) const override;
+  virtual int GetLocalAddress(net::IPEndPoint* address) const override;
+  virtual const net::BoundNetLog& NetLog() const override;
+  virtual void SetSubresourceSpeculation() override;
+  virtual void SetOmniboxSpeculation() override;
+  virtual bool WasEverUsed() const override;
+  virtual bool UsingTCPFastOpen() const override;
+  virtual bool WasNpnNegotiated() const override;
+  virtual net::NextProto GetNegotiatedProtocol() const override;
+  virtual bool GetSSLInfo(net::SSLInfo* ssl_info) override;
 
  private:
   void DoAsyncWrite(scoped_refptr<net::IOBuffer> buf, int buf_len,
diff --git a/content/browser/renderer_host/p2p/socket_host_udp.h b/content/browser/renderer_host/p2p/socket_host_udp.h
index 761ef1e..263e972 100644
--- a/content/browser/renderer_host/p2p/socket_host_udp.h
+++ b/content/browser/renderer_host/p2p/socket_host_udp.h
@@ -33,14 +33,14 @@ class CONTENT_EXPORT P2PSocketHostUdp : public P2PSocketHost {
 
   // P2PSocketHost overrides.
   virtual bool Init(const net::IPEndPoint& local_address,
-                    const P2PHostAndIPEndPoint& remote_address) OVERRIDE;
+                    const P2PHostAndIPEndPoint& remote_address) override;
   virtual void Send(const net::IPEndPoint& to,
                     const std::vector<char>& data,
                     const rtc::PacketOptions& options,
-                    uint64 packet_id) OVERRIDE;
+                    uint64 packet_id) override;
   virtual P2PSocketHost* AcceptIncomingTcpConnection(
-      const net::IPEndPoint& remote_address, int id) OVERRIDE;
-  virtual bool SetOption(P2PSocketOption option, int value) OVERRIDE;
+      const net::IPEndPoint& remote_address, int id) override;
+  virtual bool SetOption(P2PSocketOption option, int value) override;
 
  private:
   friend class P2PSocketHostUdpTest;
diff --git a/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc b/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc
index 2220471..076c752 100644
--- a/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc
+++ b/content/browser/renderer_host/p2p/socket_host_udp_unittest.cc
@@ -29,7 +29,7 @@ namespace {
 class FakeTiming : public rtc::Timing {
  public:
   FakeTiming() : now_(0.0) {}
-  virtual double TimerNow() OVERRIDE { return now_; }
+  virtual double TimerNow() override { return now_; }
   void set_now(double now) { now_ = now; }
 
  private:
@@ -46,27 +46,27 @@ class FakeDatagramServerSocket : public net::DatagramServerSocket {
       : sent_packets_(sent_packets) {
   }
 
-  virtual void Close() OVERRIDE {
+  virtual void Close() override {
   }
 
-  virtual int GetPeerAddress(net::IPEndPoint* address) const OVERRIDE {
+  virtual int GetPeerAddress(net::IPEndPoint* address) const override {
     NOTREACHED();
     return net::ERR_SOCKET_NOT_CONNECTED;
   }
 
-  virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE {
+  virtual int GetLocalAddress(net::IPEndPoint* address) const override {
     *address = address_;
     return 0;
   }
 
-  virtual int Listen(const net::IPEndPoint& address) OVERRIDE {
+  virtual int Listen(const net::IPEndPoint& address) override {
     address_ = address;
     return 0;
   }
 
   virtual int RecvFrom(net::IOBuffer* buf, int buf_len,
                        net::IPEndPoint* address,
-                       const net::CompletionCallback& callback) OVERRIDE {
+                       const net::CompletionCallback& callback) override {
     CHECK(recv_callback_.is_null());
     if (incoming_packets_.size() > 0) {
       scoped_refptr<net::IOBuffer> buffer(buf);
@@ -87,18 +87,18 @@ class FakeDatagramServerSocket : public net::DatagramServerSocket {
 
   virtual int SendTo(net::IOBuffer* buf, int buf_len,
                      const net::IPEndPoint& address,
-                     const net::CompletionCallback& callback) OVERRIDE {
+                     const net::CompletionCallback& callback) override {
     scoped_refptr<net::IOBuffer> buffer(buf);
     std::vector<char> data_vector(buffer->data(), buffer->data() + buf_len);
     sent_packets_->push_back(UDPPacket(address, data_vector));
     return buf_len;
   }
 
-  virtual int SetReceiveBufferSize(int32 size) OVERRIDE {
+  virtual int SetReceiveBufferSize(int32 size) override {
     return net::OK;
   }
 
-  virtual int SetSendBufferSize(int32 size) OVERRIDE {
+  virtual int SetSendBufferSize(int32 size) override {
     return net::OK;
   }
 
@@ -116,51 +116,51 @@ class FakeDatagramServerSocket : public net::DatagramServerSocket {
     }
   }
 
-  virtual const net::BoundNetLog& NetLog() const OVERRIDE {
+  virtual const net::BoundNetLog& NetLog() const override {
     return net_log_;
   }
 
-  virtual void AllowAddressReuse() OVERRIDE {
+  virtual void AllowAddressReuse() override {
     NOTIMPLEMENTED();
   }
 
-  virtual void AllowBroadcast() OVERRIDE {
+  virtual void AllowBroadcast() override {
     NOTIMPLEMENTED();
   }
 
   virtual int JoinGroup(
-      const net::IPAddressNumber& group_address) const OVERRIDE {
+      const net::IPAddressNumber& group_address) const override {
     NOTIMPLEMENTED();
     return net::ERR_NOT_IMPLEMENTED;
   }
 
   virtual int LeaveGroup(
-      const net::IPAddressNumber& group_address) const OVERRIDE {
+      const net::IPAddressNumber& group_address) const override {
     NOTIMPLEMENTED();
     return net::ERR_NOT_IMPLEMENTED;
   }
 
-  virtual int SetMulticastInterface(uint32 interface_index) OVERRIDE {
+  virtual int SetMulticastInterface(uint32 interface_index) override {
     NOTIMPLEMENTED();
     return net::ERR_NOT_IMPLEMENTED;
   }
 
-  virtual int SetMulticastTimeToLive(int time_to_live) OVERRIDE {
+  virtual int SetMulticastTimeToLive(int time_to_live) override {
     NOTIMPLEMENTED();
     return net::ERR_NOT_IMPLEMENTED;
   }
 
-  virtual int SetMulticastLoopbackMode(bool loopback) OVERRIDE {
+  virtual int SetMulticastLoopbackMode(bool loopback) override {
     NOTIMPLEMENTED();
     return net::ERR_NOT_IMPLEMENTED;
   }
 
-  virtual int SetDiffServCodePoint(net::DiffServCodePoint dscp) OVERRIDE {
+  virtual int SetDiffServCodePoint(net::DiffServCodePoint dscp) override {
     NOTIMPLEMENTED();
     return net::ERR_NOT_IMPLEMENTED;
   }
 
-  virtual void DetachFromThread() OVERRIDE {
+  virtual void DetachFromThread() override {
     NOTIMPLEMENTED();
   }
 
@@ -182,7 +182,7 @@ namespace content {
 
 class P2PSocketHostUdpTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     EXPECT_CALL(sender_, Send(
         MatchMessage(static_cast<uint32>(P2PMsg_OnSocketCreated::ID))))
         .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
diff --git a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
index 43ae426..932fb09 100644
--- a/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
+++ b/content/browser/renderer_host/pepper/browser_ppapi_host_impl.h
@@ -45,20 +45,20 @@ class CONTENT_EXPORT BrowserPpapiHostImpl : public BrowserPpapiHost {
   virtual ~BrowserPpapiHostImpl();
 
   // BrowserPpapiHost.
-  virtual ppapi::host::PpapiHost* GetPpapiHost() OVERRIDE;
-  virtual base::ProcessHandle GetPluginProcessHandle() const OVERRIDE;
-  virtual bool IsValidInstance(PP_Instance instance) const OVERRIDE;
+  virtual ppapi::host::PpapiHost* GetPpapiHost() override;
+  virtual base::ProcessHandle GetPluginProcessHandle() const override;
+  virtual bool IsValidInstance(PP_Instance instance) const override;
   virtual bool GetRenderFrameIDsForInstance(PP_Instance instance,
                                             int* render_process_id,
                                             int* render_frame_id) const
-      OVERRIDE;
-  virtual const std::string& GetPluginName() OVERRIDE;
-  virtual const base::FilePath& GetPluginPath() OVERRIDE;
-  virtual const base::FilePath& GetProfileDataDirectory() OVERRIDE;
-  virtual GURL GetDocumentURLForInstance(PP_Instance instance) OVERRIDE;
-  virtual GURL GetPluginURLForInstance(PP_Instance instance) OVERRIDE;
+      override;
+  virtual const std::string& GetPluginName() override;
+  virtual const base::FilePath& GetPluginPath() override;
+  virtual const base::FilePath& GetProfileDataDirectory() override;
+  virtual GURL GetDocumentURLForInstance(PP_Instance instance) override;
+  virtual GURL GetPluginURLForInstance(PP_Instance instance) override;
   virtual void SetOnKeepaliveCallback(
-      const BrowserPpapiHost::OnKeepaliveCallback& callback) OVERRIDE;
+      const BrowserPpapiHost::OnKeepaliveCallback& callback) override;
 
   void set_plugin_process_handle(base::ProcessHandle handle) {
     plugin_process_handle_ = handle;
@@ -93,7 +93,7 @@ class CONTENT_EXPORT BrowserPpapiHostImpl : public BrowserPpapiHost {
                       BrowserPpapiHostImpl* browser_ppapi_host_impl);
 
     // IPC::MessageFilter.
-    virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+    virtual bool OnMessageReceived(const IPC::Message& msg) override;
 
     void OnHostDestroyed();
 
diff --git a/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h b/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h
index 04267a3..31a0a0e 100644
--- a/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h
+++ b/content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h
@@ -32,7 +32,7 @@ class ContentBrowserPepperHostFactory : public ppapi::host::HostFactory {
       ppapi::host::PpapiHost* host,
       const ppapi::proxy::ResourceMessageCallParams& params,
       PP_Instance instance,
-      const IPC::Message& message) OVERRIDE;
+      const IPC::Message& message) override;
 
   // Creates ResourceHost for already accepted TCP |socket|. In the case of
   // failure returns wrapped NULL.
diff --git a/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc b/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc
index 40c13df..08f4180 100644
--- a/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc
+++ b/content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.cc
@@ -24,10 +24,10 @@ class FontMessageFilter : public ppapi::host::ResourceMessageFilter {
 
   // ppapi::host::ResourceMessageFilter implementation.
   virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-      const IPC::Message& msg) OVERRIDE;
+      const IPC::Message& msg) override;
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
-      ppapi::host::HostMessageContext* context) OVERRIDE;
+      ppapi::host::HostMessageContext* context) override;
 
  private:
   virtual ~FontMessageFilter();
diff --git a/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.h b/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.h
index 953db66..693349e 100644
--- a/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.h
+++ b/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.h
@@ -29,25 +29,25 @@ class PepperExternalFileRefBackend : public PepperFileRefBackend {
 
   // PepperFileRefBackend overrides.
   virtual int32_t MakeDirectory(ppapi::host::ReplyMessageContext context,
-                                int32_t make_directory_flags) OVERRIDE;
+                                int32_t make_directory_flags) override;
   virtual int32_t Touch(ppapi::host::ReplyMessageContext context,
                         PP_Time last_accessed_time,
-                        PP_Time last_modified_time) OVERRIDE;
-  virtual int32_t Delete(ppapi::host::ReplyMessageContext context) OVERRIDE;
+                        PP_Time last_modified_time) override;
+  virtual int32_t Delete(ppapi::host::ReplyMessageContext context) override;
   virtual int32_t Rename(ppapi::host::ReplyMessageContext context,
-                         PepperFileRefHost* new_file_ref) OVERRIDE;
-  virtual int32_t Query(ppapi::host::ReplyMessageContext context) OVERRIDE;
+                         PepperFileRefHost* new_file_ref) override;
+  virtual int32_t Query(ppapi::host::ReplyMessageContext context) override;
   virtual int32_t ReadDirectoryEntries(ppapi::host::ReplyMessageContext context)
-      OVERRIDE;
+      override;
   virtual int32_t GetAbsolutePath(ppapi::host::ReplyMessageContext context)
-      OVERRIDE;
-  virtual storage::FileSystemURL GetFileSystemURL() const OVERRIDE;
-  virtual base::FilePath GetExternalFilePath() const OVERRIDE;
+      override;
+  virtual storage::FileSystemURL GetFileSystemURL() const override;
+  virtual base::FilePath GetExternalFilePath() const override;
 
-  virtual int32_t CanRead() const OVERRIDE;
-  virtual int32_t CanWrite() const OVERRIDE;
-  virtual int32_t CanCreate() const OVERRIDE;
-  virtual int32_t CanReadWrite() const OVERRIDE;
+  virtual int32_t CanRead() const override;
+  virtual int32_t CanWrite() const override;
+  virtual int32_t CanCreate() const override;
+  virtual int32_t CanReadWrite() const override;
 
  private:
   // Generic reply callback.
diff --git a/content/browser/renderer_host/pepper/pepper_file_io_host.h b/content/browser/renderer_host/pepper/pepper_file_io_host.h
index 9b7b570..4930535 100644
--- a/content/browser/renderer_host/pepper/pepper_file_io_host.h
+++ b/content/browser/renderer_host/pepper/pepper_file_io_host.h
@@ -43,7 +43,7 @@ class PepperFileIOHost : public ppapi::host::ResourceHost,
   // ppapi::host::ResourceHost override.
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
-      ppapi::host::HostMessageContext* context) OVERRIDE;
+      ppapi::host::HostMessageContext* context) override;
 
   struct UIThreadStuff {
     UIThreadStuff();
diff --git a/content/browser/renderer_host/pepper/pepper_file_ref_host.h b/content/browser/renderer_host/pepper/pepper_file_ref_host.h
index 62497e4..60e814b 100644
--- a/content/browser/renderer_host/pepper/pepper_file_ref_host.h
+++ b/content/browser/renderer_host/pepper/pepper_file_ref_host.h
@@ -70,8 +70,8 @@ class CONTENT_EXPORT PepperFileRefHost
   // ResourceHost overrides.
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
-      ppapi::host::HostMessageContext* context) OVERRIDE;
-  virtual bool IsFileRefHost() OVERRIDE;
+      ppapi::host::HostMessageContext* context) override;
+  virtual bool IsFileRefHost() override;
 
   // Required to support Rename().
   PP_FileSystemType GetFileSystemType() const;
diff --git a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h
index de132ac..7a63699 100644
--- a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h
+++ b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h
@@ -48,8 +48,8 @@ class CONTENT_EXPORT PepperFileSystemBrowserHost
   // ppapi::host::ResourceHost overrides.
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
-      ppapi::host::HostMessageContext* context) OVERRIDE;
-  virtual bool IsFileSystemHost() OVERRIDE;
+      ppapi::host::HostMessageContext* context) override;
+  virtual bool IsFileSystemHost() override;
 
   // Supports FileRefs direct access on the host side.
   PP_FileSystemType GetType() const { return type_; }
diff --git a/content/browser/renderer_host/pepper/pepper_file_system_browser_host_unittest.cc b/content/browser/renderer_host/pepper/pepper_file_system_browser_host_unittest.cc
index 8aa144c..72b6e2d 100644
--- a/content/browser/renderer_host/pepper/pepper_file_system_browser_host_unittest.cc
+++ b/content/browser/renderer_host/pepper/pepper_file_system_browser_host_unittest.cc
@@ -21,7 +21,7 @@ class PepperFileSystemBrowserHostTest : public testing::Test,
   PepperFileSystemBrowserHostTest() {}
   virtual ~PepperFileSystemBrowserHostTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     PP_Instance pp_instance = 12345;
     PP_Resource pp_resource = 67890;
     host_.reset(new PepperFileSystemBrowserHost(GetBrowserPpapiHost(),
@@ -30,7 +30,7 @@ class PepperFileSystemBrowserHostTest : public testing::Test,
                                                 PP_FILESYSTEMTYPE_ISOLATED));
   }
 
-  virtual void TearDown() OVERRIDE { host_.reset(); }
+  virtual void TearDown() override { host_.reset(); }
 
  protected:
   std::string GeneratePluginId(const std::string& mime_type) {
diff --git a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h
index ab21076..923a508 100644
--- a/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h
+++ b/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h
@@ -47,10 +47,10 @@ class PepperFlashFileMessageFilter : public ppapi::host::ResourceMessageFilter {
 
   // ppapi::host::ResourceMessageFilter overrides.
   virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-      const IPC::Message& msg) OVERRIDE;
+      const IPC::Message& msg) override;
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
-      ppapi::host::HostMessageContext* context) OVERRIDE;
+      ppapi::host::HostMessageContext* context) override;
 
   int32_t OnOpenFile(ppapi::host::HostMessageContext* context,
                      const ppapi::PepperFilePath& path,
diff --git a/content/browser/renderer_host/pepper/pepper_gamepad_host.h b/content/browser/renderer_host/pepper/pepper_gamepad_host.h
index c9f2c18..a64692c 100644
--- a/content/browser/renderer_host/pepper/pepper_gamepad_host.h
+++ b/content/browser/renderer_host/pepper/pepper_gamepad_host.h
@@ -41,15 +41,15 @@ class CONTENT_EXPORT PepperGamepadHost :
 
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
-      ppapi::host::HostMessageContext* context) OVERRIDE;
+      ppapi::host::HostMessageContext* context) override;
 
   // GamepadConsumer implementation.
   virtual void OnGamepadConnected(
       unsigned index,
-      const blink::WebGamepad& gamepad) OVERRIDE {}
+      const blink::WebGamepad& gamepad) override {}
   virtual void OnGamepadDisconnected(
       unsigned index,
-      const blink::WebGamepad& gamepad) OVERRIDE {}
+      const blink::WebGamepad& gamepad) override {}
 
  private:
   int32_t OnRequestMemory(ppapi::host::HostMessageContext* context);
diff --git a/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.h b/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.h
index 8fb404d..45675c1 100644
--- a/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.h
+++ b/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.h
@@ -50,10 +50,10 @@ class CONTENT_EXPORT PepperHostResolverMessageFilter
 
   // ppapi::host::ResourceMessageFilter overrides.
   virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-      const IPC::Message& message) OVERRIDE;
+      const IPC::Message& message) override;
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
-      ppapi::host::HostMessageContext* context) OVERRIDE;
+      ppapi::host::HostMessageContext* context) override;
 
   int32_t OnMsgResolve(const ppapi::host::HostMessageContext* context,
                        const ppapi::HostPortPair& host_port,
diff --git a/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.h b/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.h
index 8b88a42..8bd1053 100644
--- a/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.h
+++ b/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.h
@@ -32,25 +32,25 @@ class PepperInternalFileRefBackend : public PepperFileRefBackend {
 
   // PepperFileRefBackend overrides.
   virtual int32_t MakeDirectory(ppapi::host::ReplyMessageContext context,
-                                int32_t make_directory_flags) OVERRIDE;
+                                int32_t make_directory_flags) override;
   virtual int32_t Touch(ppapi::host::ReplyMessageContext context,
                         PP_Time last_accessed_time,
-                        PP_Time last_modified_time) OVERRIDE;
-  virtual int32_t Delete(ppapi::host::ReplyMessageContext context) OVERRIDE;
+                        PP_Time last_modified_time) override;
+  virtual int32_t Delete(ppapi::host::ReplyMessageContext context) override;
   virtual int32_t Rename(ppapi::host::ReplyMessageContext context,
-                         PepperFileRefHost* new_file_ref) OVERRIDE;
-  virtual int32_t Query(ppapi::host::ReplyMessageContext context) OVERRIDE;
+                         PepperFileRefHost* new_file_ref) override;
+  virtual int32_t Query(ppapi::host::ReplyMessageContext context) override;
   virtual int32_t ReadDirectoryEntries(ppapi::host::ReplyMessageContext context)
-      OVERRIDE;
+      override;
   virtual int32_t GetAbsolutePath(ppapi::host::ReplyMessageContext context)
-      OVERRIDE;
-  virtual storage::FileSystemURL GetFileSystemURL() const OVERRIDE;
-  virtual base::FilePath GetExternalFilePath() const OVERRIDE;
-
-  virtual int32_t CanRead() const OVERRIDE;
-  virtual int32_t CanWrite() const OVERRIDE;
-  virtual int32_t CanCreate() const OVERRIDE;
-  virtual int32_t CanReadWrite() const OVERRIDE;
+      override;
+  virtual storage::FileSystemURL GetFileSystemURL() const override;
+  virtual base::FilePath GetExternalFilePath() const override;
+
+  virtual int32_t CanRead() const override;
+  virtual int32_t CanWrite() const override;
+  virtual int32_t CanCreate() const override;
+  virtual int32_t CanReadWrite() const override;
 
  private:
   // Generic reply callback.
diff --git a/content/browser/renderer_host/pepper/pepper_message_filter.h b/content/browser/renderer_host/pepper/pepper_message_filter.h
index 68dac47..1767cf8 100644
--- a/content/browser/renderer_host/pepper/pepper_message_filter.h
+++ b/content/browser/renderer_host/pepper/pepper_message_filter.h
@@ -24,7 +24,7 @@ class PepperMessageFilter : public BrowserMessageFilter {
   PepperMessageFilter();
 
   // BrowserMessageFilter methods.
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
  protected:
   virtual ~PepperMessageFilter();
diff --git a/content/browser/renderer_host/pepper/pepper_network_monitor_host.h b/content/browser/renderer_host/pepper/pepper_network_monitor_host.h
index 12241c5..13886ba 100644
--- a/content/browser/renderer_host/pepper/pepper_network_monitor_host.h
+++ b/content/browser/renderer_host/pepper/pepper_network_monitor_host.h
@@ -29,7 +29,7 @@ class CONTENT_EXPORT PepperNetworkMonitorHost
   virtual ~PepperNetworkMonitorHost();
 
   // net::NetworkChangeNotifier::IPAddressObserver interface.
-  virtual void OnIPAddressChanged() OVERRIDE;
+  virtual void OnIPAddressChanged() override;
 
  private:
   void OnPermissionCheckResult(bool can_use_network_monitor);
diff --git a/content/browser/renderer_host/pepper/pepper_network_proxy_host.h b/content/browser/renderer_host/pepper/pepper_network_proxy_host.h
index 28f52b6..3b8aec83 100644
--- a/content/browser/renderer_host/pepper/pepper_network_proxy_host.h
+++ b/content/browser/renderer_host/pepper/pepper_network_proxy_host.h
@@ -57,7 +57,7 @@ class CONTENT_EXPORT PepperNetworkProxyHost : public ppapi::host::ResourceHost {
   // ResourceHost implementation.
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
-      ppapi::host::HostMessageContext* context) OVERRIDE;
+      ppapi::host::HostMessageContext* context) override;
 
   int32_t OnMsgGetProxyForURL(ppapi::host::HostMessageContext* context,
                               const std::string& url);
diff --git a/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc b/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc
index 49607090..db9c5d2 100644
--- a/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc
+++ b/content/browser/renderer_host/pepper/pepper_print_settings_manager.cc
@@ -47,8 +47,8 @@ PP_Rect PrintAreaToPPPrintArea(const gfx::Rect& print_area,
 class PrintingContextDelegate : public printing::PrintingContext::Delegate {
  public:
   // PrintingContext::Delegate methods.
-  virtual gfx::NativeView GetParentView() OVERRIDE { return NULL; }
-  virtual std::string GetAppLocale() OVERRIDE {
+  virtual gfx::NativeView GetParentView() override { return NULL; }
+  virtual std::string GetAppLocale() override {
     return GetContentClient()->browser()->GetApplicationLocale();
   }
 };
diff --git a/content/browser/renderer_host/pepper/pepper_print_settings_manager.h b/content/browser/renderer_host/pepper/pepper_print_settings_manager.h
index 48a8e9f..2ff5465 100644
--- a/content/browser/renderer_host/pepper/pepper_print_settings_manager.h
+++ b/content/browser/renderer_host/pepper/pepper_print_settings_manager.h
@@ -36,7 +36,7 @@ class CONTENT_EXPORT PepperPrintSettingsManagerImpl
 
   // PepperPrintSettingsManager implementation.
   virtual void GetDefaultPrintSettings(
-      PepperPrintSettingsManager::Callback callback) OVERRIDE;
+      PepperPrintSettingsManager::Callback callback) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PepperPrintSettingsManagerImpl);
diff --git a/content/browser/renderer_host/pepper/pepper_printing_host.h b/content/browser/renderer_host/pepper/pepper_printing_host.h
index ec95629..327a3b8 100644
--- a/content/browser/renderer_host/pepper/pepper_printing_host.h
+++ b/content/browser/renderer_host/pepper/pepper_printing_host.h
@@ -27,7 +27,7 @@ class CONTENT_EXPORT PepperPrintingHost : public ppapi::host::ResourceHost {
   // ppapi::host::ResourceHost implementation.
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
-      ppapi::host::HostMessageContext* context) OVERRIDE;
+      ppapi::host::HostMessageContext* context) override;
 
  private:
   int32_t OnGetDefaultPrintSettings(ppapi::host::HostMessageContext* context);
diff --git a/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc b/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc
index d9780425..c2a9633 100644
--- a/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc
+++ b/content/browser/renderer_host/pepper/pepper_printing_host_unittest.cc
@@ -25,7 +25,7 @@ class MockPepperPrintSettingsManager : public PepperPrintSettingsManager {
 
   // PepperPrintSettingsManager implementation.
   virtual void GetDefaultPrintSettings(
-      PepperPrintSettingsManager::Callback callback) OVERRIDE;
+      PepperPrintSettingsManager::Callback callback) override;
 
  private:
   PP_PrintSettings_Dev settings_;
diff --git a/content/browser/renderer_host/pepper/pepper_renderer_connection.h b/content/browser/renderer_host/pepper/pepper_renderer_connection.h
index 5683ab9..14fc112 100644
--- a/content/browser/renderer_host/pepper/pepper_renderer_connection.h
+++ b/content/browser/renderer_host/pepper/pepper_renderer_connection.h
@@ -36,7 +36,7 @@ class PepperRendererConnection : public BrowserMessageFilter {
   explicit PepperRendererConnection(int render_process_id);
 
   // BrowserMessageFilter overrides.
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& msg) override;
 
  private:
   virtual ~PepperRendererConnection();
diff --git a/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h b/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h
index 43262fc..23d449c 100644
--- a/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h
+++ b/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h
@@ -54,10 +54,10 @@ class CONTENT_EXPORT PepperTCPServerSocketMessageFilter
 
   // ppapi::host::ResourceMessageFilter overrides.
   virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-      const IPC::Message& message) OVERRIDE;
+      const IPC::Message& message) override;
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
-      ppapi::host::HostMessageContext* context) OVERRIDE;
+      ppapi::host::HostMessageContext* context) override;
 
   int32_t OnMsgListen(const ppapi::host::HostMessageContext* context,
                       const PP_NetAddress_Private& addr,
diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h
index 5c4e066..0e4d5cb 100644
--- a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h
+++ b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h
@@ -67,10 +67,10 @@ class CONTENT_EXPORT PepperTCPSocketMessageFilter
 
   // ppapi::host::ResourceMessageFilter overrides.
   virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-      const IPC::Message& message) OVERRIDE;
+      const IPC::Message& message) override;
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
-      ppapi::host::HostMessageContext* context) OVERRIDE;
+      ppapi::host::HostMessageContext* context) override;
 
   int32_t OnMsgBind(const ppapi::host::HostMessageContext* context,
                     const PP_NetAddress_Private& net_addr);
diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_host.h b/content/browser/renderer_host/pepper/pepper_truetype_font_host.h
index 2c09ebd..25ef72d 100644
--- a/content/browser/renderer_host/pepper/pepper_truetype_font_host.h
+++ b/content/browser/renderer_host/pepper/pepper_truetype_font_host.h
@@ -32,7 +32,7 @@ class CONTENT_EXPORT PepperTrueTypeFontHost : public ppapi::host::ResourceHost {
 
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
-      ppapi::host::HostMessageContext* context) OVERRIDE;
+      ppapi::host::HostMessageContext* context) override;
 
  private:
   int32_t OnHostMsgGetTableTags(ppapi::host::HostMessageContext* context);
diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_linux.cc b/content/browser/renderer_host/pepper/pepper_truetype_font_linux.cc
index 9a10e8f..c249a7c 100644
--- a/content/browser/renderer_host/pepper/pepper_truetype_font_linux.cc
+++ b/content/browser/renderer_host/pepper/pepper_truetype_font_linux.cc
@@ -23,15 +23,15 @@ class PepperTrueTypeFontLinux : public PepperTrueTypeFont {
 
   // PepperTrueTypeFont implementation.
   virtual int32_t Initialize(
-      ppapi::proxy::SerializedTrueTypeFontDesc* desc) OVERRIDE;
-  virtual int32_t GetTableTags(std::vector<uint32_t>* tags) OVERRIDE;
+      ppapi::proxy::SerializedTrueTypeFontDesc* desc) override;
+  virtual int32_t GetTableTags(std::vector<uint32_t>* tags) override;
   virtual int32_t GetTable(uint32_t table_tag,
                            int32_t offset,
                            int32_t max_data_length,
-                           std::string* data) OVERRIDE;
+                           std::string* data) override;
 
  private:
-  virtual ~PepperTrueTypeFontLinux() OVERRIDE;
+  virtual ~PepperTrueTypeFontLinux() override;
 
   base::ScopedFD fd_;
 
diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc b/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc
index 7479046..177ff12 100644
--- a/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc
+++ b/content/browser/renderer_host/pepper/pepper_truetype_font_list_host.cc
@@ -28,10 +28,10 @@ class FontMessageFilter : public ppapi::host::ResourceMessageFilter {
 
   // ppapi::host::ResourceMessageFilter implementation.
   virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-      const IPC::Message& msg) OVERRIDE;
+      const IPC::Message& msg) override;
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
-      ppapi::host::HostMessageContext* context) OVERRIDE;
+      ppapi::host::HostMessageContext* context) override;
 
  private:
   virtual ~FontMessageFilter();
diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_mac.mm b/content/browser/renderer_host/pepper/pepper_truetype_font_mac.mm
index 10ebb2f..fb4bc45 100644
--- a/content/browser/renderer_host/pepper/pepper_truetype_font_mac.mm
+++ b/content/browser/renderer_host/pepper/pepper_truetype_font_mac.mm
@@ -99,15 +99,15 @@ class PepperTrueTypeFontMac : public PepperTrueTypeFont {
 
   // PepperTrueTypeFont implementation.
   virtual int32_t Initialize(
-      ppapi::proxy::SerializedTrueTypeFontDesc* desc) OVERRIDE;
-  virtual int32_t GetTableTags(std::vector<uint32_t>* tags) OVERRIDE;
+      ppapi::proxy::SerializedTrueTypeFontDesc* desc) override;
+  virtual int32_t GetTableTags(std::vector<uint32_t>* tags) override;
   virtual int32_t GetTable(uint32_t table_tag,
                            int32_t offset,
                            int32_t max_data_length,
-                           std::string* data) OVERRIDE;
+                           std::string* data) override;
 
  private:
-  virtual ~PepperTrueTypeFontMac() OVERRIDE;
+  virtual ~PepperTrueTypeFontMac() override;
 
   virtual int32_t GetEntireFont(int32_t offset,
                                 int32_t max_data_length,
diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_win.cc b/content/browser/renderer_host/pepper/pepper_truetype_font_win.cc
index 683f655..6eb36a1 100644
--- a/content/browser/renderer_host/pepper/pepper_truetype_font_win.cc
+++ b/content/browser/renderer_host/pepper/pepper_truetype_font_win.cc
@@ -27,12 +27,12 @@ class PepperTrueTypeFontWin : public PepperTrueTypeFont {
 
   // PepperTrueTypeFont implementation.
   virtual int32_t Initialize(
-      ppapi::proxy::SerializedTrueTypeFontDesc* desc) OVERRIDE;
-  virtual int32_t GetTableTags(std::vector<uint32_t>* tags) OVERRIDE;
+      ppapi::proxy::SerializedTrueTypeFontDesc* desc) override;
+  virtual int32_t GetTableTags(std::vector<uint32_t>* tags) override;
   virtual int32_t GetTable(uint32_t table_tag,
                            int32_t offset,
                            int32_t max_data_length,
-                           std::string* data) OVERRIDE;
+                           std::string* data) override;
 
  private:
   virtual ~PepperTrueTypeFontWin();
diff --git a/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h b/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h
index c28e75a..1a1dccb 100644
--- a/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h
+++ b/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h
@@ -58,10 +58,10 @@ class CONTENT_EXPORT PepperUDPSocketMessageFilter
  private:
   // ppapi::host::ResourceMessageFilter overrides.
   virtual scoped_refptr<base::TaskRunner> OverrideTaskRunnerForMessage(
-      const IPC::Message& message) OVERRIDE;
+      const IPC::Message& message) override;
   virtual int32_t OnResourceMessageReceived(
       const IPC::Message& msg,
-      ppapi::host::HostMessageContext* context) OVERRIDE;
+      ppapi::host::HostMessageContext* context) override;
 
   int32_t OnMsgSetOption(const ppapi::host::HostMessageContext* context,
                          PP_UDPSocket_Option name,
diff --git a/content/browser/renderer_host/pepper/quota_reservation_unittest.cc b/content/browser/renderer_host/pepper/quota_reservation_unittest.cc
index ccecb57..ed9d249 100644
--- a/content/browser/renderer_host/pepper/quota_reservation_unittest.cc
+++ b/content/browser/renderer_host/pepper/quota_reservation_unittest.cc
@@ -39,7 +39,7 @@ class FakeBackend : public QuotaReservationManager::QuotaBackend {
       const GURL& origin,
       storage::FileSystemType type,
       int64 delta,
-      const QuotaReservationManager::ReserveQuotaCallback& callback) OVERRIDE {
+      const QuotaReservationManager::ReserveQuotaCallback& callback) override {
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
         base::Bind(base::IgnoreResult(callback), base::File::FILE_OK, delta));
@@ -47,16 +47,16 @@ class FakeBackend : public QuotaReservationManager::QuotaBackend {
 
   virtual void ReleaseReservedQuota(const GURL& origin,
                                     storage::FileSystemType type,
-                                    int64 size) OVERRIDE {}
+                                    int64 size) override {}
 
   virtual void CommitQuotaUsage(const GURL& origin,
                                 storage::FileSystemType type,
-                                int64 delta) OVERRIDE {}
+                                int64 delta) override {}
 
   virtual void IncrementDirtyCount(const GURL& origin,
-                                   storage::FileSystemType type) OVERRIDE {}
+                                   storage::FileSystemType type) override {}
   virtual void DecrementDirtyCount(const GURL& origin,
-                                   storage::FileSystemType type) OVERRIDE {}
+                                   storage::FileSystemType type) override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FakeBackend);
@@ -69,14 +69,14 @@ class QuotaReservationTest : public testing::Test {
   QuotaReservationTest() {}
   virtual ~QuotaReservationTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(work_dir_.CreateUniqueTempDir());
 
     reservation_manager_.reset(new QuotaReservationManager(
         scoped_ptr<QuotaReservationManager::QuotaBackend>(new FakeBackend)));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     reservation_manager_.reset();
     base::RunLoop().RunUntilIdle();
   }
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 5af2f63..b1fb21a 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -162,24 +162,24 @@ class OpenChannelToPpapiPluginCallback
   }
 
   virtual void GetPpapiChannelInfo(base::ProcessHandle* renderer_handle,
-                                   int* renderer_id) OVERRIDE {
+                                   int* renderer_id) override {
     *renderer_handle = filter()->PeerHandle();
     *renderer_id = filter()->render_process_id();
   }
 
   virtual void OnPpapiChannelOpened(const IPC::ChannelHandle& channel_handle,
                                     base::ProcessId plugin_pid,
-                                    int plugin_child_id) OVERRIDE {
+                                    int plugin_child_id) override {
     ViewHostMsg_OpenChannelToPepperPlugin::WriteReplyParams(
         reply_msg(), channel_handle, plugin_pid, plugin_child_id);
     SendReplyAndDeleteThis();
   }
 
-  virtual bool OffTheRecord() OVERRIDE {
+  virtual bool OffTheRecord() override {
     return filter()->OffTheRecord();
   }
 
-  virtual ResourceContext* GetResourceContext() OVERRIDE {
+  virtual ResourceContext* GetResourceContext() override {
     return context_;
   }
 
@@ -199,21 +199,21 @@ class OpenChannelToPpapiBrokerCallback
   virtual ~OpenChannelToPpapiBrokerCallback() {}
 
   virtual void GetPpapiChannelInfo(base::ProcessHandle* renderer_handle,
-                                   int* renderer_id) OVERRIDE {
+                                   int* renderer_id) override {
     *renderer_handle = filter_->PeerHandle();
     *renderer_id = filter_->render_process_id();
   }
 
   virtual void OnPpapiChannelOpened(const IPC::ChannelHandle& channel_handle,
                                     base::ProcessId plugin_pid,
-                                    int /* plugin_child_id */) OVERRIDE {
+                                    int /* plugin_child_id */) override {
     filter_->Send(new ViewMsg_PpapiBrokerChannelCreated(routing_id_,
                                                         plugin_pid,
                                                         channel_handle));
     delete this;
   }
 
-  virtual bool OffTheRecord() OVERRIDE {
+  virtual bool OffTheRecord() override {
     return filter_->OffTheRecord();
   }
 
@@ -238,15 +238,15 @@ class RenderMessageFilter::OpenChannelToNpapiPluginCallback
         sent_plugin_channel_request_(false) {
   }
 
-  virtual int ID() OVERRIDE {
+  virtual int ID() override {
     return filter()->render_process_id();
   }
 
-  virtual ResourceContext* GetResourceContext() OVERRIDE {
+  virtual ResourceContext* GetResourceContext() override {
     return context_;
   }
 
-  virtual bool OffTheRecord() OVERRIDE {
+  virtual bool OffTheRecord() override {
     if (filter()->OffTheRecord())
       return true;
     if (GetContentClient()->browser()->AllowSaveLocalState(context_))
@@ -260,24 +260,24 @@ class RenderMessageFilter::OpenChannelToNpapiPluginCallback
     return false;
   }
 
-  virtual void SetPluginInfo(const WebPluginInfo& info) OVERRIDE {
+  virtual void SetPluginInfo(const WebPluginInfo& info) override {
     info_ = info;
   }
 
-  virtual void OnFoundPluginProcessHost(PluginProcessHost* host) OVERRIDE {
+  virtual void OnFoundPluginProcessHost(PluginProcessHost* host) override {
     DCHECK(host);
     host_ = host;
   }
 
-  virtual void OnSentPluginChannelRequest() OVERRIDE {
+  virtual void OnSentPluginChannelRequest() override {
     sent_plugin_channel_request_ = true;
   }
 
-  virtual void OnChannelOpened(const IPC::ChannelHandle& handle) OVERRIDE {
+  virtual void OnChannelOpened(const IPC::ChannelHandle& handle) override {
     WriteReplyAndDeleteThis(handle);
   }
 
-  virtual void OnError() OVERRIDE {
+  virtual void OnError() override {
     WriteReplyAndDeleteThis(IPC::ChannelHandle());
   }
 
diff --git a/content/browser/renderer_host/render_message_filter.h b/content/browser/renderer_host/render_message_filter.h
index 9787eda..b3d5989 100644
--- a/content/browser/renderer_host/render_message_filter.h
+++ b/content/browser/renderer_host/render_message_filter.h
@@ -100,13 +100,13 @@ class CONTENT_EXPORT RenderMessageFilter : public BrowserMessageFilter {
                       DOMStorageContextWrapper* dom_storage_context);
 
   // IPC::MessageFilter methods:
-  virtual void OnChannelClosing() OVERRIDE;
+  virtual void OnChannelClosing() override;
 
   // BrowserMessageFilter methods:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnDestruct() const OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  virtual void OnDestruct() const override;
   virtual base::TaskRunner* OverrideTaskRunnerForMessage(
-      const IPC::Message& message) OVERRIDE;
+      const IPC::Message& message) override;
 
   bool OffTheRecord() const;
 
diff --git a/content/browser/renderer_host/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc
index e815f01..628fb1d 100644
--- a/content/browser/renderer_host/render_process_host_browsertest.cc
+++ b/content/browser/renderer_host/render_process_host_browsertest.cc
@@ -45,10 +45,10 @@ class RenderProcessHostTest : public ContentBrowserTest,
   virtual void RenderProcessExited(RenderProcessHost* host,
                                    base::ProcessHandle handle,
                                    base::TerminationStatus status,
-                                   int exit_code) OVERRIDE {
+                                   int exit_code) override {
     ++process_exits_;
   }
-  virtual void RenderProcessHostDestroyed(RenderProcessHost* host) OVERRIDE {
+  virtual void RenderProcessHostDestroyed(RenderProcessHost* host) override {
     ++host_destructions_;
   }
 
@@ -124,12 +124,12 @@ class ShellCloser : public RenderProcessHostObserver {
   virtual void RenderProcessExited(RenderProcessHost* host,
                                    base::ProcessHandle handle,
                                    base::TerminationStatus status,
-                                   int exit_code) OVERRIDE {
+                                   int exit_code) override {
     logging_string_->append("ShellCloser::RenderProcessExited ");
     shell_->Close();
   }
 
-  virtual void RenderProcessHostDestroyed(RenderProcessHost* host) OVERRIDE {
+  virtual void RenderProcessHostDestroyed(RenderProcessHost* host) override {
     logging_string_->append("ShellCloser::RenderProcessHostDestroyed ");
   }
 
@@ -149,11 +149,11 @@ class ObserverLogger : public RenderProcessHostObserver {
   virtual void RenderProcessExited(RenderProcessHost* host,
                                    base::ProcessHandle handle,
                                    base::TerminationStatus status,
-                                   int exit_code) OVERRIDE {
+                                   int exit_code) override {
     logging_string_->append("ObserverLogger::RenderProcessExited ");
   }
 
-  virtual void RenderProcessHostDestroyed(RenderProcessHost* host) OVERRIDE {
+  virtual void RenderProcessHostDestroyed(RenderProcessHost* host) override {
     logging_string_->append("ObserverLogger::RenderProcessHostDestroyed ");
     host_destroyed_ = true;
   }
@@ -208,7 +208,7 @@ class Win32KLockdownRendererProcessHostTest : public RenderProcessHostTest {
   virtual ~Win32KLockdownRendererProcessHostTest() {}
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
     command_line->AppendSwitch(switches::kEnableWin32kRendererLockDown);
     RenderProcessHostTest::SetUp();
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 8984a79..b1ec798 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -322,14 +322,14 @@ class RendererSandboxedProcessLauncherDelegate
   }
 
 #elif defined(OS_POSIX)
-  virtual bool ShouldUseZygote() OVERRIDE {
+  virtual bool ShouldUseZygote() override {
     const base::CommandLine& browser_command_line =
         *base::CommandLine::ForCurrentProcess();
     base::CommandLine::StringType renderer_prefix =
         browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
     return renderer_prefix.empty();
   }
-  virtual int GetIpcFd() OVERRIDE {
+  virtual int GetIpcFd() override {
     return ipc_fd_;
   }
 #endif  // OS_WIN
diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h
index 92d1e4d..53db06d 100644
--- a/content/browser/renderer_host/render_process_host_impl.h
+++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -90,67 +90,67 @@ class CONTENT_EXPORT RenderProcessHostImpl
   virtual ~RenderProcessHostImpl();
 
   // RenderProcessHost implementation (public portion).
-  virtual void EnableSendQueue() OVERRIDE;
-  virtual bool Init() OVERRIDE;
-  virtual int GetNextRoutingID() OVERRIDE;
-  virtual void AddRoute(int32 routing_id, IPC::Listener* listener) OVERRIDE;
-  virtual void RemoveRoute(int32 routing_id) OVERRIDE;
-  virtual void AddObserver(RenderProcessHostObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(RenderProcessHostObserver* observer) OVERRIDE;
-  virtual void ReceivedBadMessage() OVERRIDE;
-  virtual void WidgetRestored() OVERRIDE;
-  virtual void WidgetHidden() OVERRIDE;
-  virtual int VisibleWidgetCount() const OVERRIDE;
-  virtual bool IsIsolatedGuest() const OVERRIDE;
-  virtual StoragePartition* GetStoragePartition() const OVERRIDE;
-  virtual bool FastShutdownIfPossible() OVERRIDE;
-  virtual void DumpHandles() OVERRIDE;
-  virtual base::ProcessHandle GetHandle() const OVERRIDE;
-  virtual BrowserContext* GetBrowserContext() const OVERRIDE;
+  virtual void EnableSendQueue() override;
+  virtual bool Init() override;
+  virtual int GetNextRoutingID() override;
+  virtual void AddRoute(int32 routing_id, IPC::Listener* listener) override;
+  virtual void RemoveRoute(int32 routing_id) override;
+  virtual void AddObserver(RenderProcessHostObserver* observer) override;
+  virtual void RemoveObserver(RenderProcessHostObserver* observer) override;
+  virtual void ReceivedBadMessage() override;
+  virtual void WidgetRestored() override;
+  virtual void WidgetHidden() override;
+  virtual int VisibleWidgetCount() const override;
+  virtual bool IsIsolatedGuest() const override;
+  virtual StoragePartition* GetStoragePartition() const override;
+  virtual bool FastShutdownIfPossible() override;
+  virtual void DumpHandles() override;
+  virtual base::ProcessHandle GetHandle() const override;
+  virtual BrowserContext* GetBrowserContext() const override;
   virtual bool InSameStoragePartition(
-      StoragePartition* partition) const OVERRIDE;
-  virtual int GetID() const OVERRIDE;
-  virtual bool HasConnection() const OVERRIDE;
-  virtual void SetIgnoreInputEvents(bool ignore_input_events) OVERRIDE;
-  virtual bool IgnoreInputEvents() const OVERRIDE;
-  virtual void Cleanup() OVERRIDE;
-  virtual void AddPendingView() OVERRIDE;
-  virtual void RemovePendingView() OVERRIDE;
-  virtual void SetSuddenTerminationAllowed(bool enabled) OVERRIDE;
-  virtual bool SuddenTerminationAllowed() const OVERRIDE;
-  virtual IPC::ChannelProxy* GetChannel() OVERRIDE;
-  virtual void AddFilter(BrowserMessageFilter* filter) OVERRIDE;
-  virtual bool FastShutdownForPageCount(size_t count) OVERRIDE;
-  virtual bool FastShutdownStarted() const OVERRIDE;
-  virtual base::TimeDelta GetChildProcessIdleTime() const OVERRIDE;
-  virtual void ResumeRequestsForView(int route_id) OVERRIDE;
-  virtual void FilterURL(bool empty_allowed, GURL* url) OVERRIDE;
+      StoragePartition* partition) const override;
+  virtual int GetID() const override;
+  virtual bool HasConnection() const override;
+  virtual void SetIgnoreInputEvents(bool ignore_input_events) override;
+  virtual bool IgnoreInputEvents() const override;
+  virtual void Cleanup() override;
+  virtual void AddPendingView() override;
+  virtual void RemovePendingView() override;
+  virtual void SetSuddenTerminationAllowed(bool enabled) override;
+  virtual bool SuddenTerminationAllowed() const override;
+  virtual IPC::ChannelProxy* GetChannel() override;
+  virtual void AddFilter(BrowserMessageFilter* filter) override;
+  virtual bool FastShutdownForPageCount(size_t count) override;
+  virtual bool FastShutdownStarted() const override;
+  virtual base::TimeDelta GetChildProcessIdleTime() const override;
+  virtual void ResumeRequestsForView(int route_id) override;
+  virtual void FilterURL(bool empty_allowed, GURL* url) override;
 #if defined(ENABLE_WEBRTC)
-  virtual void EnableAecDump(const base::FilePath& file) OVERRIDE;
-  virtual void DisableAecDump() OVERRIDE;
+  virtual void EnableAecDump(const base::FilePath& file) override;
+  virtual void DisableAecDump() override;
   virtual void SetWebRtcLogMessageCallback(
-      base::Callback<void(const std::string&)> callback) OVERRIDE;
+      base::Callback<void(const std::string&)> callback) override;
   virtual WebRtcStopRtpDumpCallback StartRtpDump(
       bool incoming,
       bool outgoing,
-      const WebRtcRtpPacketCallback& packet_callback) OVERRIDE;
+      const WebRtcRtpPacketCallback& packet_callback) override;
 #endif
   virtual void ResumeDeferredNavigation(const GlobalRequestID& request_id)
-      OVERRIDE;
-  virtual void NotifyTimezoneChange() OVERRIDE;
-  virtual ServiceRegistry* GetServiceRegistry() OVERRIDE;
+      override;
+  virtual void NotifyTimezoneChange() override;
+  virtual ServiceRegistry* GetServiceRegistry() override;
 
   // IPC::Sender via RenderProcessHost.
-  virtual bool Send(IPC::Message* msg) OVERRIDE;
+  virtual bool Send(IPC::Message* msg) override;
 
   // IPC::Listener via RenderProcessHost.
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
-  virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
-  virtual void OnChannelError() OVERRIDE;
-  virtual void OnBadMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& msg) override;
+  virtual void OnChannelConnected(int32 peer_pid) override;
+  virtual void OnChannelError() override;
+  virtual void OnBadMessageReceived(const IPC::Message& message) override;
 
   // ChildProcessLauncher::Client implementation.
-  virtual void OnProcessLaunched() OVERRIDE;
+  virtual void OnProcessLaunched() override;
 
   scoped_refptr<AudioRendererHost> audio_renderer_host() const;
 
@@ -320,7 +320,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
   // Handle termination of our process.
   void ProcessDied(bool already_dead);
 
-  virtual void OnGpuSwitching() OVERRIDE;
+  virtual void OnGpuSwitching() override;
 
 #if defined(ENABLE_WEBRTC)
   void OnRegisterAecDumpConsumer(int id);
diff --git a/content/browser/renderer_host/render_view_host_browsertest.cc b/content/browser/renderer_host/render_view_host_browsertest.cc
index 6015c04..db4a21e 100644
--- a/content/browser/renderer_host/render_view_host_browsertest.cc
+++ b/content/browser/renderer_host/render_view_host_browsertest.cc
@@ -38,7 +38,7 @@ class RenderViewHostTestWebContentsObserver : public WebContentsObserver {
 
   virtual void DidNavigateMainFrame(
       const LoadCommittedDetails& details,
-      const FrameNavigateParams& params) OVERRIDE {
+      const FrameNavigateParams& params) override {
     observed_socket_address_ = params.socket_address;
     base_url_ = params.base_url;
     ++navigation_count_;
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
index 2499c64..1c70e3e 100644
--- a/content/browser/renderer_host/render_view_host_impl.h
+++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -113,72 +113,72 @@ class CONTENT_EXPORT RenderViewHostImpl
   virtual ~RenderViewHostImpl();
 
   // RenderViewHost implementation.
-  virtual RenderFrameHost* GetMainFrame() OVERRIDE;
-  virtual void AllowBindings(int binding_flags) OVERRIDE;
-  virtual void ClearFocusedElement() OVERRIDE;
-  virtual bool IsFocusedElementEditable() OVERRIDE;
-  virtual void ClosePage() OVERRIDE;
-  virtual void CopyImageAt(int x, int y) OVERRIDE;
-  virtual void SaveImageAt(int x, int y) OVERRIDE;
+  virtual RenderFrameHost* GetMainFrame() override;
+  virtual void AllowBindings(int binding_flags) override;
+  virtual void ClearFocusedElement() override;
+  virtual bool IsFocusedElementEditable() override;
+  virtual void ClosePage() override;
+  virtual void CopyImageAt(int x, int y) override;
+  virtual void SaveImageAt(int x, int y) override;
   virtual void DirectoryEnumerationFinished(
       int request_id,
-      const std::vector<base::FilePath>& files) OVERRIDE;
-  virtual void DisableScrollbarsForThreshold(const gfx::Size& size) OVERRIDE;
+      const std::vector<base::FilePath>& files) override;
+  virtual void DisableScrollbarsForThreshold(const gfx::Size& size) override;
   virtual void DragSourceEndedAt(
       int client_x, int client_y, int screen_x, int screen_y,
-      blink::WebDragOperation operation) OVERRIDE;
-  virtual void DragSourceSystemDragEnded() OVERRIDE;
+      blink::WebDragOperation operation) override;
+  virtual void DragSourceSystemDragEnded() override;
   virtual void DragTargetDragEnter(
       const DropData& drop_data,
       const gfx::Point& client_pt,
       const gfx::Point& screen_pt,
       blink::WebDragOperationsMask operations_allowed,
-      int key_modifiers) OVERRIDE;
+      int key_modifiers) override;
   virtual void DragTargetDragOver(
       const gfx::Point& client_pt,
       const gfx::Point& screen_pt,
       blink::WebDragOperationsMask operations_allowed,
-      int key_modifiers) OVERRIDE;
-  virtual void DragTargetDragLeave() OVERRIDE;
+      int key_modifiers) override;
+  virtual void DragTargetDragLeave() override;
   virtual void DragTargetDrop(const gfx::Point& client_pt,
                               const gfx::Point& screen_pt,
-                              int key_modifiers) OVERRIDE;
+                              int key_modifiers) override;
   virtual void EnableAutoResize(const gfx::Size& min_size,
-                                const gfx::Size& max_size) OVERRIDE;
-  virtual void DisableAutoResize(const gfx::Size& new_size) OVERRIDE;
-  virtual void EnablePreferredSizeMode() OVERRIDE;
+                                const gfx::Size& max_size) override;
+  virtual void DisableAutoResize(const gfx::Size& new_size) override;
+  virtual void EnablePreferredSizeMode() override;
   virtual void ExecuteMediaPlayerActionAtLocation(
       const gfx::Point& location,
-      const blink::WebMediaPlayerAction& action) OVERRIDE;
+      const blink::WebMediaPlayerAction& action) override;
   virtual void ExecutePluginActionAtLocation(
       const gfx::Point& location,
-      const blink::WebPluginAction& action) OVERRIDE;
-  virtual void ExitFullscreen() OVERRIDE;
+      const blink::WebPluginAction& action) override;
+  virtual void ExitFullscreen() override;
   virtual void FilesSelectedInChooser(
       const std::vector<ui::SelectedFileInfo>& files,
-      FileChooserParams::Mode permissions) OVERRIDE;
-  virtual RenderViewHostDelegate* GetDelegate() const OVERRIDE;
-  virtual int GetEnabledBindings() const OVERRIDE;
-  virtual SiteInstanceImpl* GetSiteInstance() const OVERRIDE;
-  virtual bool IsRenderViewLive() const OVERRIDE;
-  virtual void NotifyMoveOrResizeStarted() OVERRIDE;
+      FileChooserParams::Mode permissions) override;
+  virtual RenderViewHostDelegate* GetDelegate() const override;
+  virtual int GetEnabledBindings() const override;
+  virtual SiteInstanceImpl* GetSiteInstance() const override;
+  virtual bool IsRenderViewLive() const override;
+  virtual void NotifyMoveOrResizeStarted() override;
   virtual void SetWebUIProperty(const std::string& name,
-                                const std::string& value) OVERRIDE;
-  virtual void Zoom(PageZoom zoom) OVERRIDE;
-  virtual void SyncRendererPrefs() OVERRIDE;
-  virtual WebPreferences GetWebkitPreferences() OVERRIDE;
+                                const std::string& value) override;
+  virtual void Zoom(PageZoom zoom) override;
+  virtual void SyncRendererPrefs() override;
+  virtual WebPreferences GetWebkitPreferences() override;
   virtual void UpdateWebkitPreferences(
-      const WebPreferences& prefs) OVERRIDE;
-  virtual void OnWebkitPreferencesChanged() OVERRIDE;
+      const WebPreferences& prefs) override;
+  virtual void OnWebkitPreferencesChanged() override;
   virtual void GetAudioOutputControllers(
-      const GetAudioOutputControllersCallback& callback) const OVERRIDE;
-  virtual void SelectWordAroundCaret() OVERRIDE;
+      const GetAudioOutputControllersCallback& callback) const override;
+  virtual void SelectWordAroundCaret() override;
 
 #if defined(OS_ANDROID)
   virtual void ActivateNearestFindResult(int request_id,
                                          float x,
-                                         float y) OVERRIDE;
-  virtual void RequestFindMatchRects(int current_version) OVERRIDE;
+                                         float y) override;
+  virtual void RequestFindMatchRects(int current_version) override;
 #endif
 
   void set_delegate(RenderViewHostDelegate* d) {
@@ -259,22 +259,22 @@ class CONTENT_EXPORT RenderViewHostImpl
   }
 
   // RenderWidgetHost public overrides.
-  virtual void Init() OVERRIDE;
-  virtual void Shutdown() OVERRIDE;
-  virtual void WasHidden() OVERRIDE;
-  virtual void WasShown(const ui::LatencyInfo& latency_info) OVERRIDE;
-  virtual bool IsRenderView() const OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
-  virtual void GotFocus() OVERRIDE;
-  virtual void LostCapture() OVERRIDE;
-  virtual void LostMouseLock() OVERRIDE;
-  virtual void SetIsLoading(bool is_loading) OVERRIDE;
+  virtual void Init() override;
+  virtual void Shutdown() override;
+  virtual void WasHidden() override;
+  virtual void WasShown(const ui::LatencyInfo& latency_info) override;
+  virtual bool IsRenderView() const override;
+  virtual bool OnMessageReceived(const IPC::Message& msg) override;
+  virtual void GotFocus() override;
+  virtual void LostCapture() override;
+  virtual void LostMouseLock() override;
+  virtual void SetIsLoading(bool is_loading) override;
   virtual void ForwardMouseEvent(
-      const blink::WebMouseEvent& mouse_event) OVERRIDE;
-  virtual void OnPointerEventActivate() OVERRIDE;
+      const blink::WebMouseEvent& mouse_event) override;
+  virtual void OnPointerEventActivate() override;
   virtual void ForwardKeyboardEvent(
-      const NativeWebKeyboardEvent& key_event) OVERRIDE;
-  virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
+      const NativeWebKeyboardEvent& key_event) override;
+  virtual gfx::Rect GetRootWindowResizerRect() const override;
 
   // Creates a new RenderView with the given route id.
   void CreateNewWindow(
@@ -330,15 +330,15 @@ class CONTENT_EXPORT RenderViewHostImpl
 
  protected:
   // RenderWidgetHost protected overrides.
-  virtual void OnUserGesture() OVERRIDE;
-  virtual void NotifyRendererUnresponsive() OVERRIDE;
-  virtual void NotifyRendererResponsive() OVERRIDE;
-  virtual void OnRenderAutoResized(const gfx::Size& size) OVERRIDE;
+  virtual void OnUserGesture() override;
+  virtual void NotifyRendererUnresponsive() override;
+  virtual void NotifyRendererResponsive() override;
+  virtual void OnRenderAutoResized(const gfx::Size& size) override;
   virtual void RequestToLockMouse(bool user_gesture,
-                                  bool last_unlocked_by_target) OVERRIDE;
-  virtual bool IsFullscreen() const OVERRIDE;
-  virtual void OnFocus() OVERRIDE;
-  virtual void OnBlur() OVERRIDE;
+                                  bool last_unlocked_by_target) override;
+  virtual bool IsFullscreen() const override;
+  virtual void OnFocus() override;
+  virtual void OnBlur() override;
 
   // IPC message handlers.
   void OnShowView(int route_id,
diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc
index be0a1d8..22ac206 100644
--- a/content/browser/renderer_host/render_view_host_unittest.cc
+++ b/content/browser/renderer_host/render_view_host_unittest.cc
@@ -31,7 +31,7 @@ class RenderViewHostTestBrowserClient : public TestContentBrowserClient {
   RenderViewHostTestBrowserClient() {}
   virtual ~RenderViewHostTestBrowserClient() {}
 
-  virtual bool IsHandledURL(const GURL& url) OVERRIDE {
+  virtual bool IsHandledURL(const GURL& url) override {
     return url.scheme() == url::kFileScheme;
   }
 
@@ -44,12 +44,12 @@ class RenderViewHostTest : public RenderViewHostImplTestHarness {
   RenderViewHostTest() : old_browser_client_(NULL) {}
   virtual ~RenderViewHostTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     RenderViewHostImplTestHarness::SetUp();
     old_browser_client_ = SetBrowserClientForTesting(&test_browser_client_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     SetBrowserClientForTesting(old_browser_client_);
     RenderViewHostImplTestHarness::TearDown();
   }
@@ -124,13 +124,13 @@ class MockDraggingRenderViewHostDelegateView
                              blink::WebDragOperationsMask allowed_ops,
                              const gfx::ImageSkia& image,
                              const gfx::Vector2d& image_offset,
-                             const DragEventSourceInfo& event_info) OVERRIDE {
+                             const DragEventSourceInfo& event_info) override {
     drag_url_ = drop_data.url;
     html_base_url_ = drop_data.html_base_url;
   }
-  virtual void UpdateDragCursor(blink::WebDragOperation operation) OVERRIDE {}
-  virtual void GotFocus() OVERRIDE {}
-  virtual void TakeFocus(bool reverse) OVERRIDE {}
+  virtual void UpdateDragCursor(blink::WebDragOperation operation) override {}
+  virtual void GotFocus() override {}
+  virtual void TakeFocus(bool reverse) override {}
   virtual void UpdatePreferredSize(const gfx::Size& pref_size) {}
 
   GURL drag_url() {
@@ -287,7 +287,7 @@ class TestSaveImageFromDataURL : public RenderMessageFilter {
                            const GURL& url,
                            const Referrer& referrer,
                            const base::string16& suggested_name,
-                           const bool use_prompt) const OVERRIDE {
+                           const bool use_prompt) const override {
     url_string_ = url.spec();
     is_downloaded_ = true;
   }
diff --git a/content/browser/renderer_host/render_widget_host_browsertest.cc b/content/browser/renderer_host/render_widget_host_browsertest.cc
index 4837781..fae4127 100644
--- a/content/browser/renderer_host/render_widget_host_browsertest.cc
+++ b/content/browser/renderer_host/render_widget_host_browsertest.cc
@@ -19,7 +19,7 @@ class RenderWidgetHostBrowserTest : public ContentBrowserTest {
  public:
   RenderWidgetHostBrowserTest() {}
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &test_dir_));
   }
 
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 619c003..7a5b9fd 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -133,7 +133,7 @@ class RenderWidgetHostIteratorImpl : public RenderWidgetHostIterator {
   }
 
   // RenderWidgetHostIterator:
-  virtual RenderWidgetHost* GetNextHost() OVERRIDE {
+  virtual RenderWidgetHost* GetNextHost() override {
     RenderWidgetHost* host = NULL;
     while (current_index_ < hosts_.size() && !host) {
       RenderWidgetHostID id = hosts_[current_index_];
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
index e770eae..19639e9 100644
--- a/content/browser/renderer_host/render_widget_host_impl.h
+++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -126,47 +126,47 @@ class CONTENT_EXPORT RenderWidgetHostImpl
   }
 
   // RenderWidgetHost implementation.
-  virtual void UpdateTextDirection(blink::WebTextDirection direction) OVERRIDE;
-  virtual void NotifyTextDirection() OVERRIDE;
-  virtual void Focus() OVERRIDE;
-  virtual void Blur() OVERRIDE;
-  virtual void SetActive(bool active) OVERRIDE;
+  virtual void UpdateTextDirection(blink::WebTextDirection direction) override;
+  virtual void NotifyTextDirection() override;
+  virtual void Focus() override;
+  virtual void Blur() override;
+  virtual void SetActive(bool active) override;
   virtual void CopyFromBackingStore(
       const gfx::Rect& src_rect,
       const gfx::Size& accelerated_dst_size,
       const base::Callback<void(bool, const SkBitmap&)>& callback,
-      const SkColorType color_type) OVERRIDE;
-  virtual bool CanCopyFromBackingStore() OVERRIDE;
+      const SkColorType color_type) override;
+  virtual bool CanCopyFromBackingStore() override;
 #if defined(OS_ANDROID)
-  virtual void LockBackingStore() OVERRIDE;
-  virtual void UnlockBackingStore() OVERRIDE;
+  virtual void LockBackingStore() override;
+  virtual void UnlockBackingStore() override;
 #endif
   virtual void ForwardMouseEvent(
-      const blink::WebMouseEvent& mouse_event) OVERRIDE;
+      const blink::WebMouseEvent& mouse_event) override;
   virtual void ForwardWheelEvent(
-      const blink::WebMouseWheelEvent& wheel_event) OVERRIDE;
+      const blink::WebMouseWheelEvent& wheel_event) override;
   virtual void ForwardKeyboardEvent(
-      const NativeWebKeyboardEvent& key_event) OVERRIDE;
-  virtual RenderProcessHost* GetProcess() const OVERRIDE;
-  virtual int GetRoutingID() const OVERRIDE;
-  virtual RenderWidgetHostView* GetView() const OVERRIDE;
-  virtual bool IsLoading() const OVERRIDE;
-  virtual bool IsRenderView() const OVERRIDE;
-  virtual void ResizeRectChanged(const gfx::Rect& new_rect) OVERRIDE;
-  virtual void RestartHangMonitorTimeout() OVERRIDE;
-  virtual void SetIgnoreInputEvents(bool ignore_input_events) OVERRIDE;
-  virtual void WasResized() OVERRIDE;
+      const NativeWebKeyboardEvent& key_event) override;
+  virtual RenderProcessHost* GetProcess() const override;
+  virtual int GetRoutingID() const override;
+  virtual RenderWidgetHostView* GetView() const override;
+  virtual bool IsLoading() const override;
+  virtual bool IsRenderView() const override;
+  virtual void ResizeRectChanged(const gfx::Rect& new_rect) override;
+  virtual void RestartHangMonitorTimeout() override;
+  virtual void SetIgnoreInputEvents(bool ignore_input_events) override;
+  virtual void WasResized() override;
   virtual void AddKeyPressEventCallback(
-      const KeyPressEventCallback& callback) OVERRIDE;
+      const KeyPressEventCallback& callback) override;
   virtual void RemoveKeyPressEventCallback(
-      const KeyPressEventCallback& callback) OVERRIDE;
+      const KeyPressEventCallback& callback) override;
   virtual void AddMouseEventCallback(
-      const MouseEventCallback& callback) OVERRIDE;
+      const MouseEventCallback& callback) override;
   virtual void RemoveMouseEventCallback(
-      const MouseEventCallback& callback) OVERRIDE;
-  virtual void GetWebScreenInfo(blink::WebScreenInfo* result) OVERRIDE;
+      const MouseEventCallback& callback) override;
+  virtual void GetWebScreenInfo(blink::WebScreenInfo* result) override;
 
-  virtual SkColorType PreferredReadbackFormat() OVERRIDE;
+  virtual SkColorType PreferredReadbackFormat() override;
 
   // Forces redraw in the renderer and when the update reaches the browser
   // grabs snapshot from the compositor. Returns PNG-encoded snapshot.
@@ -199,10 +199,10 @@ class CONTENT_EXPORT RenderWidgetHostImpl
   virtual void Shutdown();
 
   // IPC::Listener
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& msg) override;
 
   // Sends a message to the corresponding object in the renderer.
-  virtual bool Send(IPC::Message* msg) OVERRIDE;
+  virtual bool Send(IPC::Message* msg) override;
 
   // Indicates if the page has finished loading.
   virtual void SetIsLoading(bool is_loading);
@@ -279,11 +279,11 @@ class CONTENT_EXPORT RenderWidgetHostImpl
 
   // TouchEmulatorClient implementation.
   virtual void ForwardGestureEvent(
-      const blink::WebGestureEvent& gesture_event) OVERRIDE;
+      const blink::WebGestureEvent& gesture_event) override;
   virtual void ForwardEmulatedTouchEvent(
-      const blink::WebTouchEvent& touch_event) OVERRIDE;
-  virtual void SetCursor(const WebCursor& cursor) OVERRIDE;
-  virtual void ShowContextMenuAtPoint(const gfx::Point& point) OVERRIDE;
+      const blink::WebTouchEvent& touch_event) override;
+  virtual void SetCursor(const WebCursor& cursor) override;
+  virtual void ShowContextMenuAtPoint(const gfx::Point& point) override;
 
   // Queues a synthetic gesture for testing purposes.  Invokes the on_complete
   // callback when the gesture is finished running.
@@ -437,7 +437,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
   void FlushInput();
 
   // InputRouterClient
-  virtual void SetNeedsFlush() OVERRIDE;
+  virtual void SetNeedsFlush() override;
 
   // Indicates whether the renderer drives the RenderWidgetHosts's size or the
   // other way around.
@@ -484,7 +484,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
 #endif
 
  protected:
-  virtual RenderWidgetHostImpl* AsRenderWidgetHostImpl() OVERRIDE;
+  virtual RenderWidgetHostImpl* AsRenderWidgetHostImpl() override;
 
   // Create a LatencyInfo struct with INPUT_EVENT_LATENCY_RWH_COMPONENT
   // component if it is not already in |original|. And if |original| is
@@ -644,23 +644,23 @@ class CONTENT_EXPORT RenderWidgetHostImpl
   // InputRouterClient
   virtual InputEventAckState FilterInputEvent(
       const blink::WebInputEvent& event,
-      const ui::LatencyInfo& latency_info) OVERRIDE;
-  virtual void IncrementInFlightEventCount() OVERRIDE;
-  virtual void DecrementInFlightEventCount() OVERRIDE;
-  virtual void OnHasTouchEventHandlers(bool has_handlers) OVERRIDE;
-  virtual void DidFlush() OVERRIDE;
-  virtual void DidOverscroll(const DidOverscrollParams& params) OVERRIDE;
+      const ui::LatencyInfo& latency_info) override;
+  virtual void IncrementInFlightEventCount() override;
+  virtual void DecrementInFlightEventCount() override;
+  virtual void OnHasTouchEventHandlers(bool has_handlers) override;
+  virtual void DidFlush() override;
+  virtual void DidOverscroll(const DidOverscrollParams& params) override;
 
   // InputAckHandler
   virtual void OnKeyboardEventAck(const NativeWebKeyboardEvent& event,
-                                  InputEventAckState ack_result) OVERRIDE;
+                                  InputEventAckState ack_result) override;
   virtual void OnWheelEventAck(const MouseWheelEventWithLatencyInfo& event,
-                               InputEventAckState ack_result) OVERRIDE;
+                               InputEventAckState ack_result) override;
   virtual void OnTouchEventAck(const TouchEventWithLatencyInfo& event,
-                               InputEventAckState ack_result) OVERRIDE;
+                               InputEventAckState ack_result) override;
   virtual void OnGestureEventAck(const GestureEventWithLatencyInfo& event,
-                                 InputEventAckState ack_result) OVERRIDE;
-  virtual void OnUnexpectedEventAck(UnexpectedEventAckType type) OVERRIDE;
+                                 InputEventAckState ack_result) override;
+  virtual void OnUnexpectedEventAck(UnexpectedEventAckType type) override;
 
   void OnSyntheticGestureCompleted(SyntheticGesture::Result result);
 
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index d70356d..fdc0971 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -70,47 +70,47 @@ class MockInputRouter : public InputRouter {
   virtual ~MockInputRouter() {}
 
   // InputRouter
-  virtual void Flush() OVERRIDE {
+  virtual void Flush() override {
     flush_called_ = true;
   }
-  virtual bool SendInput(scoped_ptr<IPC::Message> message) OVERRIDE {
+  virtual bool SendInput(scoped_ptr<IPC::Message> message) override {
     send_event_called_ = true;
     return true;
   }
   virtual void SendMouseEvent(
-      const MouseEventWithLatencyInfo& mouse_event) OVERRIDE {
+      const MouseEventWithLatencyInfo& mouse_event) override {
     sent_mouse_event_ = true;
   }
   virtual void SendWheelEvent(
-      const MouseWheelEventWithLatencyInfo& wheel_event) OVERRIDE {
+      const MouseWheelEventWithLatencyInfo& wheel_event) override {
     sent_wheel_event_ = true;
   }
   virtual void SendKeyboardEvent(
       const NativeWebKeyboardEvent& key_event,
       const ui::LatencyInfo& latency_info,
-      bool is_shortcut) OVERRIDE {
+      bool is_shortcut) override {
     sent_keyboard_event_ = true;
   }
   virtual void SendGestureEvent(
-      const GestureEventWithLatencyInfo& gesture_event) OVERRIDE {
+      const GestureEventWithLatencyInfo& gesture_event) override {
     sent_gesture_event_ = true;
   }
   virtual void SendTouchEvent(
-      const TouchEventWithLatencyInfo& touch_event) OVERRIDE {
+      const TouchEventWithLatencyInfo& touch_event) override {
     send_touch_event_not_cancelled_ =
         client_->FilterInputEvent(touch_event.event, touch_event.latency) ==
         INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
   }
-  virtual const NativeWebKeyboardEvent* GetLastKeyboardEvent() const OVERRIDE {
+  virtual const NativeWebKeyboardEvent* GetLastKeyboardEvent() const override {
     NOTREACHED();
     return NULL;
   }
-  virtual bool ShouldForwardTouchEvent() const OVERRIDE { return true; }
-  virtual void OnViewUpdated(int view_flags) OVERRIDE {}
-  virtual bool HasPendingEvents() const OVERRIDE { return false; }
+  virtual bool ShouldForwardTouchEvent() const override { return true; }
+  virtual void OnViewUpdated(int view_flags) override {}
+  virtual bool HasPendingEvents() const override { return false; }
 
   // IPC::Listener
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& message) override {
     message_received_ = true;
     return false;
   }
@@ -153,7 +153,7 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
 
   virtual void OnTouchEventAck(
       const TouchEventWithLatencyInfo& event,
-      InputEventAckState ack_result) OVERRIDE {
+      InputEventAckState ack_result) override {
     // Sniff touch acks.
     acked_touch_event_type_ = event.event.type;
     RenderWidgetHostImpl::OnTouchEventAck(event, ack_result);
@@ -185,7 +185,7 @@ class MockRenderWidgetHost : public RenderWidgetHostImpl {
   }
 
  protected:
-  virtual void NotifyRendererUnresponsive() OVERRIDE {
+  virtual void NotifyRendererUnresponsive() override {
     unresponsive_timer_fired_ = true;
   }
 
@@ -215,7 +215,7 @@ class RenderWidgetHostProcess : public MockRenderProcessHost {
   // Fills the given update parameters with resonable default values.
   void InitUpdateRectParams(ViewHostMsg_UpdateRect_Params* params);
 
-  virtual bool HasConnection() const OVERRIDE { return true; }
+  virtual bool HasConnection() const override { return true; }
 
  protected:
   // Indicates the flags that should be sent with a repaint request. This
@@ -278,27 +278,27 @@ class TestView : public TestRenderWidgetHostView {
   }
 
   // RenderWidgetHostView override.
-  virtual gfx::Rect GetViewBounds() const OVERRIDE {
+  virtual gfx::Rect GetViewBounds() const override {
     return bounds_;
   }
   virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch,
-                                      InputEventAckState ack_result) OVERRIDE {
+                                      InputEventAckState ack_result) override {
     acked_event_ = touch.event;
     ++acked_event_count_;
   }
   virtual void WheelEventAck(const WebMouseWheelEvent& event,
-                             InputEventAckState ack_result) OVERRIDE {
+                             InputEventAckState ack_result) override {
     if (ack_result == INPUT_EVENT_ACK_STATE_CONSUMED)
       return;
     unhandled_wheel_event_count_++;
     unhandled_wheel_event_ = event;
   }
   virtual void GestureEventAck(const WebGestureEvent& event,
-                               InputEventAckState ack_result) OVERRIDE {
+                               InputEventAckState ack_result) override {
     gesture_event_type_ = event.type;
     ack_result_ = ack_result;
   }
-  virtual gfx::Size GetPhysicalBackingSize() const OVERRIDE {
+  virtual gfx::Size GetPhysicalBackingSize() const override {
     if (use_fake_physical_backing_size_)
       return mock_physical_backing_size_;
     return TestRenderWidgetHostView::GetPhysicalBackingSize();
@@ -376,20 +376,20 @@ class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate {
 
  protected:
   virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
-                                      bool* is_keyboard_shortcut) OVERRIDE {
+                                      bool* is_keyboard_shortcut) override {
     prehandle_keyboard_event_type_ = event.type;
     prehandle_keyboard_event_called_ = true;
     return prehandle_keyboard_event_;
   }
 
   virtual void HandleKeyboardEvent(
-      const NativeWebKeyboardEvent& event) OVERRIDE {
+      const NativeWebKeyboardEvent& event) override {
     unhandled_keyboard_event_type_ = event.type;
     unhandled_keyboard_event_called_ = true;
   }
 
   virtual bool HandleWheelEvent(
-      const blink::WebMouseWheelEvent& event) OVERRIDE {
+      const blink::WebMouseWheelEvent& event) override {
     handle_wheel_event_called_ = true;
     return handle_wheel_event_;
   }
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index 9978bf4..7385804 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -96,116 +96,116 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
   virtual ~RenderWidgetHostViewAndroid();
 
   // RenderWidgetHostView implementation.
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
-  virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& msg) override;
+  virtual void InitAsChild(gfx::NativeView parent_view) override;
   virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
-                           const gfx::Rect& pos) OVERRIDE;
+                           const gfx::Rect& pos) override;
   virtual void InitAsFullscreen(
-      RenderWidgetHostView* reference_host_view) OVERRIDE;
-  virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
-  virtual void WasShown() OVERRIDE;
-  virtual void WasHidden() OVERRIDE;
-  virtual void SetSize(const gfx::Size& size) OVERRIDE;
-  virtual void SetBounds(const gfx::Rect& rect) OVERRIDE;
-  virtual gfx::Vector2dF GetLastScrollOffset() const OVERRIDE;
-  virtual gfx::NativeView GetNativeView() const OVERRIDE;
-  virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE;
-  virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
+      RenderWidgetHostView* reference_host_view) override;
+  virtual RenderWidgetHost* GetRenderWidgetHost() const override;
+  virtual void WasShown() override;
+  virtual void WasHidden() override;
+  virtual void SetSize(const gfx::Size& size) override;
+  virtual void SetBounds(const gfx::Rect& rect) override;
+  virtual gfx::Vector2dF GetLastScrollOffset() const override;
+  virtual gfx::NativeView GetNativeView() const override;
+  virtual gfx::NativeViewId GetNativeViewId() const override;
+  virtual gfx::NativeViewAccessible GetNativeViewAccessible() override;
   virtual void MovePluginWindows(
-      const std::vector<WebPluginGeometry>& moves) OVERRIDE;
-  virtual void Focus() OVERRIDE;
-  virtual void Blur() OVERRIDE;
-  virtual bool HasFocus() const OVERRIDE;
-  virtual bool IsSurfaceAvailableForCopy() const OVERRIDE;
-  virtual void Show() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual bool IsShowing() OVERRIDE;
-  virtual gfx::Rect GetViewBounds() const OVERRIDE;
-  virtual gfx::Size GetPhysicalBackingSize() const OVERRIDE;
-  virtual float GetTopControlsLayoutHeight() const OVERRIDE;
-  virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE;
-  virtual void SetIsLoading(bool is_loading) OVERRIDE;
+      const std::vector<WebPluginGeometry>& moves) override;
+  virtual void Focus() override;
+  virtual void Blur() override;
+  virtual bool HasFocus() const override;
+  virtual bool IsSurfaceAvailableForCopy() const override;
+  virtual void Show() override;
+  virtual void Hide() override;
+  virtual bool IsShowing() override;
+  virtual gfx::Rect GetViewBounds() const override;
+  virtual gfx::Size GetPhysicalBackingSize() const override;
+  virtual float GetTopControlsLayoutHeight() const override;
+  virtual void UpdateCursor(const WebCursor& cursor) override;
+  virtual void SetIsLoading(bool is_loading) override;
   virtual void TextInputStateChanged(
-      const ViewHostMsg_TextInputState_Params& params) OVERRIDE;
-  virtual void ImeCancelComposition() OVERRIDE;
-  virtual void FocusedNodeChanged(bool is_editable_node) OVERRIDE;
+      const ViewHostMsg_TextInputState_Params& params) override;
+  virtual void ImeCancelComposition() override;
+  virtual void FocusedNodeChanged(bool is_editable_node) override;
   virtual void RenderProcessGone(base::TerminationStatus status,
-                                 int error_code) OVERRIDE;
-  virtual void Destroy() OVERRIDE;
-  virtual void SetTooltipText(const base::string16& tooltip_text) OVERRIDE;
+                                 int error_code) override;
+  virtual void Destroy() override;
+  virtual void SetTooltipText(const base::string16& tooltip_text) override;
   virtual void SelectionChanged(const base::string16& text,
                                 size_t offset,
-                                const gfx::Range& range) OVERRIDE;
+                                const gfx::Range& range) override;
   virtual void SelectionBoundsChanged(
-      const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE;
-  virtual void AcceleratedSurfaceInitialized(int route_id) OVERRIDE;
-  virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE;
-  virtual void SetBackgroundOpaque(bool transparent) OVERRIDE;
+      const ViewHostMsg_SelectionBounds_Params& params) override;
+  virtual void AcceleratedSurfaceInitialized(int route_id) override;
+  virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) override;
+  virtual void SetBackgroundOpaque(bool transparent) override;
   virtual void CopyFromCompositingSurface(
       const gfx::Rect& src_subrect,
       const gfx::Size& dst_size,
       CopyFromCompositingSurfaceCallback& callback,
-      const SkColorType color_type) OVERRIDE;
+      const SkColorType color_type) override;
   virtual void CopyFromCompositingSurfaceToVideoFrame(
       const gfx::Rect& src_subrect,
       const scoped_refptr<media::VideoFrame>& target,
-      const base::Callback<void(bool)>& callback) OVERRIDE;
-  virtual bool CanCopyToVideoFrame() const OVERRIDE;
-  virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE;
-  virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
-  virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
+      const base::Callback<void(bool)>& callback) override;
+  virtual bool CanCopyToVideoFrame() const override;
+  virtual void GetScreenInfo(blink::WebScreenInfo* results) override;
+  virtual gfx::Rect GetBoundsInRootWindow() override;
+  virtual gfx::GLSurfaceHandle GetCompositingSurface() override;
   virtual void ProcessAckedTouchEvent(const TouchEventWithLatencyInfo& touch,
-                                      InputEventAckState ack_result) OVERRIDE;
+                                      InputEventAckState ack_result) override;
   virtual InputEventAckState FilterInputEvent(
-      const blink::WebInputEvent& input_event) OVERRIDE;
-  virtual void OnSetNeedsFlushInput() OVERRIDE;
+      const blink::WebInputEvent& input_event) override;
+  virtual void OnSetNeedsFlushInput() override;
   virtual void GestureEventAck(const blink::WebGestureEvent& event,
-                               InputEventAckState ack_result) OVERRIDE;
+                               InputEventAckState ack_result) override;
   virtual BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
-      BrowserAccessibilityDelegate* delegate) OVERRIDE;
-  virtual bool LockMouse() OVERRIDE;
-  virtual void UnlockMouse() OVERRIDE;
+      BrowserAccessibilityDelegate* delegate) override;
+  virtual bool LockMouse() override;
+  virtual void UnlockMouse() override;
   virtual void OnSwapCompositorFrame(
       uint32 output_surface_id,
-      scoped_ptr<cc::CompositorFrame> frame) OVERRIDE;
-  virtual void DidOverscroll(const DidOverscrollParams& params) OVERRIDE;
-  virtual void DidStopFlinging() OVERRIDE;
+      scoped_ptr<cc::CompositorFrame> frame) override;
+  virtual void DidOverscroll(const DidOverscrollParams& params) override;
+  virtual void DidStopFlinging() override;
   virtual void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
-                                       const SkBitmap& zoomed_bitmap) OVERRIDE;
+                                       const SkBitmap& zoomed_bitmap) override;
   virtual scoped_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget()
-      OVERRIDE;
-  virtual void LockCompositingSurface() OVERRIDE;
-  virtual void UnlockCompositingSurface() OVERRIDE;
+      override;
+  virtual void LockCompositingSurface() override;
+  virtual void UnlockCompositingSurface() override;
   virtual void OnTextSurroundingSelectionResponse(const base::string16& content,
                                                   size_t start_offset,
-                                                  size_t end_offset) OVERRIDE;
+                                                  size_t end_offset) override;
 
   // cc::DelegatedFrameResourceCollectionClient implementation.
-  virtual void UnusedResourcesAreAvailable() OVERRIDE;
+  virtual void UnusedResourcesAreAvailable() override;
 
   // ui::GestureProviderClient implementation.
-  virtual void OnGestureEvent(const ui::GestureEventData& gesture) OVERRIDE;
+  virtual void OnGestureEvent(const ui::GestureEventData& gesture) override;
 
   // ui::WindowAndroidObserver implementation.
-  virtual void OnCompositingDidCommit() OVERRIDE;
-  virtual void OnAttachCompositor() OVERRIDE;
-  virtual void OnDetachCompositor() OVERRIDE;
+  virtual void OnCompositingDidCommit() override;
+  virtual void OnAttachCompositor() override;
+  virtual void OnDetachCompositor() override;
   virtual void OnVSync(base::TimeTicks frame_time,
-                       base::TimeDelta vsync_period) OVERRIDE;
-  virtual void OnAnimate(base::TimeTicks begin_frame_time) OVERRIDE;
+                       base::TimeDelta vsync_period) override;
+  virtual void OnAnimate(base::TimeTicks begin_frame_time) override;
 
   // ImageTransportFactoryAndroidObserver implementation.
-  virtual void OnLostResources() OVERRIDE;
+  virtual void OnLostResources() override;
 
   // DelegatedFrameEvictor implementation
-  virtual void EvictDelegatedFrame() OVERRIDE;
+  virtual void EvictDelegatedFrame() override;
 
-  virtual SkColorType PreferredReadbackFormat() OVERRIDE;
+  virtual SkColorType PreferredReadbackFormat() override;
 
   // GestureTextSelectorClient implementation.
-  virtual void ShowSelectionHandlesAutomatically() OVERRIDE;
-  virtual void SelectRange(float x1, float y1, float x2, float y2) OVERRIDE;
-  virtual void LongPress(base::TimeTicks time, float x, float y) OVERRIDE;
+  virtual void ShowSelectionHandlesAutomatically() override;
+  virtual void SelectRange(float x1, float y1, float x2, float y2) override;
+  virtual void LongPress(base::TimeTicks time, float x, float y) override;
 
   // Non-virtual methods
   void SetContentViewCore(ContentViewCoreImpl* content_view_core);
@@ -260,14 +260,14 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
 
  private:
   // TouchSelectionControllerClient implementation.
-  virtual bool SupportsAnimation() const OVERRIDE;
-  virtual void SetNeedsAnimate() OVERRIDE;
-  virtual void MoveCaret(const gfx::PointF& position) OVERRIDE;
+  virtual bool SupportsAnimation() const override;
+  virtual void SetNeedsAnimate() override;
+  virtual void MoveCaret(const gfx::PointF& position) override;
   virtual void SelectBetweenCoordinates(const gfx::PointF& start,
-                                        const gfx::PointF& end) OVERRIDE;
+                                        const gfx::PointF& end) override;
   virtual void OnSelectionEvent(SelectionEventType event,
-                                const gfx::PointF& anchor_position) OVERRIDE;
-  virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() OVERRIDE;
+                                const gfx::PointF& anchor_position) override;
+  virtual scoped_ptr<TouchHandleDrawable> CreateDrawable() override;
 
   void RunAckCallbacks();
 
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index aea5115..5f121e3 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -357,11 +357,11 @@ class RenderWidgetHostViewAura::EventFilterForPopupExit
   }
 
   // Overridden from ui::EventHandler
-  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
+  virtual void OnMouseEvent(ui::MouseEvent* event) override {
     rwhva_->ApplyEventFilterForPopupExit(event);
   }
 
-  virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE {
+  virtual void OnTouchEvent(ui::TouchEvent* event) override {
     rwhva_->ApplyEventFilterForPopupExit(event);
   }
 
@@ -408,13 +408,13 @@ class RenderWidgetHostViewAura::WindowObserver : public aura::WindowObserver {
   }
 
   // Overridden from aura::WindowObserver:
-  virtual void OnWindowAddedToRootWindow(aura::Window* window) OVERRIDE {
+  virtual void OnWindowAddedToRootWindow(aura::Window* window) override {
     if (window == view_->window_)
       view_->AddedToRootWindow();
   }
 
   virtual void OnWindowRemovingFromRootWindow(aura::Window* window,
-                                              aura::Window* new_root) OVERRIDE {
+                                              aura::Window* new_root) override {
     if (window == view_->window_)
       view_->RemovingFromRootWindow();
   }
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
index 289dd4c..c64ef6e 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -135,186 +135,186 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
   explicit RenderWidgetHostViewAura(RenderWidgetHost* host);
 
   // RenderWidgetHostView implementation.
-  virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE;
-  virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
-  virtual void SetSize(const gfx::Size& size) OVERRIDE;
-  virtual void SetBounds(const gfx::Rect& rect) OVERRIDE;
-  virtual gfx::Vector2dF GetLastScrollOffset() const OVERRIDE;
-  virtual gfx::NativeView GetNativeView() const OVERRIDE;
-  virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE;
-  virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
-  virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;
-  virtual bool HasFocus() const OVERRIDE;
-  virtual bool IsSurfaceAvailableForCopy() const OVERRIDE;
-  virtual void Show() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual bool IsShowing() OVERRIDE;
-  virtual gfx::Rect GetViewBounds() const OVERRIDE;
-  virtual void SetBackgroundOpaque(bool opaque) OVERRIDE;
-  virtual gfx::Size GetVisibleViewportSize() const OVERRIDE;
-  virtual void SetInsets(const gfx::Insets& insets) OVERRIDE;
+  virtual void InitAsChild(gfx::NativeView parent_view) override;
+  virtual RenderWidgetHost* GetRenderWidgetHost() const override;
+  virtual void SetSize(const gfx::Size& size) override;
+  virtual void SetBounds(const gfx::Rect& rect) override;
+  virtual gfx::Vector2dF GetLastScrollOffset() const override;
+  virtual gfx::NativeView GetNativeView() const override;
+  virtual gfx::NativeViewId GetNativeViewId() const override;
+  virtual gfx::NativeViewAccessible GetNativeViewAccessible() override;
+  virtual ui::TextInputClient* GetTextInputClient() override;
+  virtual bool HasFocus() const override;
+  virtual bool IsSurfaceAvailableForCopy() const override;
+  virtual void Show() override;
+  virtual void Hide() override;
+  virtual bool IsShowing() override;
+  virtual gfx::Rect GetViewBounds() const override;
+  virtual void SetBackgroundOpaque(bool opaque) override;
+  virtual gfx::Size GetVisibleViewportSize() const override;
+  virtual void SetInsets(const gfx::Insets& insets) override;
 
   // Overridden from RenderWidgetHostViewBase:
   virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
-                           const gfx::Rect& pos) OVERRIDE;
+                           const gfx::Rect& pos) override;
   virtual void InitAsFullscreen(
-      RenderWidgetHostView* reference_host_view) OVERRIDE;
-  virtual void WasShown() OVERRIDE;
-  virtual void WasHidden() OVERRIDE;
+      RenderWidgetHostView* reference_host_view) override;
+  virtual void WasShown() override;
+  virtual void WasHidden() override;
   virtual void MovePluginWindows(
-      const std::vector<WebPluginGeometry>& moves) OVERRIDE;
-  virtual void Focus() OVERRIDE;
-  virtual void Blur() OVERRIDE;
-  virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE;
-  virtual void SetIsLoading(bool is_loading) OVERRIDE;
+      const std::vector<WebPluginGeometry>& moves) override;
+  virtual void Focus() override;
+  virtual void Blur() override;
+  virtual void UpdateCursor(const WebCursor& cursor) override;
+  virtual void SetIsLoading(bool is_loading) override;
   virtual void TextInputStateChanged(
-      const ViewHostMsg_TextInputState_Params& params) OVERRIDE;
-  virtual void ImeCancelComposition() OVERRIDE;
+      const ViewHostMsg_TextInputState_Params& params) override;
+  virtual void ImeCancelComposition() override;
   virtual void ImeCompositionRangeChanged(
       const gfx::Range& range,
-      const std::vector<gfx::Rect>& character_bounds) OVERRIDE;
+      const std::vector<gfx::Rect>& character_bounds) override;
   virtual void RenderProcessGone(base::TerminationStatus status,
-                                 int error_code) OVERRIDE;
-  virtual void Destroy() OVERRIDE;
-  virtual void SetTooltipText(const base::string16& tooltip_text) OVERRIDE;
+                                 int error_code) override;
+  virtual void Destroy() override;
+  virtual void SetTooltipText(const base::string16& tooltip_text) override;
   virtual void SelectionChanged(const base::string16& text,
                                 size_t offset,
-                                const gfx::Range& range) OVERRIDE;
-  virtual gfx::Size GetRequestedRendererSize() const OVERRIDE;
+                                const gfx::Range& range) override;
+  virtual gfx::Size GetRequestedRendererSize() const override;
   virtual void SelectionBoundsChanged(
-      const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE;
+      const ViewHostMsg_SelectionBounds_Params& params) override;
   virtual void CopyFromCompositingSurface(
       const gfx::Rect& src_subrect,
       const gfx::Size& dst_size,
       CopyFromCompositingSurfaceCallback& callback,
-      const SkColorType color_type) OVERRIDE;
+      const SkColorType color_type) override;
   virtual void CopyFromCompositingSurfaceToVideoFrame(
       const gfx::Rect& src_subrect,
       const scoped_refptr<media::VideoFrame>& target,
-      const base::Callback<void(bool)>& callback) OVERRIDE;
-  virtual bool CanCopyToVideoFrame() const OVERRIDE;
-  virtual bool CanSubscribeFrame() const OVERRIDE;
+      const base::Callback<void(bool)>& callback) override;
+  virtual bool CanCopyToVideoFrame() const override;
+  virtual bool CanSubscribeFrame() const override;
   virtual void BeginFrameSubscription(
-      scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) OVERRIDE;
-  virtual void EndFrameSubscription() OVERRIDE;
-  virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE;
-  virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE;
-  virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
+      scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) override;
+  virtual void EndFrameSubscription() override;
+  virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) override;
+  virtual void GetScreenInfo(blink::WebScreenInfo* results) override;
+  virtual gfx::Rect GetBoundsInRootWindow() override;
   virtual void WheelEventAck(const blink::WebMouseWheelEvent& event,
-                             InputEventAckState ack_result) OVERRIDE;
+                             InputEventAckState ack_result) override;
   virtual void GestureEventAck(const blink::WebGestureEvent& event,
-                               InputEventAckState ack_result) OVERRIDE;
+                               InputEventAckState ack_result) override;
   virtual void ProcessAckedTouchEvent(
       const TouchEventWithLatencyInfo& touch,
-      InputEventAckState ack_result) OVERRIDE;
+      InputEventAckState ack_result) override;
   virtual scoped_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget()
-      OVERRIDE;
+      override;
   virtual InputEventAckState FilterInputEvent(
-      const blink::WebInputEvent& input_event) OVERRIDE;
-  virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
+      const blink::WebInputEvent& input_event) override;
+  virtual gfx::GLSurfaceHandle GetCompositingSurface() override;
   virtual BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
-      BrowserAccessibilityDelegate* delegate) OVERRIDE;
-  virtual gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() OVERRIDE;
+      BrowserAccessibilityDelegate* delegate) override;
+  virtual gfx::AcceleratedWidget AccessibilityGetAcceleratedWidget() override;
   virtual gfx::NativeViewAccessible AccessibilityGetNativeViewAccessible()
-      OVERRIDE;
+      override;
   virtual void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
-                                       const SkBitmap& zoomed_bitmap) OVERRIDE;
-  virtual bool LockMouse() OVERRIDE;
-  virtual void UnlockMouse() OVERRIDE;
+                                       const SkBitmap& zoomed_bitmap) override;
+  virtual bool LockMouse() override;
+  virtual void UnlockMouse() override;
   virtual void OnSwapCompositorFrame(
       uint32 output_surface_id,
-      scoped_ptr<cc::CompositorFrame> frame) OVERRIDE;
-  virtual void DidStopFlinging() OVERRIDE;
+      scoped_ptr<cc::CompositorFrame> frame) override;
+  virtual void DidStopFlinging() override;
 
 #if defined(OS_WIN)
   virtual void SetParentNativeViewAccessible(
-      gfx::NativeViewAccessible accessible_parent) OVERRIDE;
-  virtual gfx::NativeViewId GetParentForWindowlessPlugin() const OVERRIDE;
+      gfx::NativeViewAccessible accessible_parent) override;
+  virtual gfx::NativeViewId GetParentForWindowlessPlugin() const override;
 #endif
 
   // Overridden from ui::TextInputClient:
   virtual void SetCompositionText(
-      const ui::CompositionText& composition) OVERRIDE;
-  virtual void ConfirmCompositionText() OVERRIDE;
-  virtual void ClearCompositionText() OVERRIDE;
-  virtual void InsertText(const base::string16& text) OVERRIDE;
-  virtual void InsertChar(base::char16 ch, int flags) OVERRIDE;
-  virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE;
-  virtual ui::TextInputType GetTextInputType() const OVERRIDE;
-  virtual ui::TextInputMode GetTextInputMode() const OVERRIDE;
-  virtual bool CanComposeInline() const OVERRIDE;
-  virtual gfx::Rect GetCaretBounds() const OVERRIDE;
+      const ui::CompositionText& composition) override;
+  virtual void ConfirmCompositionText() override;
+  virtual void ClearCompositionText() override;
+  virtual void InsertText(const base::string16& text) override;
+  virtual void InsertChar(base::char16 ch, int flags) override;
+  virtual gfx::NativeWindow GetAttachedWindow() const override;
+  virtual ui::TextInputType GetTextInputType() const override;
+  virtual ui::TextInputMode GetTextInputMode() const override;
+  virtual bool CanComposeInline() const override;
+  virtual gfx::Rect GetCaretBounds() const override;
   virtual bool GetCompositionCharacterBounds(uint32 index,
-                                             gfx::Rect* rect) const OVERRIDE;
-  virtual bool HasCompositionText() const OVERRIDE;
-  virtual bool GetTextRange(gfx::Range* range) const OVERRIDE;
-  virtual bool GetCompositionTextRange(gfx::Range* range) const OVERRIDE;
-  virtual bool GetSelectionRange(gfx::Range* range) const OVERRIDE;
-  virtual bool SetSelectionRange(const gfx::Range& range) OVERRIDE;
-  virtual bool DeleteRange(const gfx::Range& range) OVERRIDE;
+                                             gfx::Rect* rect) const override;
+  virtual bool HasCompositionText() const override;
+  virtual bool GetTextRange(gfx::Range* range) const override;
+  virtual bool GetCompositionTextRange(gfx::Range* range) const override;
+  virtual bool GetSelectionRange(gfx::Range* range) const override;
+  virtual bool SetSelectionRange(const gfx::Range& range) override;
+  virtual bool DeleteRange(const gfx::Range& range) override;
   virtual bool GetTextFromRange(const gfx::Range& range,
-                                base::string16* text) const OVERRIDE;
-  virtual void OnInputMethodChanged() OVERRIDE;
+                                base::string16* text) const override;
+  virtual void OnInputMethodChanged() override;
   virtual bool ChangeTextDirectionAndLayoutAlignment(
-      base::i18n::TextDirection direction) OVERRIDE;
-  virtual void ExtendSelectionAndDelete(size_t before, size_t after) OVERRIDE;
-  virtual void EnsureCaretInRect(const gfx::Rect& rect) OVERRIDE;
-  virtual void OnCandidateWindowShown() OVERRIDE;
-  virtual void OnCandidateWindowUpdated() OVERRIDE;
-  virtual void OnCandidateWindowHidden() OVERRIDE;
-  virtual bool IsEditingCommandEnabled(int command_id) OVERRIDE;
-  virtual void ExecuteEditingCommand(int command_id) OVERRIDE;
+      base::i18n::TextDirection direction) override;
+  virtual void ExtendSelectionAndDelete(size_t before, size_t after) override;
+  virtual void EnsureCaretInRect(const gfx::Rect& rect) override;
+  virtual void OnCandidateWindowShown() override;
+  virtual void OnCandidateWindowUpdated() override;
+  virtual void OnCandidateWindowHidden() override;
+  virtual bool IsEditingCommandEnabled(int command_id) override;
+  virtual void ExecuteEditingCommand(int command_id) override;
 
   // Overridden from gfx::DisplayObserver:
-  virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;
-  virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
+  virtual void OnDisplayAdded(const gfx::Display& new_display) override;
+  virtual void OnDisplayRemoved(const gfx::Display& old_display) override;
   virtual void OnDisplayMetricsChanged(const gfx::Display& display,
-                                       uint32_t metrics) OVERRIDE;
+                                       uint32_t metrics) override;
 
   // Overridden from aura::WindowDelegate:
-  virtual gfx::Size GetMinimumSize() const OVERRIDE;
-  virtual gfx::Size GetMaximumSize() const OVERRIDE;
+  virtual gfx::Size GetMinimumSize() const override;
+  virtual gfx::Size GetMaximumSize() const override;
   virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
-                               const gfx::Rect& new_bounds) OVERRIDE;
-  virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE;
-  virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
+                               const gfx::Rect& new_bounds) override;
+  virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override;
+  virtual int GetNonClientComponent(const gfx::Point& point) const override;
   virtual bool ShouldDescendIntoChildForEventHandling(
       aura::Window* child,
-      const gfx::Point& location) OVERRIDE;
-  virtual bool CanFocus() OVERRIDE;
-  virtual void OnCaptureLost() OVERRIDE;
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
-  virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
-  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
-  virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
-  virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
-  virtual bool HasHitTestMask() const OVERRIDE;
-  virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
+      const gfx::Point& location) override;
+  virtual bool CanFocus() override;
+  virtual void OnCaptureLost() override;
+  virtual void OnPaint(gfx::Canvas* canvas) override;
+  virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override;
+  virtual void OnWindowDestroying(aura::Window* window) override;
+  virtual void OnWindowDestroyed(aura::Window* window) override;
+  virtual void OnWindowTargetVisibilityChanged(bool visible) override;
+  virtual bool HasHitTestMask() const override;
+  virtual void GetHitTestMask(gfx::Path* mask) const override;
 
   // Overridden from ui::EventHandler:
-  virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
-  virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
-  virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
-  virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
-  virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+  virtual void OnKeyEvent(ui::KeyEvent* event) override;
+  virtual void OnMouseEvent(ui::MouseEvent* event) override;
+  virtual void OnScrollEvent(ui::ScrollEvent* event) override;
+  virtual void OnTouchEvent(ui::TouchEvent* event) override;
+  virtual void OnGestureEvent(ui::GestureEvent* event) override;
 
   // Overridden from aura::client::ActivationDelegate:
-  virtual bool ShouldActivate() const OVERRIDE;
+  virtual bool ShouldActivate() const override;
 
   // Overridden from aura::client::ActivationChangeObserver:
   virtual void OnWindowActivated(aura::Window* gained_activation,
-                                 aura::Window* lost_activation) OVERRIDE;
+                                 aura::Window* lost_activation) override;
 
   // Overridden from aura::client::CursorClientObserver:
-  virtual void OnCursorVisibilityChanged(bool is_visible) OVERRIDE;
+  virtual void OnCursorVisibilityChanged(bool is_visible) override;
 
   // Overridden from aura::client::FocusChangeObserver:
   virtual void OnWindowFocused(aura::Window* gained_focus,
-                               aura::Window* lost_focus) OVERRIDE;
+                               aura::Window* lost_focus) override;
 
   // Overridden from aura::WindowTreeHostObserver:
   virtual void OnHostMoved(const aura::WindowTreeHost* host,
-                           const gfx::Point& new_origin) OVERRIDE;
+                           const gfx::Point& new_origin) override;
 
 #if defined(OS_WIN)
   // Sets the cutout rects from constrained windows. These are rectangles that
@@ -356,8 +356,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
 
   // Exposed for tests.
   aura::Window* window() { return window_; }
-  virtual SkColorType PreferredReadbackFormat() OVERRIDE;
-  virtual DelegatedFrameHost* GetDelegatedFrameHost() const OVERRIDE;
+  virtual SkColorType PreferredReadbackFormat() override;
+  virtual DelegatedFrameHost* GetDelegatedFrameHost() const override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
@@ -442,15 +442,15 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
   void RemovingFromRootWindow();
 
   // DelegatedFrameHostClient implementation.
-  virtual ui::Compositor* GetCompositor() const OVERRIDE;
-  virtual ui::Layer* GetLayer() OVERRIDE;
-  virtual RenderWidgetHostImpl* GetHost() OVERRIDE;
-  virtual bool IsVisible() OVERRIDE;
+  virtual ui::Compositor* GetCompositor() const override;
+  virtual ui::Layer* GetLayer() override;
+  virtual RenderWidgetHostImpl* GetHost() override;
+  virtual bool IsVisible() override;
   virtual scoped_ptr<ResizeLock> CreateResizeLock(
-      bool defer_compositor_lock) OVERRIDE;
-  virtual gfx::Size DesiredFrameSize() OVERRIDE;
-  virtual float CurrentDeviceScaleFactor() OVERRIDE;
-  virtual gfx::Size ConvertViewSizeToPixel(const gfx::Size& size) OVERRIDE;
+      bool defer_compositor_lock) override;
+  virtual gfx::Size DesiredFrameSize() override;
+  virtual float CurrentDeviceScaleFactor() override;
+  virtual gfx::Size ConvertViewSizeToPixel(const gfx::Size& size) override;
 
   // Detaches |this| from the input method object.
   void DetachFromInputMethod();
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index e692621..073114d 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -77,23 +77,23 @@ class TestScreenPositionClient
 
   // aura::client::ScreenPositionClient overrides:
   virtual void ConvertPointToScreen(const aura::Window* window,
-      gfx::Point* point) OVERRIDE {
+      gfx::Point* point) override {
     point->Offset(-1, -1);
   }
 
   virtual void ConvertPointFromScreen(const aura::Window* window,
-      gfx::Point* point) OVERRIDE {
+      gfx::Point* point) override {
     point->Offset(1, 1);
   }
 
   virtual void ConvertHostPointToScreen(aura::Window* window,
-      gfx::Point* point) OVERRIDE {
+      gfx::Point* point) override {
     ConvertPointToScreen(window, point);
   }
 
   virtual void SetBounds(aura::Window* window,
       const gfx::Rect& bounds,
-      const gfx::Display& display) OVERRIDE {
+      const gfx::Display& display) override {
   }
 };
 
@@ -121,24 +121,24 @@ class TestOverscrollDelegate : public OverscrollControllerDelegate {
 
  private:
   // Overridden from OverscrollControllerDelegate:
-  virtual gfx::Rect GetVisibleBounds() const OVERRIDE {
+  virtual gfx::Rect GetVisibleBounds() const override {
     return view_->IsShowing() ? view_->GetViewBounds() : gfx::Rect();
   }
 
-  virtual bool OnOverscrollUpdate(float delta_x, float delta_y) OVERRIDE {
+  virtual bool OnOverscrollUpdate(float delta_x, float delta_y) override {
     delta_x_ = delta_x;
     delta_y_ = delta_y;
     return true;
   }
 
-  virtual void OnOverscrollComplete(OverscrollMode overscroll_mode) OVERRIDE {
+  virtual void OnOverscrollComplete(OverscrollMode overscroll_mode) override {
     EXPECT_EQ(current_mode_, overscroll_mode);
     completed_mode_ = overscroll_mode;
     current_mode_ = OVERSCROLL_NONE;
   }
 
   virtual void OnOverscrollModeChange(OverscrollMode old_mode,
-                                      OverscrollMode new_mode) OVERRIDE {
+                                      OverscrollMode new_mode) override {
     EXPECT_EQ(current_mode_, old_mode);
     current_mode_ = new_mode;
     delta_x_ = delta_y_ = 0.f;
@@ -174,7 +174,7 @@ class TestWindowObserver : public aura::WindowObserver {
   bool destroyed() const { return destroyed_; }
 
   // aura::WindowObserver overrides:
-  virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE {
+  virtual void OnWindowDestroyed(aura::Window* window) override {
     CHECK_EQ(window, window_);
     destroyed_ = true;
     window_ = NULL;
@@ -198,7 +198,7 @@ class FakeFrameSubscriber : public RenderWidgetHostViewFrameSubscriber {
   virtual bool ShouldCaptureFrame(const gfx::Rect& damage_rect,
                                   base::TimeTicks present_time,
                                   scoped_refptr<media::VideoFrame>* storage,
-                                  DeliverFrameCallback* callback) OVERRIDE {
+                                  DeliverFrameCallback* callback) override {
     *storage = media::VideoFrame::CreateFrame(media::VideoFrame::YV12,
                                               size_,
                                               gfx::Rect(size_),
@@ -227,7 +227,7 @@ class FakeRenderWidgetHostViewAura : public RenderWidgetHostViewAura {
   virtual ~FakeRenderWidgetHostViewAura() {}
 
   virtual scoped_ptr<ResizeLock> CreateResizeLock(
-      bool defer_compositor_lock) OVERRIDE {
+      bool defer_compositor_lock) override {
     gfx::Size desired_size = window()->bounds().size();
     return scoped_ptr<ResizeLock>(
         new FakeResizeLock(desired_size, defer_compositor_lock));
@@ -238,12 +238,12 @@ class FakeRenderWidgetHostViewAura : public RenderWidgetHostViewAura {
         window()->GetHost()->compositor());
   }
 
-  virtual bool ShouldCreateResizeLock() OVERRIDE {
+  virtual bool ShouldCreateResizeLock() override {
     return GetDelegatedFrameHost()->ShouldCreateResizeLockForTesting();
   }
 
   virtual void RequestCopyOfOutput(scoped_ptr<cc::CopyOutputRequest> request)
-      OVERRIDE {
+      override {
     last_copy_request_ = request.Pass();
     if (last_copy_request_->has_texture_mailbox()) {
       // Give the resulting texture a size.
@@ -292,21 +292,21 @@ class FullscreenLayoutManager : public aura::LayoutManager {
   virtual ~FullscreenLayoutManager() {}
 
   // Overridden from aura::LayoutManager:
-  virtual void OnWindowResized() OVERRIDE {
+  virtual void OnWindowResized() override {
     aura::Window::Windows::const_iterator i;
     for (i = owner_->children().begin(); i != owner_->children().end(); ++i) {
       (*i)->SetBounds(gfx::Rect());
     }
   }
-  virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {
+  virtual void OnWindowAddedToLayout(aura::Window* child) override {
     child->SetBounds(gfx::Rect());
   }
-  virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE {}
-  virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE {}
+  virtual void OnWillRemoveWindowFromLayout(aura::Window* child) override {}
+  virtual void OnWindowRemovedFromLayout(aura::Window* child) override {}
   virtual void OnChildWindowVisibilityChanged(aura::Window* child,
-                                              bool visible) OVERRIDE {}
+                                              bool visible) override {}
   virtual void SetChildBounds(aura::Window* child,
-                              const gfx::Rect& requested_bounds) OVERRIDE {
+                              const gfx::Rect& requested_bounds) override {
     SetChildBoundsDirect(child, gfx::Rect(owner_->bounds().size()));
   }
 
@@ -627,7 +627,7 @@ class RenderWidgetHostViewAuraShutdownTest
  public:
   RenderWidgetHostViewAuraShutdownTest() {}
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // No TearDownEnvironment here, we do this explicitly during the test.
   }
 
diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
index 6ccacfc..9e4a009 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.h
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
@@ -70,21 +70,21 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
   virtual ~RenderWidgetHostViewBase();
 
   // RenderWidgetHostView implementation.
-  virtual void SetBackgroundOpaque(bool opaque) OVERRIDE;
-  virtual bool GetBackgroundOpaque() OVERRIDE;
-  virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;
-  virtual bool IsShowingContextMenu() const OVERRIDE;
-  virtual void SetShowingContextMenu(bool showing_menu) OVERRIDE;
-  virtual base::string16 GetSelectedText() const OVERRIDE;
-  virtual bool IsMouseLocked() OVERRIDE;
-  virtual gfx::Size GetVisibleViewportSize() const OVERRIDE;
-  virtual void SetInsets(const gfx::Insets& insets) OVERRIDE;
+  virtual void SetBackgroundOpaque(bool opaque) override;
+  virtual bool GetBackgroundOpaque() override;
+  virtual ui::TextInputClient* GetTextInputClient() override;
+  virtual bool IsShowingContextMenu() const override;
+  virtual void SetShowingContextMenu(bool showing_menu) override;
+  virtual base::string16 GetSelectedText() const override;
+  virtual bool IsMouseLocked() override;
+  virtual gfx::Size GetVisibleViewportSize() const override;
+  virtual void SetInsets(const gfx::Insets& insets) override;
   virtual void BeginFrameSubscription(
-      scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) OVERRIDE;
-  virtual void EndFrameSubscription() OVERRIDE;
+      scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) override;
+  virtual void EndFrameSubscription() override;
 
   // IPC::Listener implementation:
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& msg) override;
 
   // Called by the host when the input flush has completed.
   void OnDidFlushInput();
diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
index a3f9466..81917b6 100644
--- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
@@ -61,7 +61,7 @@ class RenderWidgetHostViewBrowserTest : public ContentBrowserTest {
         callback_invoke_count_(0),
         frames_captured_(0) {}
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     ASSERT_TRUE(PathService::Get(DIR_TEST_DATA, &test_dir_));
   }
 
@@ -207,7 +207,7 @@ class CompositingRenderWidgetHostViewBrowserTest
   explicit CompositingRenderWidgetHostViewBrowserTest()
       : compositing_mode_(GetParam()) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     if (compositing_mode_ == SOFTWARE_COMPOSITING)
       UseSoftwareCompositing();
     RenderWidgetHostViewBrowserTest::SetUp();
@@ -218,7 +218,7 @@ class CompositingRenderWidgetHostViewBrowserTest
         test_dir().AppendASCII("rwhv_compositing_animation.html"));
   }
 
-  virtual bool SetUpSourceSurface(const char* wait_message) OVERRIDE {
+  virtual bool SetUpSourceSurface(const char* wait_message) override {
     content::DOMMessageQueue message_queue;
     NavigateToURL(shell(), TestUrl());
     if (wait_message != NULL) {
@@ -250,7 +250,7 @@ class FakeFrameSubscriber : public RenderWidgetHostViewFrameSubscriber {
   virtual bool ShouldCaptureFrame(const gfx::Rect& damage_rect,
                                   base::TimeTicks present_time,
                                   scoped_refptr<media::VideoFrame>* storage,
-                                  DeliverFrameCallback* callback) OVERRIDE {
+                                  DeliverFrameCallback* callback) override {
     // Only allow one frame capture to be made.  Otherwise, the compositor could
     // start multiple captures, unbounded, and eventually its own limiter logic
     // will begin invoking |callback| with a |false| result.  This flakes out
@@ -408,7 +408,7 @@ class CompositingRenderWidgetHostViewBrowserTestTabCapture
         allowable_error_(0),
         test_url_("data:text/html,<!doctype html>") {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     EnablePixelOutput();
     CompositingRenderWidgetHostViewBrowserTest::SetUp();
   }
@@ -505,7 +505,7 @@ class CompositingRenderWidgetHostViewBrowserTestTabCapture
   void SetAllowableError(int amount) { allowable_error_ = amount; }
   void SetExcludeRect(gfx::Rect exclude) { exclude_rect_ = exclude; }
 
-  virtual GURL TestUrl() OVERRIDE {
+  virtual GURL TestUrl() override {
     return GURL(test_url_);
   }
 
@@ -754,13 +754,13 @@ class CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI
   CompositingRenderWidgetHostViewBrowserTestTabCaptureHighDPI() {}
 
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* cmd) OVERRIDE {
+  virtual void SetUpCommandLine(base::CommandLine* cmd) override {
     CompositingRenderWidgetHostViewBrowserTestTabCapture::SetUpCommandLine(cmd);
     cmd->AppendSwitchASCII(switches::kForceDeviceScaleFactor,
                            base::StringPrintf("%f", scale()));
   }
 
-  virtual bool ShouldContinueAfterTestURLLoad() OVERRIDE {
+  virtual bool ShouldContinueAfterTestURLLoad() override {
     // Short-circuit a pass for platforms where setting up high-DPI fails.
     const float actual_scale_factor =
         GetScaleFactorForView(GetRenderWidgetHostView());
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 29b4a36..ac0972d 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -225,106 +225,106 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
   void SetAllowPauseForResizeOrRepaint(bool allow);
 
   // RenderWidgetHostView implementation.
-  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
-  virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE;
-  virtual RenderWidgetHost* GetRenderWidgetHost() const OVERRIDE;
-  virtual void SetSize(const gfx::Size& size) OVERRIDE;
-  virtual void SetBounds(const gfx::Rect& rect) OVERRIDE;
-  virtual gfx::Vector2dF GetLastScrollOffset() const OVERRIDE;
-  virtual gfx::NativeView GetNativeView() const OVERRIDE;
-  virtual gfx::NativeViewId GetNativeViewId() const OVERRIDE;
-  virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
-  virtual bool HasFocus() const OVERRIDE;
-  virtual bool IsSurfaceAvailableForCopy() const OVERRIDE;
-  virtual void Show() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual bool IsShowing() OVERRIDE;
-  virtual gfx::Rect GetViewBounds() const OVERRIDE;
-  virtual void SetShowingContextMenu(bool showing) OVERRIDE;
-  virtual void SetActive(bool active) OVERRIDE;
-  virtual void SetTakesFocusOnlyOnMouseDown(bool flag) OVERRIDE;
-  virtual void SetWindowVisibility(bool visible) OVERRIDE;
-  virtual void WindowFrameChanged() OVERRIDE;
-  virtual void ShowDefinitionForSelection() OVERRIDE;
-  virtual bool SupportsSpeech() const OVERRIDE;
-  virtual void SpeakSelection() OVERRIDE;
-  virtual bool IsSpeaking() const OVERRIDE;
-  virtual void StopSpeaking() OVERRIDE;
-  virtual void SetBackgroundOpaque(bool opaque) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& msg) override;
+  virtual void InitAsChild(gfx::NativeView parent_view) override;
+  virtual RenderWidgetHost* GetRenderWidgetHost() const override;
+  virtual void SetSize(const gfx::Size& size) override;
+  virtual void SetBounds(const gfx::Rect& rect) override;
+  virtual gfx::Vector2dF GetLastScrollOffset() const override;
+  virtual gfx::NativeView GetNativeView() const override;
+  virtual gfx::NativeViewId GetNativeViewId() const override;
+  virtual gfx::NativeViewAccessible GetNativeViewAccessible() override;
+  virtual bool HasFocus() const override;
+  virtual bool IsSurfaceAvailableForCopy() const override;
+  virtual void Show() override;
+  virtual void Hide() override;
+  virtual bool IsShowing() override;
+  virtual gfx::Rect GetViewBounds() const override;
+  virtual void SetShowingContextMenu(bool showing) override;
+  virtual void SetActive(bool active) override;
+  virtual void SetTakesFocusOnlyOnMouseDown(bool flag) override;
+  virtual void SetWindowVisibility(bool visible) override;
+  virtual void WindowFrameChanged() override;
+  virtual void ShowDefinitionForSelection() override;
+  virtual bool SupportsSpeech() const override;
+  virtual void SpeakSelection() override;
+  virtual bool IsSpeaking() const override;
+  virtual void StopSpeaking() override;
+  virtual void SetBackgroundOpaque(bool opaque) override;
 
   // Implementation of RenderWidgetHostViewBase.
   virtual void InitAsPopup(RenderWidgetHostView* parent_host_view,
-                           const gfx::Rect& pos) OVERRIDE;
+                           const gfx::Rect& pos) override;
   virtual void InitAsFullscreen(
-      RenderWidgetHostView* reference_host_view) OVERRIDE;
-  virtual void WasShown() OVERRIDE;
-  virtual void WasHidden() OVERRIDE;
+      RenderWidgetHostView* reference_host_view) override;
+  virtual void WasShown() override;
+  virtual void WasHidden() override;
   virtual void MovePluginWindows(
-      const std::vector<WebPluginGeometry>& moves) OVERRIDE;
-  virtual void Focus() OVERRIDE;
-  virtual void Blur() OVERRIDE;
-  virtual void UpdateCursor(const WebCursor& cursor) OVERRIDE;
-  virtual void SetIsLoading(bool is_loading) OVERRIDE;
+      const std::vector<WebPluginGeometry>& moves) override;
+  virtual void Focus() override;
+  virtual void Blur() override;
+  virtual void UpdateCursor(const WebCursor& cursor) override;
+  virtual void SetIsLoading(bool is_loading) override;
   virtual void TextInputStateChanged(
-      const ViewHostMsg_TextInputState_Params& params) OVERRIDE;
-  virtual void ImeCancelComposition() OVERRIDE;
+      const ViewHostMsg_TextInputState_Params& params) override;
+  virtual void ImeCancelComposition() override;
   virtual void ImeCompositionRangeChanged(
       const gfx::Range& range,
-      const std::vector<gfx::Rect>& character_bounds) OVERRIDE;
+      const std::vector<gfx::Rect>& character_bounds) override;
   virtual void RenderProcessGone(base::TerminationStatus status,
-                                 int error_code) OVERRIDE;
-  virtual void RenderWidgetHostGone() OVERRIDE;
-  virtual void Destroy() OVERRIDE;
-  virtual void SetTooltipText(const base::string16& tooltip_text) OVERRIDE;
+                                 int error_code) override;
+  virtual void RenderWidgetHostGone() override;
+  virtual void Destroy() override;
+  virtual void SetTooltipText(const base::string16& tooltip_text) override;
   virtual void SelectionChanged(const base::string16& text,
                                 size_t offset,
-                                const gfx::Range& range) OVERRIDE;
+                                const gfx::Range& range) override;
   virtual void SelectionBoundsChanged(
-      const ViewHostMsg_SelectionBounds_Params& params) OVERRIDE;
+      const ViewHostMsg_SelectionBounds_Params& params) override;
   virtual void CopyFromCompositingSurface(
       const gfx::Rect& src_subrect,
       const gfx::Size& dst_size,
       const base::Callback<void(bool, const SkBitmap&)>& callback,
-      SkColorType color_type) OVERRIDE;
+      SkColorType color_type) override;
   virtual void CopyFromCompositingSurfaceToVideoFrame(
       const gfx::Rect& src_subrect,
       const scoped_refptr<media::VideoFrame>& target,
-      const base::Callback<void(bool)>& callback) OVERRIDE;
-  virtual bool CanCopyToVideoFrame() const OVERRIDE;
-  virtual bool CanSubscribeFrame() const OVERRIDE;
+      const base::Callback<void(bool)>& callback) override;
+  virtual bool CanCopyToVideoFrame() const override;
+  virtual bool CanSubscribeFrame() const override;
   virtual void BeginFrameSubscription(
-      scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) OVERRIDE;
-  virtual void EndFrameSubscription() OVERRIDE;
+      scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber) override;
+  virtual void EndFrameSubscription() override;
   virtual void OnSwapCompositorFrame(
-      uint32 output_surface_id, scoped_ptr<cc::CompositorFrame> frame) OVERRIDE;
+      uint32 output_surface_id, scoped_ptr<cc::CompositorFrame> frame) override;
   virtual BrowserAccessibilityManager* CreateBrowserAccessibilityManager(
-      BrowserAccessibilityDelegate* delegate) OVERRIDE;
+      BrowserAccessibilityDelegate* delegate) override;
   virtual gfx::Point AccessibilityOriginInScreen(const gfx::Rect& bounds)
-      OVERRIDE;
-  virtual void AccessibilityShowMenu(const gfx::Point& point) OVERRIDE;
+      override;
+  virtual void AccessibilityShowMenu(const gfx::Point& point) override;
   virtual bool PostProcessEventForPluginIme(
-      const NativeWebKeyboardEvent& event) OVERRIDE;
+      const NativeWebKeyboardEvent& event) override;
 
-  virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) OVERRIDE;
-  virtual void GetScreenInfo(blink::WebScreenInfo* results) OVERRIDE;
-  virtual gfx::Rect GetBoundsInRootWindow() OVERRIDE;
-  virtual gfx::GLSurfaceHandle GetCompositingSurface() OVERRIDE;
+  virtual bool HasAcceleratedSurface(const gfx::Size& desired_size) override;
+  virtual void GetScreenInfo(blink::WebScreenInfo* results) override;
+  virtual gfx::Rect GetBoundsInRootWindow() override;
+  virtual gfx::GLSurfaceHandle GetCompositingSurface() override;
 
-  virtual bool LockMouse() OVERRIDE;
-  virtual void UnlockMouse() OVERRIDE;
+  virtual bool LockMouse() override;
+  virtual void UnlockMouse() override;
   virtual void WheelEventAck(const blink::WebMouseWheelEvent& event,
-                             InputEventAckState ack_result) OVERRIDE;
+                             InputEventAckState ack_result) override;
 
   // IPC::Sender implementation.
-  virtual bool Send(IPC::Message* message) OVERRIDE;
+  virtual bool Send(IPC::Message* message) override;
 
-  virtual SkColorType PreferredReadbackFormat() OVERRIDE;
+  virtual SkColorType PreferredReadbackFormat() override;
 
   // gfx::DisplayObserver implementation.
-  virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;
-  virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
+  virtual void OnDisplayAdded(const gfx::Display& new_display) override;
+  virtual void OnDisplayRemoved(const gfx::Display& old_display) override;
   virtual void OnDisplayMetricsChanged(const gfx::Display& display,
-                                       uint32_t metrics) OVERRIDE;
+                                       uint32_t metrics) override;
 
   // Forwards the mouse event to the renderer.
   void ForwardMouseEvent(const blink::WebMouseEvent& event);
@@ -415,23 +415,23 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
   void PauseForPendingResizeOrRepaintsAndDraw();
 
   // DelegatedFrameHostClient implementation.
-  virtual ui::Compositor* GetCompositor() const OVERRIDE;
-  virtual ui::Layer* GetLayer() OVERRIDE;
-  virtual RenderWidgetHostImpl* GetHost() OVERRIDE;
-  virtual bool IsVisible() OVERRIDE;
+  virtual ui::Compositor* GetCompositor() const override;
+  virtual ui::Layer* GetLayer() override;
+  virtual RenderWidgetHostImpl* GetHost() override;
+  virtual bool IsVisible() override;
   virtual scoped_ptr<ResizeLock> CreateResizeLock(
-      bool defer_compositor_lock) OVERRIDE;
-  virtual gfx::Size DesiredFrameSize() OVERRIDE;
-  virtual float CurrentDeviceScaleFactor() OVERRIDE;
-  virtual gfx::Size ConvertViewSizeToPixel(const gfx::Size& size) OVERRIDE;
-  virtual DelegatedFrameHost* GetDelegatedFrameHost() const OVERRIDE;
+      bool defer_compositor_lock) override;
+  virtual gfx::Size DesiredFrameSize() override;
+  virtual float CurrentDeviceScaleFactor() override;
+  virtual gfx::Size ConvertViewSizeToPixel(const gfx::Size& size) override;
+  virtual DelegatedFrameHost* GetDelegatedFrameHost() const override;
 
   // BrowserCompositorViewMacClient implementation.
-  virtual bool BrowserCompositorViewShouldAckImmediately() const OVERRIDE;
+  virtual bool BrowserCompositorViewShouldAckImmediately() const override;
   virtual void BrowserCompositorViewFrameSwapped(
-      const std::vector<ui::LatencyInfo>& latency_info) OVERRIDE;
-  virtual NSView* BrowserCompositorSuperview() OVERRIDE;
-  virtual ui::Layer* BrowserCompositorRootLayer() OVERRIDE;
+      const std::vector<ui::LatencyInfo>& latency_info) override;
+  virtual NSView* BrowserCompositorSuperview() override;
+  virtual ui::Layer* BrowserCompositorRootLayer() override;
 
  private:
   friend class RenderWidgetHostViewMacTest;
diff --git a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm
index 07e693a..b444282 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm
@@ -86,7 +86,7 @@ class RenderWidgetHostEditCommandCounter : public RenderWidgetHostImpl {
       edit_command_message_count_(0) {
   }
 
-  virtual bool Send(IPC::Message* message) OVERRIDE {
+  virtual bool Send(IPC::Message* message) override {
     if (message->type() == InputMsg_ExecuteEditCommand::ID)
       edit_command_message_count_++;
     return RenderWidgetHostImpl::Send(message);
diff --git a/content/browser/renderer_host/render_widget_resize_helper.cc b/content/browser/renderer_host/render_widget_resize_helper.cc
index fe29350..212fcf1 100644
--- a/content/browser/renderer_host/render_widget_resize_helper.cc
+++ b/content/browser/renderer_host/render_widget_resize_helper.cc
@@ -74,14 +74,14 @@ class PumpableTaskRunner
   // base::SingleThreadTaskRunner implementation:
   virtual bool PostDelayedTask(const tracked_objects::Location& from_here,
                                const base::Closure& task,
-                               base::TimeDelta delay) OVERRIDE;
+                               base::TimeDelta delay) override;
 
   virtual bool PostNonNestableDelayedTask(
       const tracked_objects::Location& from_here,
       const base::Closure& task,
-      base::TimeDelta delay) OVERRIDE;
+      base::TimeDelta delay) override;
 
-  virtual bool RunsTasksOnCurrentThread() const OVERRIDE;
+  virtual bool RunsTasksOnCurrentThread() const override;
 
  private:
   friend class WrappedTask;
diff --git a/content/browser/renderer_host/sandbox_ipc_linux.h b/content/browser/renderer_host/sandbox_ipc_linux.h
index 4c39a31..613b5276 100644
--- a/content/browser/renderer_host/sandbox_ipc_linux.h
+++ b/content/browser/renderer_host/sandbox_ipc_linux.h
@@ -26,7 +26,7 @@ class SandboxIPCHandler : public base::DelegateSimpleThread::Delegate {
   SandboxIPCHandler(int lifeline_fd, int browser_socket);
   virtual ~SandboxIPCHandler();
 
-  virtual void Run() OVERRIDE;
+  virtual void Run() override;
 
  private:
   void EnsureWebKitInitialized();
diff --git a/content/browser/renderer_host/socket_stream_dispatcher_host.h b/content/browser/renderer_host/socket_stream_dispatcher_host.h
index 639e6f8..a06a9ba 100644
--- a/content/browser/renderer_host/socket_stream_dispatcher_host.h
+++ b/content/browser/renderer_host/socket_stream_dispatcher_host.h
@@ -37,7 +37,7 @@ class SocketStreamDispatcherHost : public BrowserMessageFilter,
       ResourceContext* resource_context);
 
   // BrowserMessageFilter:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // Make this object inactive.
   // Remove all active SocketStreamHost objects.
@@ -45,21 +45,21 @@ class SocketStreamDispatcherHost : public BrowserMessageFilter,
 
   // SocketStream::Delegate:
   virtual void OnConnected(net::SocketStream* socket,
-                           int max_pending_send_allowed) OVERRIDE;
-  virtual void OnSentData(net::SocketStream* socket, int amount_sent) OVERRIDE;
+                           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) OVERRIDE;
-  virtual void OnClose(net::SocketStream* socket) OVERRIDE;
-  virtual void OnError(const net::SocketStream* socket, int error) OVERRIDE;
+                              const char* data, int len) override;
+  virtual void OnClose(net::SocketStream* socket) override;
+  virtual void OnError(const net::SocketStream* socket, int error) override;
   virtual void OnSSLCertificateError(net::SocketStream* socket,
                                      const net::SSLInfo& ssl_info,
-                                     bool fatal) OVERRIDE;
+                                     bool fatal) override;
   virtual bool CanGetCookies(net::SocketStream* socket,
-                             const GURL& url) OVERRIDE;
+                             const GURL& url) override;
   virtual bool CanSetCookie(net::SocketStream* request,
                             const GURL& url,
                             const std::string& cookie_line,
-                            net::CookieOptions* options) OVERRIDE;
+                            net::CookieOptions* options) override;
 
  protected:
   virtual ~SocketStreamDispatcherHost();
diff --git a/content/browser/renderer_host/socket_stream_host.h b/content/browser/renderer_host/socket_stream_host.h
index 8e0ee96..73e8f72 100644
--- a/content/browser/renderer_host/socket_stream_host.h
+++ b/content/browser/renderer_host/socket_stream_host.h
@@ -59,8 +59,8 @@ class SocketStreamHost : public SSLErrorHandler::Delegate {
 
   // SSLErrorHandler::Delegate methods:
   virtual void CancelSSLRequest(int error,
-                                const net::SSLInfo* ssl_info) OVERRIDE;
-  virtual void ContinueSSLRequest() OVERRIDE;
+                                const net::SSLInfo* ssl_info) override;
+  virtual void ContinueSSLRequest() override;
 
  private:
   net::SocketStream::Delegate* delegate_;
diff --git a/content/browser/renderer_host/software_frame_manager.h b/content/browser/renderer_host/software_frame_manager.h
index 6d19afd..496a89a 100644
--- a/content/browser/renderer_host/software_frame_manager.h
+++ b/content/browser/renderer_host/software_frame_manager.h
@@ -64,7 +64,7 @@ class CONTENT_EXPORT SoftwareFrameManager : public RendererFrameManagerClient {
  private:
   // Called by SoftwareFrameMemoryManager to demand that the current frame
   // be evicted.
-  virtual void EvictCurrentFrame() OVERRIDE;
+  virtual void EvictCurrentFrame() override;
 
   base::WeakPtr<SoftwareFrameManagerClient> client_;
 
diff --git a/content/browser/renderer_host/software_frame_manager_unittest.cc b/content/browser/renderer_host/software_frame_manager_unittest.cc
index e700f69..8cbd0af 100644
--- a/content/browser/renderer_host/software_frame_manager_unittest.cc
+++ b/content/browser/renderer_host/software_frame_manager_unittest.cc
@@ -26,10 +26,10 @@ class FakeSoftwareFrameManagerClient : public SoftwareFrameManagerClient {
         base::GetCurrentProcessHandle());
   }
   virtual void SoftwareFrameWasFreed(uint32 output_surface_id,
-                                     unsigned frame_id) OVERRIDE {
+                                     unsigned frame_id) override {
     freed_frames_.push_back(std::make_pair(output_surface_id, frame_id));
   }
-  virtual void ReleaseReferencesToSoftwareFrame() OVERRIDE {
+  virtual void ReleaseReferencesToSoftwareFrame() override {
     ++evicted_count_;
   }
 
diff --git a/content/browser/renderer_host/test/no_transport_image_transport_factory_android.h b/content/browser/renderer_host/test/no_transport_image_transport_factory_android.h
index bba8582..44a7747 100644
--- a/content/browser/renderer_host/test/no_transport_image_transport_factory_android.h
+++ b/content/browser/renderer_host/test/no_transport_image_transport_factory_android.h
@@ -27,8 +27,8 @@ class NoTransportImageTransportFactoryAndroid
  public:
   NoTransportImageTransportFactoryAndroid();
   virtual ~NoTransportImageTransportFactoryAndroid();
-  virtual GLHelper* GetGLHelper() OVERRIDE;
-  virtual uint32 GetChannelID() OVERRIDE;
+  virtual GLHelper* GetGLHelper() override;
+  virtual uint32 GetChannelID() override;
 
  private:
   scoped_ptr<ui::ContextFactory> context_factory_;
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 4706346..be72ddc 100644
--- a/content/browser/renderer_host/text_input_client_message_filter.h
+++ b/content/browser/renderer_host/text_input_client_message_filter.h
@@ -25,7 +25,7 @@ class CONTENT_EXPORT TextInputClientMessageFilter
   explicit TextInputClientMessageFilter(int child_id);
 
   // BrowserMessageFilter override:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
  protected:
   virtual ~TextInputClientMessageFilter();
diff --git a/content/browser/renderer_host/websocket_dispatcher_host.h b/content/browser/renderer_host/websocket_dispatcher_host.h
index 4179b71..2ef0380 100644
--- a/content/browser/renderer_host/websocket_dispatcher_host.h
+++ b/content/browser/renderer_host/websocket_dispatcher_host.h
@@ -56,7 +56,7 @@ class CONTENT_EXPORT WebSocketDispatcherHost : public BrowserMessageFilter {
                           const WebSocketHostFactory& websocket_host_factory);
 
   // BrowserMessageFilter:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // The following methods are used by WebSocketHost::EventInterface to send
   // IPCs from the browser to the renderer or child process. Any of them may
diff --git a/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc b/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc
index b5b888c..3986ea5 100644
--- a/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc
+++ b/content/browser/renderer_host/websocket_dispatcher_host_unittest.cc
@@ -37,12 +37,12 @@ class MockWebSocketHost : public WebSocketHost {
 
   virtual ~MockWebSocketHost() {}
 
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
+  virtual bool OnMessageReceived(const IPC::Message& message) override {
     received_messages_.push_back(message);
     return true;
   }
 
-  virtual void GoAway() OVERRIDE;
+  virtual void GoAway() override;
 
   std::vector<IPC::Message> received_messages_;
   base::WeakPtr<WebSocketDispatcherHostTest> owner_;
diff --git a/content/browser/renderer_host/websocket_host.cc b/content/browser/renderer_host/websocket_host.cc
index a8951a9..7749be8 100644
--- a/content/browser/renderer_host/websocket_host.cc
+++ b/content/browser/renderer_host/websocket_host.cc
@@ -95,25 +95,25 @@ class WebSocketEventHandler : public net::WebSocketEventInterface {
   virtual ChannelState OnAddChannelResponse(
       bool fail,
       const std::string& selected_subprotocol,
-      const std::string& extensions) OVERRIDE;
+      const std::string& extensions) override;
   virtual ChannelState OnDataFrame(bool fin,
                                    WebSocketMessageType type,
-                                   const std::vector<char>& data) OVERRIDE;
-  virtual ChannelState OnClosingHandshake() OVERRIDE;
-  virtual ChannelState OnFlowControl(int64 quota) OVERRIDE;
+                                   const std::vector<char>& data) override;
+  virtual ChannelState OnClosingHandshake() override;
+  virtual ChannelState OnFlowControl(int64 quota) override;
   virtual ChannelState OnDropChannel(bool was_clean,
                                      uint16 code,
-                                     const std::string& reason) OVERRIDE;
-  virtual ChannelState OnFailChannel(const std::string& message) OVERRIDE;
+                                     const std::string& reason) override;
+  virtual ChannelState OnFailChannel(const std::string& message) override;
   virtual ChannelState OnStartOpeningHandshake(
-      scoped_ptr<net::WebSocketHandshakeRequestInfo> request) OVERRIDE;
+      scoped_ptr<net::WebSocketHandshakeRequestInfo> request) override;
   virtual ChannelState OnFinishOpeningHandshake(
-      scoped_ptr<net::WebSocketHandshakeResponseInfo> response) OVERRIDE;
+      scoped_ptr<net::WebSocketHandshakeResponseInfo> response) override;
   virtual ChannelState OnSSLCertificateError(
       scoped_ptr<net::WebSocketEventInterface::SSLErrorCallbacks> callbacks,
       const GURL& url,
       const net::SSLInfo& ssl_info,
-      bool fatal) OVERRIDE;
+      bool fatal) override;
 
  private:
   class SSLErrorHandlerDelegate : public SSLErrorHandler::Delegate {
@@ -126,8 +126,8 @@ class WebSocketEventHandler : public net::WebSocketEventInterface {
 
     // SSLErrorHandler::Delegate methods
     virtual void CancelSSLRequest(int error,
-                                  const net::SSLInfo* ssl_info) OVERRIDE;
-    virtual void ContinueSSLRequest() OVERRIDE;
+                                  const net::SSLInfo* ssl_info) override;
+    virtual void ContinueSSLRequest() override;
 
    private:
     scoped_ptr<net::WebSocketEventInterface::SSLErrorCallbacks> callbacks_;