Mark functions overriding Blink with "override" in components/html_viewer/.

NOTRY=true
BUG=535367
TEST=it all stays working

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

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

16 files changed, 241 insertions, 240 deletions

diff --git a/components/html_viewer/blink_platform_impl.cc b/components/html_viewer/blink_platform_impl.cc
index c50fb5e..443ba88 100644
--- a/components/html_viewer/blink_platform_impl.cc
+++ b/components/html_viewer/blink_platform_impl.cc
@@ -50,11 +50,11 @@ class WebWaitableEventImpl : public blink::WebWaitableEvent {
     bool initially_signaled = state == InitialState::Signaled;
     impl_.reset(new base::WaitableEvent(manual_reset, initially_signaled));
   }
-  virtual ~WebWaitableEventImpl() {}
+  ~WebWaitableEventImpl() override {}
 
-  virtual void reset() { impl_->Reset(); }
-  virtual void wait() { impl_->Wait(); }
-  virtual void signal() { impl_->Signal(); }
+  void reset() override { impl_->Reset(); }
+  void wait() override { impl_->Wait(); }
+  void signal() override { impl_->Signal(); }
 
   base::WaitableEvent* impl() {
     return impl_.get();
diff --git a/components/html_viewer/blink_platform_impl.h b/components/html_viewer/blink_platform_impl.h
index a0ceae4..25f078f 100644
--- a/components/html_viewer/blink_platform_impl.h
+++ b/components/html_viewer/blink_platform_impl.h
@@ -40,61 +40,61 @@ class BlinkPlatformImpl : public blink::Platform {
   BlinkPlatformImpl(GlobalState* global_state,
                     mojo::ApplicationImpl* app,
                     scheduler::RendererScheduler* renderer_scheduler);
-  virtual ~BlinkPlatformImpl();
+  ~BlinkPlatformImpl() override;
 
   // blink::Platform methods:
-  virtual blink::WebCookieJar* cookieJar();
-  virtual blink::WebClipboard* clipboard();
-  virtual blink::WebMimeRegistry* mimeRegistry();
-  virtual blink::WebThemeEngine* themeEngine();
-  virtual blink::WebString defaultLocale();
-  virtual blink::WebBlobRegistry* blobRegistry();
-  virtual double currentTimeSeconds();
-  virtual double monotonicallyIncreasingTimeSeconds();
-  virtual void cryptographicallyRandomValues(unsigned char* buffer,
-                                             size_t length);
-  virtual bool isThreadedCompositingEnabled();
-  virtual blink::WebCompositorSupport* compositorSupport();
+  blink::WebCookieJar* cookieJar() override;
+  blink::WebClipboard* clipboard() override;
+  blink::WebMimeRegistry* mimeRegistry() override;
+  blink::WebThemeEngine* themeEngine() override;
+  blink::WebString defaultLocale() override;
+  blink::WebBlobRegistry* blobRegistry() override;
+  double currentTimeSeconds() override;
+  double monotonicallyIncreasingTimeSeconds() override;
+  void cryptographicallyRandomValues(unsigned char* buffer,
+                                     size_t length) override;
+  bool isThreadedCompositingEnabled() override;
+  blink::WebCompositorSupport* compositorSupport() override;
   uint32_t getUniqueIdForProcess() override;
   void createMessageChannel(blink::WebMessagePortChannel** channel1,
                             blink::WebMessagePortChannel** channel2) override;
-  virtual blink::WebURLLoader* createURLLoader();
-  virtual blink::WebSocketHandle* createWebSocketHandle();
-  virtual blink::WebString userAgent();
-  virtual blink::WebData parseDataURL(
-      const blink::WebURL& url, blink::WebString& mime_type,
-      blink::WebString& charset);
-  virtual bool isReservedIPAddress(const blink::WebString& host) const;
-  virtual blink::WebURLError cancelledError(const blink::WebURL& url) const;
-  virtual blink::WebThread* createThread(const char* name);
-  virtual blink::WebThread* currentThread();
-  virtual void yieldCurrentThread();
-  virtual blink::WebWaitableEvent* createWaitableEvent(
+  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) 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(
       blink::WebWaitableEvent::ResetPolicy policy,
-      blink::WebWaitableEvent::InitialState state);
-  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::WebGraphicsContext3D* createOffscreenGraphicsContext3D(
+      blink::WebWaitableEvent::InitialState state) 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::WebGraphicsContext3D* createOffscreenGraphicsContext3D(
       const blink::WebGraphicsContext3D::Attributes& attributes,
-      blink::WebGraphicsContext3D* share_context);
-  virtual blink::WebGraphicsContext3D* createOffscreenGraphicsContext3D(
+      blink::WebGraphicsContext3D* share_context) override;
+  blink::WebGraphicsContext3D* createOffscreenGraphicsContext3D(
       const blink::WebGraphicsContext3D::Attributes& attributes,
       blink::WebGraphicsContext3D* share_context,
-      blink::WebGraphicsContext3D::WebGraphicsInfo* gl_info);
-  virtual blink::WebGraphicsContext3D* createOffscreenGraphicsContext3D(
-      const blink::WebGraphicsContext3D::Attributes& attributes);
-  virtual blink::WebGraphicsContext3DProvider*
-      createSharedOffscreenGraphicsContext3DProvider();
-  virtual blink::WebData loadResource(const char* name);
-  virtual blink::WebGestureCurve* createFlingAnimationCurve(
+      blink::WebGraphicsContext3D::WebGraphicsInfo* gl_info) override;
+  blink::WebGraphicsContext3D* createOffscreenGraphicsContext3D(
+      const blink::WebGraphicsContext3D::Attributes& attributes) override;
+  blink::WebGraphicsContext3DProvider*
+  createSharedOffscreenGraphicsContext3DProvider() override;
+  blink::WebData loadResource(const char* name) override;
+  blink::WebGestureCurve* createFlingAnimationCurve(
       blink::WebGestureDevice device_source,
       const blink::WebFloatPoint& velocity,
-      const blink::WebSize& cumulative_scroll);
-  virtual blink::WebCrypto* crypto();
-  virtual blink::WebNotificationManager* notificationManager();
+      const blink::WebSize& cumulative_scroll) override;
+  blink::WebCrypto* crypto() override;
+  blink::WebNotificationManager* notificationManager() override;
 
  private:
   void UpdateWebThreadTLS(blink::WebThread* thread);
diff --git a/components/html_viewer/devtools_agent_impl.h b/components/html_viewer/devtools_agent_impl.h
index 8b942d4..bcb429c 100644
--- a/components/html_viewer/devtools_agent_impl.h
+++ b/components/html_viewer/devtools_agent_impl.h
@@ -41,7 +41,7 @@ class DevToolsAgentImpl : public devtools_service::DevToolsAgent,
   void sendProtocolMessage(int session_id,
                            int call_id,
                            const blink::WebString& response,
-                           const blink::WebString& state);
+                           const blink::WebString& state) override;
 
   void OnConnectionError();
 
