Standardize usage of virtual/override/final specifiers in content/.

The Google C++ style guide states:

  Explicitly annotate overrides of virtual functions or virtual
  destructors with an override or (less frequently) final specifier.
  Older (pre-C++11) code will use the virtual keyword as an inferior
  alternative annotation. For clarity, use exactly one of override,
  final, or virtual when declaring an override.

To better conform to these guidelines, the following constructs have
been rewritten:

- if a base class has a virtual destructor, then:
    virtual ~Foo();                   ->  ~Foo() override;
- virtual void Foo() override;        ->  void Foo() override;
- virtual void Foo() override final;  ->  void Foo() final;

This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.

Several formatting edits by clang-format were manually reverted, due to
mangling of some of the more complicate IPC macros.

BUG=417463

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

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

23 files changed, 52 insertions, 56 deletions

diff --git a/content/browser/accessibility/dump_accessibility_browsertest_base.h b/content/browser/accessibility/dump_accessibility_browsertest_base.h
index 965fdef..28029d6 100644
--- a/content/browser/accessibility/dump_accessibility_browsertest_base.h
+++ b/content/browser/accessibility/dump_accessibility_browsertest_base.h
@@ -20,7 +20,7 @@ namespace content {
 class DumpAccessibilityTestBase : public ContentBrowserTest {
  public:
   DumpAccessibilityTestBase();
-  virtual ~DumpAccessibilityTestBase();
+  ~DumpAccessibilityTestBase() override;
 
   // Given a path to an HTML file relative to the test directory,
   // loads the HTML, loads the accessibility tree, calls Dump(), then
diff --git a/content/browser/devtools/devtools_agent_host_impl.h b/content/browser/devtools/devtools_agent_host_impl.h
index ac7fff6..19b5c30 100644
--- a/content/browser/devtools/devtools_agent_host_impl.h
+++ b/content/browser/devtools/devtools_agent_host_impl.h
@@ -32,7 +32,7 @@ class CONTENT_EXPORT DevToolsAgentHostImpl : public DevToolsAgentHost {
   virtual void Detach() = 0;
 
   // Sends a message to the agent.
-  virtual void DispatchProtocolMessage(const std::string& message) = 0;
+  void DispatchProtocolMessage(const std::string& message) override = 0;
 
   // Opens the inspector for this host.
   void Inspect(BrowserContext* browser_context);
diff --git a/content/browser/dom_storage/dom_storage_task_runner.h b/content/browser/dom_storage/dom_storage_task_runner.h
index a2000a0..c6bd13e 100644
--- a/content/browser/dom_storage/dom_storage_task_runner.h
+++ b/content/browser/dom_storage/dom_storage_task_runner.h
@@ -36,10 +36,9 @@ class CONTENT_EXPORT DOMStorageTaskRunner
 
   // The PostTask() and PostDelayedTask() methods defined by TaskRunner
   // post shutdown-blocking tasks on the primary sequence.
-  virtual bool PostDelayedTask(
-      const tracked_objects::Location& from_here,
-      const base::Closure& task,
-      base::TimeDelta delay) = 0;
+  bool PostDelayedTask(const tracked_objects::Location& from_here,
+                       const base::Closure& task,
+                       base::TimeDelta delay) override = 0;
 
   // Posts a shutdown blocking task to |sequence_id|.
   virtual bool PostShutdownBlockingTask(
diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.h b/content/browser/gpu/browser_gpu_channel_host_factory.h
index b482b35..33c7fb0 100644
--- a/content/browser/gpu/browser_gpu_channel_host_factory.h
+++ b/content/browser/gpu/browser_gpu_channel_host_factory.h
@@ -41,7 +41,7 @@ class CONTENT_EXPORT BrowserGpuChannelHostFactory
       int32 route_id) override;
 
   // Overridden from GpuMemoryBufferFactoryHost:
-  virtual bool IsGpuMemoryBufferConfigurationSupported(
+  bool IsGpuMemoryBufferConfigurationSupported(
       gfx::GpuMemoryBuffer::Format format,
       gfx::GpuMemoryBuffer::Usage usage) override;
   void CreateGpuMemoryBuffer(
diff --git a/content/browser/permissions/permission_service_context.h b/content/browser/permissions/permission_service_context.h
index 2e1fca1..1e71958 100644
--- a/content/browser/permissions/permission_service_context.h
+++ b/content/browser/permissions/permission_service_context.h
@@ -25,7 +25,7 @@ class PermissionServiceContext : public WebContentsObserver {
  public:
   explicit PermissionServiceContext(RenderFrameHost* render_frame_host);
   explicit PermissionServiceContext(RenderProcessHost* render_process_host);
-  virtual ~PermissionServiceContext();
+  ~PermissionServiceContext() override;
 
   void CreateService(mojo::InterfaceRequest<PermissionService> request);
 
diff --git a/content/browser/permissions/permission_service_impl.h b/content/browser/permissions/permission_service_impl.h
index 75ff85c..d9faa41 100644
--- a/content/browser/permissions/permission_service_impl.h
+++ b/content/browser/permissions/permission_service_impl.h
@@ -23,7 +23,7 @@ namespace content {
 // WebContents for example.
 class PermissionServiceImpl : public mojo::InterfaceImpl<PermissionService> {
  public:
-  virtual ~PermissionServiceImpl();
+  ~PermissionServiceImpl() override;
 
   // Clear pending permissions associated with a given frame and request the
   // browser to cancel the permission requests.
diff --git a/content/browser/power_usage_monitor_impl_unittest.cc b/content/browser/power_usage_monitor_impl_unittest.cc
index 985b132..efa46f2 100644
--- a/content/browser/power_usage_monitor_impl_unittest.cc
+++ b/content/browser/power_usage_monitor_impl_unittest.cc
@@ -60,7 +60,7 @@ class SystemInterfaceForTest : public PowerUsageMonitor::SystemInterface {
 
 class PowerUsageMonitorTest : public testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     monitor_.reset(new PowerUsageMonitor);
     // PowerUsageMonitor assumes ownership.
     scoped_ptr<SystemInterfaceForTest> test_interface(
diff --git a/content/browser/renderer_host/clipboard_message_filter_unittest.cc b/content/browser/renderer_host/clipboard_message_filter_unittest.cc
index 70761b7..0d65dbd 100644
--- a/content/browser/renderer_host/clipboard_message_filter_unittest.cc
+++ b/content/browser/renderer_host/clipboard_message_filter_unittest.cc
@@ -25,7 +25,7 @@ class ClipboardMessageFilterTest : public ::testing::Test {
     filter_->set_peer_pid_for_testing(base::GetCurrentProcId());
   }
 
-  virtual ~ClipboardMessageFilterTest() override {
+  ~ClipboardMessageFilterTest() override {
     ui::Clipboard::DestroyClipboardForCurrentThread();
   }
 
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index 733ca3e..4e35409 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -1452,7 +1452,7 @@ class RenderWidgetHostInitialSizeTest : public RenderWidgetHostTest {
   RenderWidgetHostInitialSizeTest()
       : RenderWidgetHostTest(), initial_size_(200, 100) {}
 
-  virtual void ConfigureView(TestView* view) override {
+  void ConfigureView(TestView* view) override {
     view->set_bounds(gfx::Rect(initial_size_));
   }
 
diff --git a/content/browser/service_worker/service_worker_cache_unittest.cc b/content/browser/service_worker/service_worker_cache_unittest.cc
index aed4c52..e7dbb07 100644
--- a/content/browser/service_worker/service_worker_cache_unittest.cc
+++ b/content/browser/service_worker/service_worker_cache_unittest.cc
@@ -47,15 +47,13 @@ class DelayableBackend : public disk_cache::Backend {
       : backend_(backend.Pass()), delay_open_(false) {}
 
   // disk_cache::Backend overrides
-  virtual net::CacheType GetCacheType() const override {
+  net::CacheType GetCacheType() const override {
     return backend_->GetCacheType();
   }
-  virtual int32 GetEntryCount() const override {
-    return backend_->GetEntryCount();
-  }
-  virtual int OpenEntry(const std::string& key,
-                        disk_cache::Entry** entry,
-                        const CompletionCallback& callback) override {
+  int32 GetEntryCount() const override { return backend_->GetEntryCount(); }
+  int OpenEntry(const std::string& key,
+                disk_cache::Entry** entry,
+                const CompletionCallback& callback) override {
     if (delay_open_) {
       open_entry_callback_ =
           base::Bind(&DelayableBackend::OpenEntryDelayedImpl,
@@ -65,35 +63,35 @@ class DelayableBackend : public disk_cache::Backend {
 
     return backend_->OpenEntry(key, entry, callback);
   }
-  virtual int CreateEntry(const std::string& key,
-                          disk_cache::Entry** entry,
-                          const CompletionCallback& callback) override {
+  int CreateEntry(const std::string& key,
+                  disk_cache::Entry** entry,
+                  const CompletionCallback& callback) override {
     return backend_->CreateEntry(key, entry, callback);
   }
-  virtual int DoomEntry(const std::string& key,
-                        const CompletionCallback& callback) override {
+  int DoomEntry(const std::string& key,
+                const CompletionCallback& callback) override {
     return backend_->DoomEntry(key, callback);
   }
-  virtual int DoomAllEntries(const CompletionCallback& callback) override {
+  int DoomAllEntries(const CompletionCallback& callback) override {
     return backend_->DoomAllEntries(callback);
   }
-  virtual int DoomEntriesBetween(base::Time initial_time,
-                                 base::Time end_time,
-                                 const CompletionCallback& callback) override {
+  int DoomEntriesBetween(base::Time initial_time,
+                         base::Time end_time,
+                         const CompletionCallback& callback) override {
     return backend_->DoomEntriesBetween(initial_time, end_time, callback);
   }
-  virtual int DoomEntriesSince(base::Time initial_time,
-                               const CompletionCallback& callback) override {
+  int DoomEntriesSince(base::Time initial_time,
+                       const CompletionCallback& callback) override {
     return backend_->DoomEntriesSince(initial_time, callback);
   }
-  virtual scoped_ptr<Iterator> CreateIterator() override {
+  scoped_ptr<Iterator> CreateIterator() override {
     return backend_->CreateIterator();
   }
-  virtual void GetStats(
+  void GetStats(
       std::vector<std::pair<std::string, std::string>>* stats) override {
     return backend_->GetStats(stats);
   }
-  virtual void OnExternalCacheHit(const std::string& key) override {
+  void OnExternalCacheHit(const std::string& key) override {
     return backend_->OnExternalCacheHit(key);
   }
 
@@ -137,7 +135,7 @@ class TestServiceWorkerCache : public ServiceWorkerCache {
                            blob_context),
         delay_backend_creation_(false) {}
 
-  virtual void CreateBackend(const ErrorCallback& callback) override {
+  void CreateBackend(const ErrorCallback& callback) override {
     backend_creation_callback_ = callback;
     if (delay_backend_creation_)
       return;
@@ -162,7 +160,7 @@ class TestServiceWorkerCache : public ServiceWorkerCache {
   }
 
  private:
-  virtual ~TestServiceWorkerCache() override {}
+  ~TestServiceWorkerCache() override {}
 
   bool delay_backend_creation_;
   ErrorCallback backend_creation_callback_;
diff --git a/content/browser/service_worker/service_worker_version_unittest.cc b/content/browser/service_worker/service_worker_version_unittest.cc
index a479f68..4011571 100644
--- a/content/browser/service_worker/service_worker_version_unittest.cc
+++ b/content/browser/service_worker/service_worker_version_unittest.cc
@@ -179,7 +179,7 @@ class ServiceWorkerFailToStartTest : public ServiceWorkerVersionTest {
   ServiceWorkerFailToStartTest()
       : ServiceWorkerVersionTest() {}
 
-  virtual scoped_ptr<MessageReceiver> GetMessageReceiver() override {
+  scoped_ptr<MessageReceiver> GetMessageReceiver() override {
     return make_scoped_ptr(new MessageReceiverDisallowStart());
   }
 
diff --git a/content/browser/streams/stream_unittest.cc b/content/browser/streams/stream_unittest.cc
index 73c4ad0..eb83357 100644
--- a/content/browser/streams/stream_unittest.cc
+++ b/content/browser/streams/stream_unittest.cc
@@ -111,7 +111,7 @@ class TestStreamObserver : public StreamRegisterObserver {
     registry->SetRegisterObserver(url, this);
   }
   ~TestStreamObserver() override { registry_->RemoveRegisterObserver(url_); }
-  virtual void OnStreamRegistered(Stream* stream) override {
+  void OnStreamRegistered(Stream* stream) override {
     registered_ = true;
     stream_ = stream;
   }
diff --git a/content/child/resource_scheduling_filter.h b/content/child/resource_scheduling_filter.h
index 49febb7..7ea73c9 100644
--- a/content/child/resource_scheduling_filter.h
+++ b/content/child/resource_scheduling_filter.h
@@ -29,7 +29,7 @@ class CONTENT_EXPORT ResourceSchedulingFilter : public IPC::MessageFilter {
       std::vector<uint32>* supported_message_classes) const override;
 
  protected:
-  virtual ~ResourceSchedulingFilter();
+  ~ResourceSchedulingFilter() override;
 
   void DispatchMessage(const IPC::Message& message);
 
diff --git a/content/renderer/gpu/compositor_external_begin_frame_source.h b/content/renderer/gpu/compositor_external_begin_frame_source.h
index 7535ab8..839f6cf 100644
--- a/content/renderer/gpu/compositor_external_begin_frame_source.h
+++ b/content/renderer/gpu/compositor_external_begin_frame_source.h
@@ -28,11 +28,11 @@ class CompositorExternalBeginFrameSource
       CompositorForwardingMessageFilter* filter,
       IPC::SyncMessageFilter* sync_message_filter,
       int routing_id);
-  virtual ~CompositorExternalBeginFrameSource();
+  ~CompositorExternalBeginFrameSource() override;
 
   // cc::BeginFrameSourceMixIn implementation.
-  virtual void OnNeedsBeginFramesChange(bool needs_begin_frames) override;
-  virtual void SetClientReady() override;
+  void OnNeedsBeginFramesChange(bool needs_begin_frames) override;
+  void SetClientReady() override;
 
  private:
   class CompositorExternalBeginFrameSourceProxy
diff --git a/content/renderer/gpu/compositor_forwarding_message_filter.h b/content/renderer/gpu/compositor_forwarding_message_filter.h
index 7f9c720..9e2afaf 100644
--- a/content/renderer/gpu/compositor_forwarding_message_filter.h
+++ b/content/renderer/gpu/compositor_forwarding_message_filter.h
@@ -47,10 +47,10 @@ class CONTENT_EXPORT CompositorForwardingMessageFilter
   void RemoveHandlerOnCompositorThread(int routing_id, const Handler& handler);
 
   // MessageFilter methods:
-  virtual bool OnMessageReceived(const IPC::Message& message) override;
+  bool OnMessageReceived(const IPC::Message& message) override;
 
  protected:
-  virtual ~CompositorForwardingMessageFilter();
+  ~CompositorForwardingMessageFilter() override;
 
  private:
   void ProcessMessageOnCompositorThread(const IPC::Message& message);
diff --git a/content/renderer/gpu/render_widget_compositor_unittest.cc b/content/renderer/gpu/render_widget_compositor_unittest.cc
index 0dad7688..3f7f337 100644
--- a/content/renderer/gpu/render_widget_compositor_unittest.cc
+++ b/content/renderer/gpu/render_widget_compositor_unittest.cc
@@ -94,7 +94,7 @@ class RenderWidgetOutputSurface : public TestRenderWidget {
   scoped_ptr<cc::OutputSurface> CreateOutputSurface(bool fallback) override;
 
  protected:
-  ~RenderWidgetOutputSurface() {}
+  ~RenderWidgetOutputSurface() override {}
 
  private:
   RenderWidgetCompositorOutputSurface* compositor_;
diff --git a/content/renderer/input/input_scroll_elasticity_controller_unittest.cc b/content/renderer/input/input_scroll_elasticity_controller_unittest.cc
index be1d2e6..1e52db2 100644
--- a/content/renderer/input/input_scroll_elasticity_controller_unittest.cc
+++ b/content/renderer/input/input_scroll_elasticity_controller_unittest.cc
@@ -29,7 +29,7 @@ class MockScrollElasticityHelper : public cc::ScrollElasticityHelper {
         pinned_pos_x_(false),
         pinned_neg_y_(false),
         pinned_pos_y_(false) {}
-  virtual ~MockScrollElasticityHelper() {}
+  ~MockScrollElasticityHelper() override {}
 
   // cc::ScrollElasticityHelper implementation:
   gfx::Vector2dF StretchAmount() override { return stretch_amount_; }
@@ -78,7 +78,7 @@ class ScrollElasticityControllerTest : public testing::Test {
       : controller_(&helper_),
         input_event_count_(0),
         current_time_(base::TimeTicks::FromInternalValue(100000000ull)) {}
-  virtual ~ScrollElasticityControllerTest() {}
+  ~ScrollElasticityControllerTest() override {}
 
   void SendMouseWheelEvent(
       Phase phase,
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.h b/content/renderer/media/webrtc/peer_connection_dependency_factory.h
index 9efbbe2..8a9abe3 100644
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.h
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.h
@@ -61,7 +61,7 @@ class CONTENT_EXPORT PeerConnectionDependencyFactory
  public:
   PeerConnectionDependencyFactory(
       P2PSocketDispatcher* p2p_socket_dispatcher);
-  virtual ~PeerConnectionDependencyFactory();
+  ~PeerConnectionDependencyFactory() override;
 
   // Create a RTCPeerConnectionHandler object that implements the
   // WebKit WebRTCPeerConnectionHandler interface.
@@ -167,7 +167,7 @@ class CONTENT_EXPORT PeerConnectionDependencyFactory
   // Implement base::MessageLoop::DestructionObserver.
   // This makes sure the libjingle PeerConnectionFactory is released before
   // the renderer message loop is destroyed.
-  virtual void WillDestroyCurrentMessageLoop() override;
+  void WillDestroyCurrentMessageLoop() override;
 
   // Creates |pc_factory_|, which in turn is used for
   // creating PeerConnection objects.
diff --git a/content/renderer/media/webrtc/video_destination_handler.cc b/content/renderer/media/webrtc/video_destination_handler.cc
index 4f76645..75e62d0 100644
--- a/content/renderer/media/webrtc/video_destination_handler.cc
+++ b/content/renderer/media/webrtc/video_destination_handler.cc
@@ -189,10 +189,9 @@ class PpFrameWriterProxy : public FrameWriterInterface {
     DCHECK(writer_ != NULL);
   }
 
-  virtual ~PpFrameWriterProxy() {}
+  ~PpFrameWriterProxy() override {}
 
-  virtual void PutFrame(PPB_ImageData_Impl* image_data,
-                        int64 time_stamp_ns) override {
+  void PutFrame(PPB_ImageData_Impl* image_data, int64 time_stamp_ns) override {
     writer_->PutFrame(image_data, time_stamp_ns);
   }
 
diff --git a/content/renderer/media/webrtc/video_destination_handler.h b/content/renderer/media/webrtc/video_destination_handler.h
index 2855e6f..7cb60dd 100644
--- a/content/renderer/media/webrtc/video_destination_handler.h
+++ b/content/renderer/media/webrtc/video_destination_handler.h
@@ -45,8 +45,8 @@ class CONTENT_EXPORT PpFrameWriter
 
   // FrameWriterInterface implementation.
   // This method will be called by the Pepper host from render thread.
-  virtual void PutFrame(PPB_ImageData_Impl* image_data,
-                        int64 time_stamp_ns) override;
+  void PutFrame(PPB_ImageData_Impl* image_data, int64 time_stamp_ns) override;
+
  protected:
   // MediaStreamVideoSource implementation.
   void GetCurrentSupportedFormats(
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index fc0bb1e..23b586a 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -2289,7 +2289,7 @@ class RenderViewImplInitialSizeTest : public RenderViewImplTest {
       : RenderViewImplTest(), initial_size_(200, 100) {}
 
  protected:
-  virtual scoped_ptr<ViewMsg_Resize_Params> InitialSizeParams() override {
+  scoped_ptr<ViewMsg_Resize_Params> InitialSizeParams() override {
     scoped_ptr<ViewMsg_Resize_Params> initial_size_params(
         new ViewMsg_Resize_Params());
     initial_size_params->new_size = initial_size_;
diff --git a/content/test/fake_renderer_scheduler.h b/content/test/fake_renderer_scheduler.h
index 582d7095..45799a7 100644
--- a/content/test/fake_renderer_scheduler.h
+++ b/content/test/fake_renderer_scheduler.h
@@ -12,7 +12,7 @@ namespace content {
 class FakeRendererScheduler : public RendererScheduler {
  public:
   FakeRendererScheduler();
-  virtual ~FakeRendererScheduler();
+  ~FakeRendererScheduler() override;
 
   // RendererScheduler implementation.
   scoped_refptr<base::SingleThreadTaskRunner> DefaultTaskRunner() override;
diff --git a/content/test/test_navigation_url_loader.h b/content/test/test_navigation_url_loader.h
index f65b41a..4dcc80f 100644
--- a/content/test/test_navigation_url_loader.h
+++ b/content/test/test_navigation_url_loader.h
@@ -46,7 +46,7 @@ class TestNavigationURLLoader
   int redirect_count() { return redirect_count_; }
 
  private:
-  ~TestNavigationURLLoader();
+  ~TestNavigationURLLoader() override;
 
   CommonNavigationParams common_params_;
   scoped_ptr<NavigationRequestInfo> request_info_;