Using "override" to explicitly annotate overrides of virtual functions.

components/test_runner/web_frame_test_proxy.h

Index: components/test_runner/web_frame_test_proxy.h
diff --git a/components/test_runner/web_frame_test_proxy.h b/components/test_runner/web_frame_test_proxy.h
index 74a9d2ef4d6734ee7e34c561813704b064711e9a..363f5e3794ec16e9fa2b2b9c532d139f5ce06d40 100644
--- a/components/test_runner/web_frame_test_proxy.h
+++ b/components/test_runner/web_frame_test_proxy.h
@@ -27,29 +27,30 @@ class WebFrameTestProxy : public Base {
   void set_base_proxy(WebTestProxyBase* proxy) { base_proxy_ = proxy; }
 
   // WebFrameClient implementation.
-  virtual blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame,
-                                         const blink::WebPluginParams& params) {
+  blink::WebPlugin* createPlugin(
+      blink::WebLocalFrame* frame,
+      const blink::WebPluginParams& params) override {
     blink::WebPlugin* plugin = base_proxy_->CreatePlugin(frame, params);
     if (plugin)
       return plugin;
     return Base::createPlugin(frame, params);
   }
 
-  virtual blink::WebScreenOrientationClient* webScreenOrientationClient() {
+  blink::WebScreenOrientationClient* webScreenOrientationClient() override {
     return base_proxy_->GetScreenOrientationClientMock();
   }
 
-  virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
-                                      const blink::WebString& source_name,
-                                      unsigned source_line,
-                                      const blink::WebString& stack_trace) {
+  void didAddMessageToConsole(const blink::WebConsoleMessage& message,
+                              const blink::WebString& source_name,
+                              unsigned source_line,
+                              const blink::WebString& stack_trace) override {
     base_proxy_->DidAddMessageToConsole(message, source_name, source_line);
     Base::didAddMessageToConsole(
         message, source_name, source_line, stack_trace);
   }
 
-  virtual bool canCreatePluginWithoutRenderer(
-      const blink::WebString& mime_type) {
+  bool canCreatePluginWithoutRenderer(
+      const blink::WebString& mime_type) override {
     using blink::WebString;
 
     const CR_DEFINE_STATIC_LOCAL(
@@ -57,33 +58,33 @@ class WebFrameTestProxy : public Base {
     return mime_type.utf8().find(suffix.utf8()) != std::string::npos;
   }
 
-  virtual void loadURLExternally(const blink::WebURLRequest& request,
-                                 blink::WebNavigationPolicy policy,
-                                 const blink::WebString& suggested_name,
-                                 bool replaces_current_history_item) {
+  void loadURLExternally(const blink::WebURLRequest& request,
+                         blink::WebNavigationPolicy policy,
+                         const blink::WebString& suggested_name,
+                         bool replaces_current_history_item) override {
     base_proxy_->LoadURLExternally(request, policy, suggested_name,
                                    replaces_current_history_item);
     Base::loadURLExternally(request, policy, suggested_name,
                             replaces_current_history_item);
   }
 
-  virtual void didStartProvisionalLoad(blink::WebLocalFrame* frame,
-                                       double triggeringEventTime) {
+  void didStartProvisionalLoad(blink::WebLocalFrame* frame,
+                               double triggeringEventTime) override {
     base_proxy_->DidStartProvisionalLoad(frame);
     Base::didStartProvisionalLoad(
         frame, triggeringEventTime);
   }
 
-  virtual void didReceiveServerRedirectForProvisionalLoad(
-      blink::WebLocalFrame* frame) {
+  void didReceiveServerRedirectForProvisionalLoad(
+      blink::WebLocalFrame* frame) override {
     base_proxy_->DidReceiveServerRedirectForProvisionalLoad(frame);
     Base::didReceiveServerRedirectForProvisionalLoad(frame);
   }
 
-  virtual void didFailProvisionalLoad(
+  void didFailProvisionalLoad(
       blink::WebLocalFrame* frame,
       const blink::WebURLError& error,
-      blink::WebHistoryCommitType commit_type) {
+      blink::WebHistoryCommitType commit_type) override {
     // If the test finished, don't notify the embedder of the failed load,
     // as we already destroyed the document loader.
     if (base_proxy_->DidFailProvisionalLoad(frame, error, commit_type))
@@ -91,83 +92,83 @@ class WebFrameTestProxy : public Base {
     Base::didFailProvisionalLoad(frame, error, commit_type);
   }
 
-  virtual void didCommitProvisionalLoad(
+  void didCommitProvisionalLoad(
       blink::WebLocalFrame* frame,
       const blink::WebHistoryItem& item,
-      blink::WebHistoryCommitType commit_type) {
+      blink::WebHistoryCommitType commit_type) override {
     base_proxy_->DidCommitProvisionalLoad(frame, item, commit_type);
     Base::didCommitProvisionalLoad(frame, item, commit_type);
   }
 
-  virtual void didReceiveTitle(blink::WebLocalFrame* frame,
-                               const blink::WebString& title,
-                               blink::WebTextDirection direction) {
+  void didReceiveTitle(blink::WebLocalFrame* frame,
+                       const blink::WebString& title,
+                       blink::WebTextDirection direction) override {
     base_proxy_->DidReceiveTitle(frame, title, direction);
     Base::didReceiveTitle(frame, title, direction);
   }
 
-  virtual void didChangeIcon(blink::WebLocalFrame* frame,
-                             blink::WebIconURL::Type icon_type) {
+  void didChangeIcon(blink::WebLocalFrame* frame,
+                     blink::WebIconURL::Type icon_type) override {
     base_proxy_->DidChangeIcon(frame, icon_type);
     Base::didChangeIcon(frame, icon_type);
   }
 
-  virtual void didFinishDocumentLoad(blink::WebLocalFrame* frame, bool empty) {
+  void didFinishDocumentLoad(blink::WebLocalFrame* frame, bool empty) override {
     base_proxy_->DidFinishDocumentLoad(frame);
     Base::didFinishDocumentLoad(frame, empty);
   }
 
-  virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame) {
+  void didHandleOnloadEvents(blink::WebLocalFrame* frame) override {
     base_proxy_->DidHandleOnloadEvents(frame);
     Base::didHandleOnloadEvents(frame);
   }
 
-  virtual void didFailLoad(blink::WebLocalFrame* frame,
-                           const blink::WebURLError& error,
-                           blink::WebHistoryCommitType commit_type) {
+  void didFailLoad(blink::WebLocalFrame* frame,
+                   const blink::WebURLError& error,
+                   blink::WebHistoryCommitType commit_type) override {
     base_proxy_->DidFailLoad(frame, error, commit_type);
     Base::didFailLoad(frame, error, commit_type);
   }
 
-  virtual void didFinishLoad(blink::WebLocalFrame* frame) {
+  void didFinishLoad(blink::WebLocalFrame* frame) override {
     Base::didFinishLoad(frame);
     base_proxy_->DidFinishLoad(frame);
   }
 
-  virtual void didChangeSelection(bool is_selection_empty) {
+  void didChangeSelection(bool is_selection_empty) override {
     base_proxy_->DidChangeSelection(is_selection_empty);
     Base::didChangeSelection(is_selection_empty);
   }
 
-  virtual blink::WebColorChooser* createColorChooser(
+  blink::WebColorChooser* createColorChooser(
       blink::WebColorChooserClient* client,
       const blink::WebColor& initial_color,
-      const blink::WebVector<blink::WebColorSuggestion>& suggestions) {
+      const blink::WebVector<blink::WebColorSuggestion>& suggestions) override {
     return base_proxy_->CreateColorChooser(client, initial_color, suggestions);
   }
 
-  virtual void runModalAlertDialog(const blink::WebString& message) {
+  void runModalAlertDialog(const blink::WebString& message) override {
     base_proxy_->GetDelegate()->PrintMessage(std::string("ALERT: ") +
                                              message.utf8().data() + "\n");
   }
 
-  virtual bool runModalConfirmDialog(const blink::WebString& message) {
+  bool runModalConfirmDialog(const blink::WebString& message) override {
     base_proxy_->GetDelegate()->PrintMessage(std::string("CONFIRM: ") +
                                              message.utf8().data() + "\n");
     return true;
   }
 
-  virtual bool runModalPromptDialog(const blink::WebString& message,
-                                    const blink::WebString& default_value,
-                                    blink::WebString*) {
+  bool runModalPromptDialog(const blink::WebString& message,
+                            const blink::WebString& default_value,
+                            blink::WebString*) override {
     base_proxy_->GetDelegate()->PrintMessage(
         std::string("PROMPT: ") + message.utf8().data() + ", default text: " +
         default_value.utf8().data() + "\n");
     return true;
   }
 
-  virtual bool runModalBeforeUnloadDialog(bool is_reload,
-                                          const blink::WebString& message) {
+  bool runModalBeforeUnloadDialog(bool is_reload,
+                                  const blink::WebString& message) override {
     base_proxy_->GetDelegate()->PrintMessage(
         std::string("CONFIRM NAVIGATION: ") + message.utf8().data() + "\n");
     return !base_proxy_->GetInterfaces()
@@ -175,50 +176,50 @@ class WebFrameTestProxy : public Base {
                 ->ShouldStayOnPageAfterHandlingBeforeUnload();
   }
 
-  virtual void showContextMenu(
-      const blink::WebContextMenuData& context_menu_data) {
+  void showContextMenu(
+      const blink::WebContextMenuData& context_menu_data) override {
     base_proxy_->ShowContextMenu(context_menu_data);
     Base::showContextMenu(context_menu_data);
   }
 
-  virtual void didDetectXSS(const blink::WebURL& insecure_url,
-                            bool did_block_entire_page) {
+  void didDetectXSS(const blink::WebURL& insecure_url,
+                    bool did_block_entire_page) override {
     // This is not implemented in RenderFrameImpl, so need to explicitly call
     // into the base proxy.
     base_proxy_->DidDetectXSS(insecure_url, did_block_entire_page);
     Base::didDetectXSS(insecure_url, did_block_entire_page);
   }
 
-  virtual void didDispatchPingLoader(const blink::WebURL& url) {
+  void didDispatchPingLoader(const blink::WebURL& url) override {
     // This is not implemented in RenderFrameImpl, so need to explicitly call
     // into the base proxy.
     base_proxy_->DidDispatchPingLoader(url);
     Base::didDispatchPingLoader(url);
   }
 
-  virtual void didCreateDataSource(blink::WebLocalFrame* frame,
-                                   blink::WebDataSource* ds) {
+  void didCreateDataSource(blink::WebLocalFrame* frame,
+                           blink::WebDataSource* ds) override {
     Base::didCreateDataSource(frame, ds);
   }
 
-  virtual void willSendRequest(blink::WebLocalFrame* frame,
-                               unsigned identifier,
-                               blink::WebURLRequest& request,
-                               const blink::WebURLResponse& redirect_response) {
+  void willSendRequest(
+      blink::WebLocalFrame* frame,
+      unsigned identifier,
+      blink::WebURLRequest& request,
+      const blink::WebURLResponse& redirect_response) override {
     Base::willSendRequest(frame, identifier, request, redirect_response);
     base_proxy_->WillSendRequest(frame, identifier, request, redirect_response);
   }
 
-  virtual void didReceiveResponse(unsigned identifier,
-                                  const blink::WebURLResponse& response) {
+  void didReceiveResponse(unsigned identifier,
+                          const blink::WebURLResponse& response) override {
     base_proxy_->DidReceiveResponse(identifier, response);
     Base::didReceiveResponse(identifier, response);
   }
 
-  virtual void didChangeResourcePriority(
-      unsigned identifier,
-      const blink::WebURLRequest::Priority& priority,
-      int intra_priority_value) {
+  void didChangeResourcePriority(unsigned identifier,
+                                 const blink::WebURLRequest::Priority& priority,
+                                 int intra_priority_value) override {
     // This is not implemented in RenderFrameImpl, so need to explicitly call
     // into the base proxy.
     base_proxy_->DidChangeResourcePriority(
@@ -227,13 +228,13 @@ class WebFrameTestProxy : public Base {
         identifier, priority, intra_priority_value);
   }
 
-  virtual void didFinishResourceLoad(blink::WebLocalFrame* frame,
-                                     unsigned identifier) {
+  void didFinishResourceLoad(blink::WebLocalFrame* frame,
+                             unsigned identifier) override {
     base_proxy_->DidFinishResourceLoad(frame, identifier);
   }
 
-  virtual blink::WebNavigationPolicy decidePolicyForNavigation(
-      const blink::WebFrameClient::NavigationPolicyInfo& info) {
+  blink::WebNavigationPolicy decidePolicyForNavigation(
+      const blink::WebFrameClient::NavigationPolicyInfo& info) override {
     blink::WebNavigationPolicy policy = base_proxy_->DecidePolicyForNavigation(
         info);
     if (policy == blink::WebNavigationPolicyIgnore)
@@ -242,21 +243,21 @@ class WebFrameTestProxy : public Base {
     return Base::decidePolicyForNavigation(info);
   }
 
-  virtual void willStartUsingPeerConnectionHandler(
-      blink::WebRTCPeerConnectionHandler* handler) {
+  void willStartUsingPeerConnectionHandler(
+      blink::WebRTCPeerConnectionHandler* handler) override {
     // RenderFrameImpl::willStartUsingPeerConnectionHandler can not be mocked.
     // See http://crbug/363285.
   }
 
-  virtual blink::WebUserMediaClient* userMediaClient() {
+  blink::WebUserMediaClient* userMediaClient() override {
     return base_proxy_->GetUserMediaClient();
   }
 
-  virtual bool willCheckAndDispatchMessageEvent(
+  bool willCheckAndDispatchMessageEvent(
       blink::WebLocalFrame* source_frame,
       blink::WebFrame* target_frame,
       blink::WebSecurityOrigin target,
-      blink::WebDOMMessageEvent event) {
+      blink::WebDOMMessageEvent event) override {
     if (base_proxy_->WillCheckAndDispatchMessageEvent(
             source_frame, target_frame, target, event))
       return true;
@@ -264,16 +265,16 @@ class WebFrameTestProxy : public Base {
         source_frame, target_frame, target, event);
   }
 
-  virtual void postAccessibilityEvent(const blink::WebAXObject& object,
-                                      blink::WebAXEvent event) {
+  void postAccessibilityEvent(const blink::WebAXObject& object,
+                              blink::WebAXEvent event) override {
     base_proxy_->PostAccessibilityEvent(object, event);
     Base::postAccessibilityEvent(object, event);
   }
 
-  virtual void checkIfAudioSinkExistsAndIsAuthorized(
+  void checkIfAudioSinkExistsAndIsAuthorized(
       const blink::WebString& sink_id,
       const blink::WebSecurityOrigin& security_origin,
-      blink::WebSetSinkIdCallbacks* web_callbacks) {
+      blink::WebSetSinkIdCallbacks* web_callbacks) override {
     base_proxy_->CheckIfAudioSinkExistsAndIsAuthorized(sink_id, security_origin,
                                                        web_callbacks);
   }