diff --git a/components/html_viewer/html_frame.h b/components/html_viewer/html_frame.h
index 34e33e3..9f108ac 100644
--- a/components/html_viewer/html_frame.h
+++ b/components/html_viewer/html_frame.h
@@ -152,59 +152,59 @@ class HTMLFrame : public blink::WebFrameClient,
                    base::TimeTicks navigation_start_time);
 
  protected:
-  virtual ~HTMLFrame();
+  ~HTMLFrame() override;
 
   // WebFrameClient methods:
-  virtual blink::WebMediaPlayer* createMediaPlayer(
+  blink::WebMediaPlayer* createMediaPlayer(
       blink::WebLocalFrame* frame,
       const blink::WebURL& url,
       blink::WebMediaPlayerClient* client,
       blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
       blink::WebContentDecryptionModule* initial_cdm,
-      const blink::WebString& sink_id);
-  virtual blink::WebFrame* createChildFrame(
+      const blink::WebString& sink_id) override;
+  blink::WebFrame* createChildFrame(
       blink::WebLocalFrame* parent,
       blink::WebTreeScopeType scope,
       const blink::WebString& frame_ame,
       blink::WebSandboxFlags sandbox_flags,
-      const blink::WebFrameOwnerProperties& frame_owner_properties);
-  virtual void frameDetached(blink::WebFrame* frame,
-                             blink::WebFrameClient::DetachType type);
-  virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
-  virtual blink::WebNavigationPolicy decidePolicyForNavigation(
-      const NavigationPolicyInfo& info);
-  virtual bool hasPendingNavigation(blink::WebLocalFrame* frame);
-  virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame);
-  virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
-                                      const blink::WebString& source_name,
-                                      unsigned source_line,
-                                      const blink::WebString& stack_trace);
-  virtual void didFinishLoad(blink::WebLocalFrame* frame);
-  virtual void didNavigateWithinPage(blink::WebLocalFrame* frame,
-                                     const blink::WebHistoryItem& history_item,
-                                     blink::WebHistoryCommitType commit_type);
-  virtual blink::WebGeolocationClient* geolocationClient();
-  virtual blink::WebEncryptedMediaClient* encryptedMediaClient();
-  virtual void didStartLoading(bool to_different_document);
-  virtual void didStopLoading();
-  virtual void didChangeLoadProgress(double load_progress);
-  virtual void dispatchLoad();
-  virtual void didChangeName(blink::WebLocalFrame* frame,
-                             const blink::WebString& name);
-  virtual void didCommitProvisionalLoad(
+      const blink::WebFrameOwnerProperties& frame_owner_properties) override;
+  void frameDetached(blink::WebFrame* frame,
+                     blink::WebFrameClient::DetachType type) override;
+  blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame) override;
+  blink::WebNavigationPolicy decidePolicyForNavigation(
+      const NavigationPolicyInfo& info) override;
+  bool hasPendingNavigation(blink::WebLocalFrame* frame) override;
+  void didHandleOnloadEvents(blink::WebLocalFrame* frame) override;
+  void didAddMessageToConsole(const blink::WebConsoleMessage& message,
+                              const blink::WebString& source_name,
+                              unsigned source_line,
+                              const blink::WebString& stack_trace) override;
+  void didFinishLoad(blink::WebLocalFrame* frame) override;
+  void didNavigateWithinPage(blink::WebLocalFrame* frame,
+                             const blink::WebHistoryItem& history_item,
+                             blink::WebHistoryCommitType commit_type) override;
+  blink::WebGeolocationClient* geolocationClient() override;
+  blink::WebEncryptedMediaClient* encryptedMediaClient() override;
+  void didStartLoading(bool to_different_document) override;
+  void didStopLoading() override;
+  void didChangeLoadProgress(double load_progress) override;
+  void dispatchLoad() override;
+  void didChangeName(blink::WebLocalFrame* frame,
+                     const blink::WebString& name) override;
+  void didCommitProvisionalLoad(
       blink::WebLocalFrame* frame,
       const blink::WebHistoryItem& item,
-      blink::WebHistoryCommitType commit_type);
-  virtual void didReceiveTitle(blink::WebLocalFrame* frame,
-                               const blink::WebString& title,
-                               blink::WebTextDirection direction);
-  virtual void reportFindInFrameMatchCount(int identifier,
-                                           int count,
-                                           bool finalUpdate);
-  virtual void reportFindInPageSelection(int identifier,
-                                         int activeMatchOrdinal,
-                                         const blink::WebRect& selection);
-  virtual bool shouldSearchSingleFrame();
+      blink::WebHistoryCommitType commit_type) override;
+  void didReceiveTitle(blink::WebLocalFrame* frame,
+                       const blink::WebString& title,
+                       blink::WebTextDirection direction) override;
+  void reportFindInFrameMatchCount(int identifier,
+                                   int count,
+                                   bool finalUpdate) override;
+  void reportFindInPageSelection(int identifier,
+                                 int activeMatchOrdinal,
+                                 const blink::WebRect& selection) override;
+  bool shouldSearchSingleFrame() override;
 
  private:
   friend class HTMLFrameTreeManager;
