Remove unnecessary 'virtual' annotation from mojo

Removes virtual keyword from overridden methods in
mojo/services/html_viewer.

BUG=417463,469785

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

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

18 files changed, 199 insertions, 209 deletions

diff --git a/mojo/services/html_viewer/ax_provider_impl_unittest.cc b/mojo/services/html_viewer/ax_provider_impl_unittest.cc
index b001e25..a7ffac2 100644
--- a/mojo/services/html_viewer/ax_provider_impl_unittest.cc
+++ b/mojo/services/html_viewer/ax_provider_impl_unittest.cc
@@ -33,13 +33,13 @@ namespace {
 
 class TestWebFrameClient : public WebFrameClient {
  public:
-  virtual ~TestWebFrameClient() {}
-  virtual void didStopLoading() { base::MessageLoop::current()->Quit(); }
+  ~TestWebFrameClient() override {}
+  void didStopLoading() override { base::MessageLoop::current()->Quit(); }
 };
 
 class TestWebViewClient : public WebViewClient {
  public:
-  virtual bool allowsBrokenNullLayerTreeView() const { return true; }
+  bool allowsBrokenNullLayerTreeView() const override { return true; }
   virtual ~TestWebViewClient() {}
 };
 
diff --git a/mojo/services/html_viewer/blink_platform_impl.cc b/mojo/services/html_viewer/blink_platform_impl.cc
index 5c02395..7a1ee7e 100644
--- a/mojo/services/html_viewer/blink_platform_impl.cc
+++ b/mojo/services/html_viewer/blink_platform_impl.cc
@@ -34,10 +34,10 @@ const char kDefaultUserAgentString[] =
 class WebWaitableEventImpl : public blink::WebWaitableEvent {
  public:
   WebWaitableEventImpl() : impl_(new base::WaitableEvent(false, false)) {}
-  virtual ~WebWaitableEventImpl() {}
+  ~WebWaitableEventImpl() override {}
 
-  virtual void wait() { impl_->Wait(); }
-  virtual void signal() { impl_->Signal(); }
+  void wait() override { impl_->Wait(); }
+  void signal() override { impl_->Signal(); }
 
   base::WaitableEvent* impl() {
     return impl_.get();
diff --git a/mojo/services/html_viewer/blink_platform_impl.h b/mojo/services/html_viewer/blink_platform_impl.h
index 7d039892..fc77e7e 100644
--- a/mojo/services/html_viewer/blink_platform_impl.h
+++ b/mojo/services/html_viewer/blink_platform_impl.h
@@ -22,41 +22,41 @@ namespace html_viewer {
 class BlinkPlatformImpl : public blink::Platform {
  public:
   explicit BlinkPlatformImpl();
-  virtual ~BlinkPlatformImpl();
+  ~BlinkPlatformImpl() override;
 
   // blink::Platform methods:
-  virtual blink::WebMimeRegistry* mimeRegistry();
-  virtual blink::WebThemeEngine* themeEngine();
-  virtual blink::WebScheduler* scheduler();
-  virtual blink::WebString defaultLocale();
-  virtual double currentTime();
-  virtual double monotonicallyIncreasingTime();
-  virtual void cryptographicallyRandomValues(
-      unsigned char* buffer, size_t length);
-  virtual void setSharedTimerFiredFunction(void (*func)());
-  virtual void setSharedTimerFireInterval(double interval_seconds);
-  virtual void stopSharedTimer();
+  blink::WebMimeRegistry* mimeRegistry() override;
+  blink::WebThemeEngine* themeEngine() override;
+  blink::WebScheduler* scheduler() override;
+  blink::WebString defaultLocale() override;
+  double currentTime() override;
+  double monotonicallyIncreasingTime() override;
+  void cryptographicallyRandomValues(unsigned char* buffer,
+                                     size_t length) override;
+  void setSharedTimerFiredFunction(void (*func)()) override;
+  void setSharedTimerFireInterval(double interval_seconds) override;
+  void stopSharedTimer() override;
   virtual void callOnMainThread(void (*func)(void*), void* context);
-  virtual bool isThreadedCompositingEnabled();
-  virtual blink::WebCompositorSupport* compositorSupport();
-  virtual blink::WebURLLoader* createURLLoader();
-  virtual blink::WebSocketHandle* createWebSocketHandle();
-  virtual blink::WebString userAgent();
-  virtual blink::WebData parseDataURL(
+  bool isThreadedCompositingEnabled() override;
+  blink::WebCompositorSupport* compositorSupport() override;
+  blink::WebURLLoader* createURLLoader() override;
+  blink::WebSocketHandle* createWebSocketHandle() override;
+  blink::WebString userAgent() override;
+  blink::WebData parseDataURL(
       const blink::WebURL& url, blink::WebString& mime_type,
-      blink::WebString& charset);
-  virtual blink::WebURLError cancelledError(const blink::WebURL& url) const;
-  virtual bool isReservedIPAddress(const blink::WebString& host) const;
-  virtual blink::WebThread* createThread(const char* name);
-  virtual blink::WebThread* currentThread();
-  virtual void yieldCurrentThread();
-  virtual blink::WebWaitableEvent* createWaitableEvent();
-  virtual blink::WebWaitableEvent* waitMultipleEvents(
-      const blink::WebVector<blink::WebWaitableEvent*>& events);
-  virtual blink::WebScrollbarBehavior* scrollbarBehavior();
-  virtual const unsigned char* getTraceCategoryEnabledFlag(
-      const char* category_name);
-  virtual blink::WebData loadResource(const char* name);
+      blink::WebString& charset) override;
+  bool isReservedIPAddress(const blink::WebString& host) const override;
+  blink::WebURLError cancelledError(const blink::WebURL& url) const override;
+  blink::WebThread* createThread(const char* name) override;
+  blink::WebThread* currentThread() override;
+  void yieldCurrentThread() override;
+  blink::WebWaitableEvent* createWaitableEvent() override;
+  blink::WebWaitableEvent* waitMultipleEvents(
+      const blink::WebVector<blink::WebWaitableEvent*>& events) override;
+  blink::WebScrollbarBehavior* scrollbarBehavior() override;
+  const unsigned char* getTraceCategoryEnabledFlag(
+      const char* category_name) override;
+  blink::WebData loadResource(const char* name) override;
 
  private:
   void SuspendSharedTimer();
diff --git a/mojo/services/html_viewer/blink_url_request_type_converters.cc b/mojo/services/html_viewer/blink_url_request_type_converters.cc
index 85fd796..3cae06f 100644
--- a/mojo/services/html_viewer/blink_url_request_type_converters.cc
+++ b/mojo/services/html_viewer/blink_url_request_type_converters.cc
@@ -17,8 +17,8 @@ class HeaderFlattener : public blink::WebHTTPHeaderVisitor {
  public:
   HeaderFlattener() : has_accept_header_(false) {}
 
-  virtual void visitHeader(const blink::WebString& name,
-                           const blink::WebString& value) {
+  void visitHeader(const blink::WebString& name,
+                   const blink::WebString& value) override {
     // Headers are latin1.
     const std::string& name_latin1 = name.latin1();
     const std::string& value_latin1 = value.latin1();
diff --git a/mojo/services/html_viewer/html_document.h b/mojo/services/html_viewer/html_document.h
index c5882f3..f4820da 100644
--- a/mojo/services/html_viewer/html_document.h
+++ b/mojo/services/html_viewer/html_document.h
@@ -67,7 +67,7 @@ class HTMLDocument : public blink::WebViewClient,
                scoped_refptr<base::MessageLoopProxy> compositor_thread,
                WebMediaPlayerFactory* web_media_player_factory,
                bool is_headless);
-  virtual ~HTMLDocument();
+  ~HTMLDocument() override;
 
  private:
   // Updates the size and scale factor of the webview and related classes from
@@ -75,43 +75,43 @@ class HTMLDocument : public blink::WebViewClient,
   void UpdateWebviewSizeFromViewSize();
 
   // WebViewClient methods:
-  virtual blink::WebStorageNamespace* createSessionStorageNamespace();
+  blink::WebStorageNamespace* createSessionStorageNamespace() override;
 
   // WebWidgetClient methods:
-  virtual void initializeLayerTreeView();
-  virtual blink::WebLayerTreeView* layerTreeView();
+  void initializeLayerTreeView() override;
+  blink::WebLayerTreeView* layerTreeView() override;
 
   // WebFrameClient methods:
   virtual blink::WebMediaPlayer* createMediaPlayer(
       blink::WebLocalFrame* frame,
       const blink::WebURL& url,
       blink::WebMediaPlayerClient* client);
-  virtual blink::WebMediaPlayer* createMediaPlayer(
+  blink::WebMediaPlayer* createMediaPlayer(
       blink::WebLocalFrame* frame,
       const blink::WebURL& url,
       blink::WebMediaPlayerClient* client,
-      blink::WebContentDecryptionModule* initial_cdm);
-  virtual blink::WebFrame* createChildFrame(
+      blink::WebContentDecryptionModule* initial_cdm) override;
+  blink::WebFrame* createChildFrame(
       blink::WebLocalFrame* parent,
       const blink::WebString& frameName,
-      blink::WebSandboxFlags sandboxFlags);
-  virtual void frameDetached(blink::WebFrame*);
-  virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
-  virtual blink::WebNavigationPolicy decidePolicyForNavigation(
+      blink::WebSandboxFlags sandboxFlags) override;
+  void frameDetached(blink::WebFrame*) override;
+  blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame) override;
+  blink::WebNavigationPolicy decidePolicyForNavigation(
       blink::WebLocalFrame* frame,
       blink::WebDataSource::ExtraData* data,
       const blink::WebURLRequest& request,
       blink::WebNavigationType nav_type,
       blink::WebNavigationPolicy default_policy,
-      bool isRedirect);
-  virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
-                                      const blink::WebString& source_name,
-                                      unsigned source_line,
-                                      const blink::WebString& stack_trace);
-  virtual void didNavigateWithinPage(blink::WebLocalFrame* frame,
-                                     const blink::WebHistoryItem& history_item,
-                                     blink::WebHistoryCommitType commit_type);
-  virtual blink::WebEncryptedMediaClient* encryptedMediaClient();
+      bool isRedirect) override;
+  void didAddMessageToConsole(const blink::WebConsoleMessage& message,
+                              const blink::WebString& source_name,
+                              unsigned source_line,
+                              const blink::WebString& stack_trace) override;
+  void didNavigateWithinPage(blink::WebLocalFrame* frame,
+                             const blink::WebHistoryItem& history_item,
+                             blink::WebHistoryCommitType commit_type) override;
+  blink::WebEncryptedMediaClient* encryptedMediaClient() override;
 
   // ViewManagerDelegate methods:
   void OnEmbed(mojo::View* root,
diff --git a/mojo/services/html_viewer/mojo_blink_platform_impl.h b/mojo/services/html_viewer/mojo_blink_platform_impl.h
index af3dd75..742ea98 100644
--- a/mojo/services/html_viewer/mojo_blink_platform_impl.h
+++ b/mojo/services/html_viewer/mojo_blink_platform_impl.h
@@ -21,12 +21,13 @@ class WebCookieJarImpl;
 class MojoBlinkPlatformImpl : public BlinkPlatformImpl {
  public:
   MojoBlinkPlatformImpl(mojo::ApplicationImpl* app);
-  virtual ~MojoBlinkPlatformImpl();
+  ~MojoBlinkPlatformImpl() override;
 
  private:
   // BlinkPlatform
   blink::WebCookieJar* cookieJar() override;
   blink::WebClipboard* clipboard() override;
+
   blink::WebURLLoader* createURLLoader() override;
   blink::WebSocketHandle* createWebSocketHandle() override;
 
diff --git a/mojo/services/html_viewer/test_blink_platform_impl.h b/mojo/services/html_viewer/test_blink_platform_impl.h
index 66c8944..8745c6f 100644
--- a/mojo/services/html_viewer/test_blink_platform_impl.h
+++ b/mojo/services/html_viewer/test_blink_platform_impl.h
@@ -15,12 +15,12 @@ namespace html_viewer {
 class TestBlinkPlatformImpl : public BlinkPlatformImpl {
  public:
   TestBlinkPlatformImpl();
-  virtual ~TestBlinkPlatformImpl();
+  ~TestBlinkPlatformImpl() override;
 
  private:
   // blink::Platform methods:
-  virtual blink::WebCookieJar* cookieJar();
-  virtual blink::WebClipboard* clipboard();
+  blink::WebCookieJar* cookieJar() override;
+  blink::WebClipboard* clipboard() override;
 
   blink::WebClipboard clipboard_;
   blink::WebCookieJar cookie_jar_;
diff --git a/mojo/services/html_viewer/webclipboard_impl.h b/mojo/services/html_viewer/webclipboard_impl.h
index 5edccf4..57edb22 100644
--- a/mojo/services/html_viewer/webclipboard_impl.h
+++ b/mojo/services/html_viewer/webclipboard_impl.h
@@ -16,23 +16,24 @@ class WebClipboardImpl : public blink::WebClipboard {
   virtual ~WebClipboardImpl();
 
   // blink::WebClipboard methods:
-  virtual uint64_t sequenceNumber(Buffer);
-  virtual bool isFormatAvailable(Format, Buffer);
-  virtual blink::WebVector<blink::WebString> readAvailableTypes(
+  uint64_t sequenceNumber(Buffer) override;
+  bool isFormatAvailable(Format, Buffer) override;
+  blink::WebVector<blink::WebString> readAvailableTypes(
       Buffer,
-      bool* containsFilenames);
-  virtual blink::WebString readPlainText(Buffer);
-  virtual blink::WebString readHTML(Buffer buffer,
-                                    blink::WebURL* pageURL,
-                                    unsigned* fragmentStart,
-                                    unsigned* fragmentEnd);
+      bool* containsFilenames) override;
+  blink::WebString readPlainText(Buffer) override;
+  blink::WebString readHTML(Buffer buffer,
+                            blink::WebURL* pageURL,
+                            unsigned* fragmentStart,
+                            unsigned* fragmentEnd) override;
   // TODO(erg): readImage()
-  virtual blink::WebString readCustomData(Buffer, const blink::WebString& type);
-  virtual void writePlainText(const blink::WebString&);
-  virtual void writeHTML(const blink::WebString& htmlText,
-                         const blink::WebURL&,
-                         const blink::WebString& plainText,
-                         bool writeSmartPaste);
+  blink::WebString readCustomData(Buffer,
+                                  const blink::WebString& type) override;
+  void writePlainText(const blink::WebString&) override;
+  void writeHTML(const blink::WebString& htmlText,
+                 const blink::WebURL&,
+                 const blink::WebString& plainText,
+                 bool writeSmartPaste) override;
 
  private:
   // Changes webkit buffers to mojo Clipboard::Types.
diff --git a/mojo/services/html_viewer/webcookiejar_impl.h b/mojo/services/html_viewer/webcookiejar_impl.h
index fdda172..ac53e21 100644
--- a/mojo/services/html_viewer/webcookiejar_impl.h
+++ b/mojo/services/html_viewer/webcookiejar_impl.h
@@ -16,16 +16,15 @@ class WebCookieJarImpl : public blink::WebCookieJar {
   virtual ~WebCookieJarImpl();
 
   // blink::WebCookieJar methods:
-  virtual void setCookie(
+  void setCookie(const blink::WebURL& url,
+                 const blink::WebURL& first_party_for_cookies,
+                 const blink::WebString& cookie) override;
+  blink::WebString cookies(
       const blink::WebURL& url,
-      const blink::WebURL& first_party_for_cookies,
-      const blink::WebString& cookie);
-  virtual blink::WebString cookies(
+      const blink::WebURL& first_party_for_cookies) override;
+  blink::WebString cookieRequestHeaderFieldValue(
       const blink::WebURL& url,
-      const blink::WebURL& first_party_for_cookies);
-  virtual blink::WebString cookieRequestHeaderFieldValue(
-      const blink::WebURL& url,
-      const blink::WebURL& first_party_for_cookies);
+      const blink::WebURL& first_party_for_cookies) override;
 
  private:
   mojo::CookieStorePtr store_;
diff --git a/mojo/services/html_viewer/weblayertreeview_impl.h b/mojo/services/html_viewer/weblayertreeview_impl.h
index 74120bd..e463b8b 100644
--- a/mojo/services/html_viewer/weblayertreeview_impl.h
+++ b/mojo/services/html_viewer/weblayertreeview_impl.h
@@ -42,7 +42,7 @@ class WebLayerTreeViewImpl : public blink::WebLayerTreeView,
       scoped_refptr<base::MessageLoopProxy> compositor_message_loop_proxy,
       mojo::SurfacePtr surface,
       mojo::GpuPtr gpu_service);
-  virtual ~WebLayerTreeViewImpl();
+  ~WebLayerTreeViewImpl() override;
 
   void set_widget(blink::WebWidget* widget) { widget_ = widget; }
   void set_view(mojo::View* view) { view_ = view; }
@@ -72,45 +72,45 @@ class WebLayerTreeViewImpl : public blink::WebLayerTreeView,
   void RateLimitSharedMainThreadContext() override {}
 
   // blink::WebLayerTreeView implementation.
-  virtual void setRootLayer(const blink::WebLayer& layer);
-  virtual void clearRootLayer();
-  virtual void setViewportSize(const blink::WebSize& device_viewport_size);
-  virtual blink::WebSize deviceViewportSize() const;
-  virtual void setDeviceScaleFactor(float);
-  virtual float deviceScaleFactor() const;
-  virtual void setBackgroundColor(blink::WebColor color);
-  virtual void setHasTransparentBackground(bool has_transparent_background);
-  virtual void setVisible(bool visible);
-  virtual void setPageScaleFactorAndLimits(float page_scale_factor,
-                                           float minimum,
-                                           float maximum);
-  virtual void startPageScaleAnimation(const blink::WebPoint& destination,
-                                       bool use_anchor,
-                                       float new_page_scale,
-                                       double duration_sec);
-  virtual void heuristicsForGpuRasterizationUpdated(bool matches_heuristic) {}
-  virtual void setNeedsAnimate();
-  virtual bool commitRequested() const;
-  virtual void didStopFlinging() {}
-  virtual void compositeAndReadbackAsync(
-      blink::WebCompositeAndReadbackAsyncCallback* callback) {}
-  virtual void finishAllRendering();
-  virtual void setDeferCommits(bool defer_commits) {}
-  virtual void registerForAnimations(blink::WebLayer* layer);
-  virtual void registerViewportLayers(
+  void setRootLayer(const blink::WebLayer& layer) override;
+  void clearRootLayer() override;
+  void setViewportSize(const blink::WebSize& device_viewport_size) override;
+  blink::WebSize deviceViewportSize() const override;
+  void setDeviceScaleFactor(float) override;
+  float deviceScaleFactor() const override;
+  void setBackgroundColor(blink::WebColor color) override;
+  void setHasTransparentBackground(bool has_transparent_background) override;
+  void setVisible(bool visible) override;
+  void setPageScaleFactorAndLimits(float page_scale_factor,
+                                   float minimum,
+                                   float maximum) override;
+  void startPageScaleAnimation(const blink::WebPoint& destination,
+                               bool use_anchor,
+                               float new_page_scale,
+                               double duration_sec) override;
+  void heuristicsForGpuRasterizationUpdated(bool matches_heuristic) override {}
+  void setNeedsAnimate() override;
+  bool commitRequested() const override;
+  void didStopFlinging() override {}
+  void compositeAndReadbackAsync(
+      blink::WebCompositeAndReadbackAsyncCallback* callback) override {}
+  void finishAllRendering() override;
+  void setDeferCommits(bool defer_commits) override {}
+  void registerForAnimations(blink::WebLayer* layer) override;
+  void registerViewportLayers(
       const blink::WebLayer* overscrollElasticityLayer,
       const blink::WebLayer* pageScaleLayerLayer,
       const blink::WebLayer* innerViewportScrollLayer,
-      const blink::WebLayer* outerViewportScrollLayer);
-  virtual void clearViewportLayers();
-  virtual void registerSelection(const blink::WebSelectionBound& start,
-                                 const blink::WebSelectionBound& end) {}
-  virtual void clearSelection() {}
-  virtual void setShowFPSCounter(bool) {}
-  virtual void setShowPaintRects(bool) {}
-  virtual void setShowDebugBorders(bool) {}
-  virtual void setContinuousPaintingEnabled(bool) {}
-  virtual void setShowScrollBottleneckRects(bool) {}
+      const blink::WebLayer* outerViewportScrollLayer) override;
+  void clearViewportLayers() override;
+  void registerSelection(const blink::WebSelectionBound& start,
+                         const blink::WebSelectionBound& end) override {}
+  void clearSelection() override {}
+  void setShowFPSCounter(bool) override {}
+  void setShowPaintRects(bool) override {}
+  void setShowDebugBorders(bool) override {}
+  void setContinuousPaintingEnabled(bool) override {}
+  void setShowScrollBottleneckRects(bool) override {}
 
   // OutputSurfaceMojoClient implementation.
   void DidCreateSurface(cc::SurfaceId id) override;
diff --git a/mojo/services/html_viewer/webmimeregistry_impl.h b/mojo/services/html_viewer/webmimeregistry_impl.h
index d629154..fe4baf5 100644
--- a/mojo/services/html_viewer/webmimeregistry_impl.h
+++ b/mojo/services/html_viewer/webmimeregistry_impl.h
@@ -16,29 +16,27 @@ class WebMimeRegistryImpl : public blink::WebMimeRegistry {
   virtual ~WebMimeRegistryImpl() {}
 
   // WebMimeRegistry methods:
-  virtual blink::WebMimeRegistry::SupportsType supportsMIMEType(
-      const blink::WebString& mime_type);
-  virtual blink::WebMimeRegistry::SupportsType supportsImageMIMEType(
-      const blink::WebString& mime_type);
-  virtual blink::WebMimeRegistry::SupportsType supportsImagePrefixedMIMEType(
-      const blink::WebString& mime_type);
-  virtual blink::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType(
-      const blink::WebString& mime_type);
-  virtual blink::WebMimeRegistry::SupportsType supportsMediaMIMEType(
+  blink::WebMimeRegistry::SupportsType supportsMIMEType(
+      const blink::WebString& mime_type) override;
+  blink::WebMimeRegistry::SupportsType supportsImageMIMEType(
+      const blink::WebString& mime_type) override;
+  blink::WebMimeRegistry::SupportsType supportsImagePrefixedMIMEType(
+      const blink::WebString& mime_type) override;
+  blink::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType(
+      const blink::WebString& mime_type) override;
+  blink::WebMimeRegistry::SupportsType supportsMediaMIMEType(
       const blink::WebString& mime_type,
       const blink::WebString& codecs,
-      const blink::WebString& key_system);
-  virtual bool supportsMediaSourceMIMEType(
-      const blink::WebString& mime_type,
-      const blink::WebString& codecs);
-  virtual blink::WebMimeRegistry::SupportsType supportsNonImageMIMEType(
-      const blink::WebString& mime_type);
-  virtual blink::WebString mimeTypeForExtension(
-      const blink::WebString& extension);
-  virtual blink::WebString wellKnownMimeTypeForExtension(
-      const blink::WebString& extension);
-  virtual blink::WebString mimeTypeFromFile(
-      const blink::WebString& path);
+      const blink::WebString& key_system) override;
+  bool supportsMediaSourceMIMEType(const blink::WebString& mime_type,
+                                   const blink::WebString& codecs) override;
+  blink::WebMimeRegistry::SupportsType supportsNonImageMIMEType(
+      const blink::WebString& mime_type) override;
+  blink::WebString mimeTypeForExtension(
+      const blink::WebString& extension) override;
+  blink::WebString wellKnownMimeTypeForExtension(
+      const blink::WebString& extension) override;
+  blink::WebString mimeTypeFromFile(const blink::WebString& path) override;
 };
 
 }  // namespace html_viewer
diff --git a/mojo/services/html_viewer/webscheduler_impl.h b/mojo/services/html_viewer/webscheduler_impl.h
index bd2af6f..a4e2ce5 100644
--- a/mojo/services/html_viewer/webscheduler_impl.h
+++ b/mojo/services/html_viewer/webscheduler_impl.h
@@ -19,10 +19,10 @@ class WebSchedulerImpl : public blink::WebScheduler {
 
  private:
   // blink::WebScheduler overrides.
-  virtual void postIdleTask(const blink::WebTraceLocation& location,
-                            blink::WebThread::IdleTask* task);
-  virtual void postLoadingTask(const blink::WebTraceLocation& location,
-                       blink::WebThread::Task* task);
+  void postIdleTask(const blink::WebTraceLocation& location,
+                    blink::WebThread::IdleTask* task) override;
+  void postLoadingTask(const blink::WebTraceLocation& location,
+                       blink::WebThread::Task* task) override;
   virtual void postTimerTask(const blink::WebTraceLocation& location,
                              blink::WebThread::Task* task,
                              long long delayMs);
diff --git a/mojo/services/html_viewer/websockethandle_impl.h b/mojo/services/html_viewer/websockethandle_impl.h
index eef6a96..3e6f91e 100644
--- a/mojo/services/html_viewer/websockethandle_impl.h
+++ b/mojo/services/html_viewer/websockethandle_impl.h
@@ -28,20 +28,16 @@ class WebSocketHandleImpl : public blink::WebSocketHandle {
  private:
   friend class WebSocketClientImpl;
 
-  virtual ~WebSocketHandleImpl();
+  ~WebSocketHandleImpl() override;
 
   // blink::WebSocketHandle methods:
-  virtual void connect(const blink::WebURL& url,
-                       const blink::WebVector<blink::WebString>& protocols,
-                       const blink::WebSerializedOrigin& origin,
-                       blink::WebSocketHandleClient*) override;
-  virtual void send(bool fin,
-                    MessageType,
-                    const char* data,
-                    size_t size) override;
-  virtual void flowControl(int64_t quota) override;
-  virtual void close(unsigned short code,
-                     const blink::WebString& reason) override;
+  void connect(const blink::WebURL& url,
+               const blink::WebVector<blink::WebString>& protocols,
+               const blink::WebSerializedOrigin& origin,
+               blink::WebSocketHandleClient*) override;
+  void send(bool fin, MessageType, const char* data, size_t size) override;
+  void flowControl(int64_t quota) override;
+  void close(unsigned short code, const blink::WebString& reason) override;
 
   // Called when we finished writing to |send_stream_|.
   void DidWriteToSendStream(bool fin,
diff --git a/mojo/services/html_viewer/webstoragenamespace_impl.cc b/mojo/services/html_viewer/webstoragenamespace_impl.cc
index 12a5060..47d7918 100644
--- a/mojo/services/html_viewer/webstoragenamespace_impl.cc
+++ b/mojo/services/html_viewer/webstoragenamespace_impl.cc
@@ -13,13 +13,9 @@ namespace {
 
 class DummyWebStorageAreaImpl : public blink::WebStorageArea {
  public:
-  virtual unsigned length() {
-    return 0;
-  }
-  virtual blink::WebString key(unsigned index) {
-    return blink::WebString();
-  }
-  virtual blink::WebString getItem(const blink::WebString& key) {
+  unsigned length() override { return 0; }
+  blink::WebString key(unsigned index) override { return blink::WebString(); }
+  blink::WebString getItem(const blink::WebString& key) override {
     return blink::WebString();
   }
 };
diff --git a/mojo/services/html_viewer/webstoragenamespace_impl.h b/mojo/services/html_viewer/webstoragenamespace_impl.h
index 32e17c0..042f982 100644
--- a/mojo/services/html_viewer/webstoragenamespace_impl.h
+++ b/mojo/services/html_viewer/webstoragenamespace_impl.h
@@ -15,12 +15,12 @@ class WebStorageNamespaceImpl : public blink::WebStorageNamespace {
   WebStorageNamespaceImpl();
 
  private:
-  virtual ~WebStorageNamespaceImpl();
+  ~WebStorageNamespaceImpl() override;
 
   // blink::WebStorageNamespace methods:
-  virtual blink::WebStorageArea* createStorageArea(
-      const blink::WebString& origin);
-  virtual bool isSameNamespace(const blink::WebStorageNamespace&) const;
+  blink::WebStorageArea* createStorageArea(
+      const blink::WebString& origin) override;
+  bool isSameNamespace(const blink::WebStorageNamespace&) const override;
 
   DISALLOW_COPY_AND_ASSIGN(WebStorageNamespaceImpl);
 };
diff --git a/mojo/services/html_viewer/webthemeengine_impl.h b/mojo/services/html_viewer/webthemeengine_impl.h
index ed59d1a..6b0dad1 100644
--- a/mojo/services/html_viewer/webthemeengine_impl.h
+++ b/mojo/services/html_viewer/webthemeengine_impl.h
@@ -12,13 +12,12 @@ namespace html_viewer {
 class WebThemeEngineImpl : public blink::WebThemeEngine {
  public:
   // WebThemeEngine methods:
-  virtual blink::WebSize getSize(blink::WebThemeEngine::Part);
-  virtual void paint(
-      blink::WebCanvas* canvas,
-      blink::WebThemeEngine::Part part,
-      blink::WebThemeEngine::State state,
-      const blink::WebRect& rect,
-      const blink::WebThemeEngine::ExtraParams* extra_params);
+  blink::WebSize getSize(blink::WebThemeEngine::Part) override;
+  void paint(blink::WebCanvas* canvas,
+             blink::WebThemeEngine::Part part,
+             blink::WebThemeEngine::State state,
+             const blink::WebRect& rect,
+             const blink::WebThemeEngine::ExtraParams* extra_params) override;
   virtual void paintStateTransition(blink::WebCanvas* canvas,
                                     blink::WebThemeEngine::Part part,
                                     blink::WebThemeEngine::State startState,
diff --git a/mojo/services/html_viewer/webthread_impl.h b/mojo/services/html_viewer/webthread_impl.h
index 013310d..f03d563 100644
--- a/mojo/services/html_viewer/webthread_impl.h
+++ b/mojo/services/html_viewer/webthread_impl.h
@@ -15,13 +15,12 @@ namespace html_viewer {
 
 class WebThreadBase : public blink::WebThread {
  public:
-  virtual ~WebThreadBase();
+  ~WebThreadBase() override;
 
-  virtual void addTaskObserver(TaskObserver* observer);
-  virtual void removeTaskObserver(TaskObserver* observer);
+  void addTaskObserver(TaskObserver* observer) override;
+  void removeTaskObserver(TaskObserver* observer) override;
 
-  virtual bool isCurrentThread() const = 0;
-  virtual blink::PlatformThreadId threadId() const = 0;
+  bool isCurrentThread() const override = 0;
 
  protected:
   WebThreadBase();
@@ -36,20 +35,20 @@ class WebThreadBase : public blink::WebThread {
 class WebThreadImpl : public WebThreadBase {
  public:
   explicit WebThreadImpl(const char* name);
-  virtual ~WebThreadImpl();
+  ~WebThreadImpl() override;
 
-  virtual void postTask(const blink::WebTraceLocation& location, Task* task);
-  virtual void postDelayedTask(const blink::WebTraceLocation& location,
-                               Task* task,
-                               long long delay_ms);
+  void postTask(const blink::WebTraceLocation& location, Task* task) override;
+  void postDelayedTask(const blink::WebTraceLocation& location,
+                       Task* task,
+                       long long delay_ms) override;
 
-  virtual void enterRunLoop();
-  virtual void exitRunLoop();
+  void enterRunLoop() override;
+  void exitRunLoop() override;
 
   base::MessageLoop* message_loop() const { return thread_->message_loop(); }
 
-  virtual bool isCurrentThread() const;
-  virtual blink::PlatformThreadId threadId() const;
+  bool isCurrentThread() const override;
+  blink::PlatformThreadId threadId() const override;
 
  private:
   scoped_ptr<base::Thread> thread_;
@@ -59,19 +58,19 @@ class WebThreadImplForMessageLoop : public WebThreadBase {
  public:
   explicit WebThreadImplForMessageLoop(
       base::MessageLoopProxy* message_loop);
-  virtual ~WebThreadImplForMessageLoop();
+  ~WebThreadImplForMessageLoop() override;
 
-  virtual void postTask(const blink::WebTraceLocation& location, Task* task);
-  virtual void postDelayedTask(const blink::WebTraceLocation& location,
-                               Task* task,
-                               long long delay_ms);
+  void postTask(const blink::WebTraceLocation& location, Task* task) override;
+  void postDelayedTask(const blink::WebTraceLocation& location,
+                       Task* task,
+                       long long delay_ms) override;
 
-  virtual void enterRunLoop();
-  virtual void exitRunLoop();
+  void enterRunLoop() override;
+  void exitRunLoop() override;
 
  private:
-  virtual bool isCurrentThread() const;
-  virtual blink::PlatformThreadId threadId() const;
+  bool isCurrentThread() const override;
+  blink::PlatformThreadId threadId() const override;
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   blink::PlatformThreadId thread_id_;
diff --git a/mojo/services/html_viewer/weburlloader_impl.h b/mojo/services/html_viewer/weburlloader_impl.h
index ecfe6c0..abab1ef 100644
--- a/mojo/services/html_viewer/weburlloader_impl.h
+++ b/mojo/services/html_viewer/weburlloader_impl.h
@@ -22,7 +22,7 @@ namespace html_viewer {
 class WebURLRequestExtraData : public blink::WebURLRequest::ExtraData {
  public:
   WebURLRequestExtraData();
-  virtual ~WebURLRequestExtraData();
+  ~WebURLRequestExtraData() override;
 
   mojo::URLResponsePtr synthetic_response;
 };
@@ -35,13 +35,14 @@ class WebURLLoaderImpl : public blink::WebURLLoader {
   virtual ~WebURLLoaderImpl();
 
   // blink::WebURLLoader methods:
-  virtual void loadSynchronously(
-      const blink::WebURLRequest& request, blink::WebURLResponse& response,
-      blink::WebURLError& error, blink::WebData& data) override;
-  virtual void loadAsynchronously(
-      const blink::WebURLRequest&, blink::WebURLLoaderClient* client) override;
-  virtual void cancel() override;
-  virtual void setDefersLoading(bool defers_loading) override;
+  void loadSynchronously(const blink::WebURLRequest& request,
+                         blink::WebURLResponse& response,
+                         blink::WebURLError& error,
+                         blink::WebData& data) override;
+  void loadAsynchronously(const blink::WebURLRequest&,
+                          blink::WebURLLoaderClient* client) override;
+  void cancel() override;
+  void setDefersLoading(bool defers_loading) override;
 
   void OnReceivedResponse(mojo::URLResponsePtr response);
   void OnReceivedError(mojo::URLResponsePtr response);