@@ -310,17 +310,17 @@ class HTMLFrame : public blink::WebFrameClient,
   void StopHighlightingFindResults() override;
 
   // blink::WebRemoteFrameClient:
-  virtual void frameDetached(blink::WebRemoteFrameClient::DetachType type);
-  virtual void postMessageEvent(blink::WebLocalFrame* source_web_frame,
-                                blink::WebRemoteFrame* target_web_frame,
-                                blink::WebSecurityOrigin target_origin,
-                                blink::WebDOMMessageEvent event);
-  virtual void initializeChildFrame(const blink::WebRect& frame_rect,
-                                    float scale_factor);
-  virtual void navigate(const blink::WebURLRequest& request,
-                        bool should_replace_current_entry);
-  virtual void reload(bool ignore_cache, bool is_client_redirect);
-  virtual void frameRectsChanged(const blink::WebRect& frame_rect);
+  void frameDetached(blink::WebRemoteFrameClient::DetachType type) override;
+  void postMessageEvent(blink::WebLocalFrame* source_web_frame,
+                        blink::WebRemoteFrame* target_web_frame,
+                        blink::WebSecurityOrigin target_origin,
+                        blink::WebDOMMessageEvent event) override;
+  void initializeChildFrame(const blink::WebRect& frame_rect,
+                            float scale_factor) override;
+  void navigate(const blink::WebURLRequest& request,
+                bool should_replace_current_entry) override;
+  void reload(bool ignore_cache, bool is_client_redirect) override;
+  void frameRectsChanged(const blink::WebRect& frame_rect) override;
 
   HTMLFrameTreeManager* frame_tree_manager_;
   HTMLFrame* parent_;
diff --git a/components/html_viewer/html_widget.h b/components/html_viewer/html_widget.h
index 7ae9f4c..03cd280 100644
--- a/components/html_viewer/html_widget.h
+++ b/components/html_viewer/html_widget.h
@@ -45,8 +45,8 @@ class HTMLWidgetRootRemote : public HTMLWidget, public blink::WebViewClient {
 
  private:
   // WebViewClient methods:
-  virtual blink::WebStorageNamespace* createSessionStorageNamespace();
-  virtual bool allowsBrokenNullLayerTreeView() const;
+  blink::WebStorageNamespace* createSessionStorageNamespace() override;
+  bool allowsBrokenNullLayerTreeView() const override;
 
   // HTMLWidget:
   blink::WebWidget* GetWidget() override;
@@ -79,15 +79,15 @@ class HTMLWidgetRootLocal : public HTMLWidget, public blink::WebViewClient {
 
  protected:
   // WebViewClient methods:
-  virtual blink::WebStorageNamespace* createSessionStorageNamespace();
-  virtual void initializeLayerTreeView();
-  virtual blink::WebLayerTreeView* layerTreeView();
-  virtual void didMeaningfulLayout(blink::WebMeaningfulLayout layout_type);
-  virtual void resetInputMethod();
-  virtual void didHandleGestureEvent(const blink::WebGestureEvent& event,
-                                     bool event_cancelled);
-  virtual void didUpdateTextOfFocusedElementByNonUserInput();
-  virtual void showImeIfNeeded();
+  blink::WebStorageNamespace* createSessionStorageNamespace() override;
+  void initializeLayerTreeView() override;
+  blink::WebLayerTreeView* layerTreeView() override;
+  void didMeaningfulLayout(blink::WebMeaningfulLayout layout_type) override;
+  void resetInputMethod() override;
+  void didHandleGestureEvent(const blink::WebGestureEvent& event,
+                             bool event_cancelled) override;
+  void didUpdateTextOfFocusedElementByNonUserInput() override;
+  void showImeIfNeeded() override;
 
  private:
   // HTMLWidget:
@@ -119,13 +119,13 @@ class HTMLWidgetLocalRoot : public HTMLWidget, public blink::WebWidgetClient {
   void OnWindowBoundsChanged(mus::Window* window) override;
 
   // WebWidgetClient:
-  virtual void initializeLayerTreeView();
-  virtual blink::WebLayerTreeView* layerTreeView();
-  virtual void resetInputMethod();
-  virtual void didHandleGestureEvent(const blink::WebGestureEvent& event,
-                                     bool event_cancelled);
-  virtual void didUpdateTextOfFocusedElementByNonUserInput();
-  virtual void showImeIfNeeded();
+  void initializeLayerTreeView() override;
+  blink::WebLayerTreeView* layerTreeView() override;
+  void resetInputMethod() override;
+  void didHandleGestureEvent(const blink::WebGestureEvent& event,
+                             bool event_cancelled) override;
+  void didUpdateTextOfFocusedElementByNonUserInput() override;
+  void showImeIfNeeded() override;
 
   mojo::ApplicationImpl* app_;
   GlobalState* global_state_;
diff --git a/components/html_viewer/mock_web_blob_registry_impl.h b/components/html_viewer/mock_web_blob_registry_impl.h
index 1a8ee38..687e685 100644
--- a/components/html_viewer/mock_web_blob_registry_impl.h
+++ b/components/html_viewer/mock_web_blob_registry_impl.h
@@ -22,28 +22,28 @@ namespace html_viewer {
 class MockWebBlobRegistryImpl : public blink::WebBlobRegistry {
  public:
   MockWebBlobRegistryImpl();
-  virtual ~MockWebBlobRegistryImpl();
+  ~MockWebBlobRegistryImpl() override;
 
-  virtual void registerBlobData(const blink::WebString& uuid,
-                                const blink::WebBlobData& data);
-  virtual void addBlobDataRef(const blink::WebString& uuid);
-  virtual void removeBlobDataRef(const blink::WebString& uuid);
-  virtual void registerPublicBlobURL(const blink::WebURL&,
-                                     const blink::WebString& uuid);
-  virtual void revokePublicBlobURL(const blink::WebURL&);
+  void registerBlobData(const blink::WebString& uuid,
+                        const blink::WebBlobData& data) override;
+  void addBlobDataRef(const blink::WebString& uuid) override;
+  void removeBlobDataRef(const blink::WebString& uuid) override;
+  void registerPublicBlobURL(const blink::WebURL&,
+                             const blink::WebString& uuid) override;
+  void revokePublicBlobURL(const blink::WebURL&) override;
 
   // Additional support for Streams.
-  virtual void registerStreamURL(const blink::WebURL& url,
-                                 const blink::WebString& content_type);
-  virtual void registerStreamURL(const blink::WebURL& url,
-                                 const blink::WebURL& src_url);
-  virtual void addDataToStream(const blink::WebURL& url,
-                               const char* data,
-                               size_t length);
-  virtual void flushStream(const blink::WebURL& url);
-  virtual void finalizeStream(const blink::WebURL& url);
-  virtual void abortStream(const blink::WebURL& url);
-  virtual void unregisterStreamURL(const blink::WebURL& url);
+  void registerStreamURL(const blink::WebURL& url,
+                         const blink::WebString& content_type) override;
+  void registerStreamURL(const blink::WebURL& url,
+                         const blink::WebURL& src_url) override;
+  void addDataToStream(const blink::WebURL& url,
+                       const char* data,
+                       size_t length) override;
+  void flushStream(const blink::WebURL& url) override;
+  void finalizeStream(const blink::WebURL& url) override;
+  void abortStream(const blink::WebURL& url) override;
+  void unregisterStreamURL(const blink::WebURL& url) override;
 
   bool GetUUIDForURL(const blink::WebURL& url, blink::WebString* uuid) const;
   bool GetBlobItems(const blink::WebString& uuid,
diff --git a/components/html_viewer/test_html_viewer_impl.cc b/components/html_viewer/test_html_viewer_impl.cc
index b006255..b8f98ee 100644
--- a/components/html_viewer/test_html_viewer_impl.cc
+++ b/components/html_viewer/test_html_viewer_impl.cc
@@ -42,11 +42,12 @@ class TestHTMLViewerImpl::ExecutionCallbackImpl
   ExecutionCallbackImpl(TestHTMLViewerImpl* host,
                         const mojo::Callback<void(mojo::String)>& callback)
       : host_(host), callback_(callback) {}
-  virtual ~ExecutionCallbackImpl() {}
+  ~ExecutionCallbackImpl() override {}
 
  private:
   // blink::WebScriptExecutionCallback:
-  virtual void completed(const blink::WebVector<v8::Local<v8::Value>>& result) {
+  void completed(
+      const blink::WebVector<v8::Local<v8::Value>>& result) override {
     mojo::String callback_result;
     if (!result.isEmpty())
       callback_result = V8ValueToJSONString(host_->web_frame_, result);
diff --git a/components/html_viewer/web_clipboard_impl.h b/components/html_viewer/web_clipboard_impl.h
index 407ef81..fd1e18a 100644
--- a/components/html_viewer/web_clipboard_impl.h
+++ b/components/html_viewer/web_clipboard_impl.h
@@ -16,24 +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 buffer,
-      bool* contains_filenames);
-  virtual blink::WebString readPlainText(Buffer buffer);
-  virtual blink::WebString readHTML(Buffer buffer,
-                                    blink::WebURL* page_url,
-                                    unsigned* fragment_start,
-                                    unsigned* fragment_end);
+      bool* contains_filenames) override;
+  blink::WebString readPlainText(Buffer buffer) override;
+  blink::WebString readHTML(Buffer buffer,
+                            blink::WebURL* page_url,
+                            unsigned* fragment_start,
+                            unsigned* fragment_end) override;
   // TODO(erg): readImage()
-  virtual blink::WebString readCustomData(Buffer buffer,
-                                          const blink::WebString& type);
-  virtual void writePlainText(const blink::WebString& plain_text);
-  virtual void writeHTML(const blink::WebString& html_text,
-                         const blink::WebURL& source_url,
-                         const blink::WebString& plain_text,
-                         bool write_smart_paste);
+  blink::WebString readCustomData(Buffer buffer,
+                                  const blink::WebString& type) override;
+  void writePlainText(const blink::WebString& plain_text) override;
+  void writeHTML(const blink::WebString& html_text,
+                 const blink::WebURL& source_url,
+                 const blink::WebString& plain_text,
+                 bool write_smart_paste) override;
 
  private:
   // Changes webkit buffers to mojo Clipboard::Types.
diff --git a/components/html_viewer/web_cookie_jar_impl.h b/components/html_viewer/web_cookie_jar_impl.h
index bec897e..d8ae21b 100644
--- a/components/html_viewer/web_cookie_jar_impl.h
+++ b/components/html_viewer/web_cookie_jar_impl.h
@@ -16,15 +16,15 @@ class WebCookieJarImpl : public blink::WebCookieJar {
   virtual ~WebCookieJarImpl();
 
   // blink::WebCookieJar methods:
-  virtual void setCookie(const blink::WebURL& url,
-                         const blink::WebURL& first_party_for_cookies,
-                         const blink::WebString& cookie);
-  virtual blink::WebString cookies(
+  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);
-  virtual blink::WebString cookieRequestHeaderFieldValue(
+      const blink::WebURL& first_party_for_cookies) override;
+  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/components/html_viewer/web_graphics_context_3d_command_buffer_impl.h b/components/html_viewer/web_graphics_context_3d_command_buffer_impl.h
index 37076df..adcd03d 100644
--- a/components/html_viewer/web_graphics_context_3d_command_buffer_impl.h
+++ b/components/html_viewer/web_graphics_context_3d_command_buffer_impl.h
@@ -44,7 +44,7 @@ class WebGraphicsContext3DCommandBufferImpl
       const GURL& active_url,
       const blink::WebGraphicsContext3D::Attributes& attributes,
       blink::WebGraphicsContext3D* share_context);
-  virtual ~WebGraphicsContext3DCommandBufferImpl();
+  ~WebGraphicsContext3DCommandBufferImpl() override;
 
   static void ContextLostThunk(void* closure) {
     static_cast<WebGraphicsContext3DCommandBufferImpl*>(closure)->ContextLost();
diff --git a/components/html_viewer/web_layer_tree_view_impl.h b/components/html_viewer/web_layer_tree_view_impl.h
index aa2ee3c..bcd833b 100644
--- a/components/html_viewer/web_layer_tree_view_impl.h
+++ b/components/html_viewer/web_layer_tree_view_impl.h
@@ -72,40 +72,40 @@ class WebLayerTreeViewImpl : public blink::WebLayerTreeView,
       override {}
 
   // blink::WebLayerTreeView implementation.
-  virtual void setRootLayer(const blink::WebLayer& layer);
-  virtual void clearRootLayer();
-  virtual void setViewportSize(const blink::WebSize& device_viewport_size);
-  virtual void setDeviceScaleFactor(float);
+  void setRootLayer(const blink::WebLayer& layer) override;
+  void clearRootLayer() override;
+  void setViewportSize(const blink::WebSize& device_viewport_size) override;
+  void setDeviceScaleFactor(float) override;
   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 void didStopFlinging() {}
-  virtual void compositeAndReadbackAsync(
-      blink::WebCompositeAndReadbackAsyncCallback* callback) {}
-  virtual void setDeferCommits(bool defer_commits) {}
-  virtual void registerForAnimations(blink::WebLayer* layer);
-  virtual void registerViewportLayers(
+  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;
+  void didStopFlinging() override {}
+  void compositeAndReadbackAsync(
+      blink::WebCompositeAndReadbackAsyncCallback* callback) 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::WebSelection& selection) {}
-  virtual void clearSelection() {}
-  virtual void setShowFPSCounter(bool) {}
-  virtual void setShowPaintRects(bool) {}
-  virtual void setShowDebugBorders(bool) {}
-  virtual void setShowScrollBottleneckRects(bool) {}
+      const blink::WebLayer* outerViewportScrollLayer) override;
+  void clearViewportLayers() override;
+  void registerSelection(const blink::WebSelection& selection) override {}
+  void clearSelection() override {}
+  void setShowFPSCounter(bool) override {}
+  void setShowPaintRects(bool) override {}
+  void setShowDebugBorders(bool) override {}
+  void setShowScrollBottleneckRects(bool) override {}
 
  private:
   // widget_ and window_ will outlive us.
diff --git a/components/html_viewer/web_mime_registry_impl.h b/components/html_viewer/web_mime_registry_impl.h
index 0440adc..f021488 100644
--- a/components/html_viewer/web_mime_registry_impl.h
+++ b/components/html_viewer/web_mime_registry_impl.h
@@ -16,26 +16,26 @@ 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);
+      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;
 };
 
 }  // namespace html_viewer
diff --git a/components/html_viewer/web_socket_handle_impl.h b/components/html_viewer/web_socket_handle_impl.h
index 9537d3e..fda06b0 100644
--- a/components/html_viewer/web_socket_handle_impl.h
+++ b/components/html_viewer/web_socket_handle_impl.h
@@ -28,16 +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::WebSecurityOrigin& origin,
-                       blink::WebSocketHandleClient*);
-  virtual void send(bool fin, MessageType, const char* data, size_t size);
-  virtual void flowControl(int64_t quota);
-  virtual void close(unsigned short code, const blink::WebString& reason);
+  void connect(const blink::WebURL& url,
+               const blink::WebVector<blink::WebString>& protocols,
+               const blink::WebSecurityOrigin& 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/components/html_viewer/web_storage_namespace_impl.h b/components/html_viewer/web_storage_namespace_impl.h
index 1c199aa..3ccb864 100644
--- a/components/html_viewer/web_storage_namespace_impl.h
+++ b/components/html_viewer/web_storage_namespace_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/components/html_viewer/web_theme_engine_impl.h b/components/html_viewer/web_theme_engine_impl.h
index e146e9d..bce5501 100644
--- a/components/html_viewer/web_theme_engine_impl.h
+++ b/components/html_viewer/web_theme_engine_impl.h
@@ -12,12 +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/components/html_viewer/web_url_loader_impl.h b/components/html_viewer/web_url_loader_impl.h
index a513efa..09dcf27 100644
--- a/components/html_viewer/web_url_loader_impl.h
+++ b/components/html_viewer/web_url_loader_impl.h
@@ -25,7 +25,7 @@ namespace html_viewer {
 class WebURLRequestExtraData : public blink::WebURLRequest::ExtraData {
  public:
   WebURLRequestExtraData();
-  virtual ~WebURLRequestExtraData();
+  ~WebURLRequestExtraData() override;
 
   mojo::URLResponsePtr synthetic_response;
 };
@@ -36,18 +36,18 @@ class WebURLLoaderImpl : public blink::WebURLLoader {
                             MockWebBlobRegistryImpl* web_blob_registry);
 
  private:
-  virtual ~WebURLLoaderImpl();
+  ~WebURLLoaderImpl() override;
 
   // blink::WebURLLoader methods:
-  virtual void loadSynchronously(const blink::WebURLRequest& request,
-                                 blink::WebURLResponse& response,
-                                 blink::WebURLError& error,
-                                 blink::WebData& data);
-  virtual void loadAsynchronously(const blink::WebURLRequest&,
-                                  blink::WebURLLoaderClient* client);
-  virtual void cancel();
-  virtual void setDefersLoading(bool defers_loading);
-  virtual void setLoadingTaskRunner(blink::WebTaskRunner* web_task_runner);
+  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 setLoadingTaskRunner(blink::WebTaskRunner* web_task_runner) override;
 
   void OnReceivedResponse(const blink::WebURLRequest& request,
                           mojo::URLResponsePtr response);