Standardize usage of virtual/override/final in content/browser/

This patch was automatically generated by applying clang fixit hints
generated by the plugin to the source tree.

BUG=417463
TBR=sky@chromium.org

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

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

15 files changed, 87 insertions, 96 deletions

diff --git a/content/browser/compositor/browser_compositor_ca_layer_tree_mac.h b/content/browser/compositor/browser_compositor_ca_layer_tree_mac.h
index f59d865..b342035 100644
--- a/content/browser/compositor/browser_compositor_ca_layer_tree_mac.h
+++ b/content/browser/compositor/browser_compositor_ca_layer_tree_mac.h
@@ -61,9 +61,9 @@ class BrowserCompositorCALayerTreeMac
 
 private:
   // IOSurfaceLayerClient implementation:
-  virtual bool IOSurfaceLayerShouldAckImmediately() const override;
-  virtual void IOSurfaceLayerDidDrawFrame() override;
-  virtual void IOSurfaceLayerHitError() override;
+ bool IOSurfaceLayerShouldAckImmediately() const override;
+ void IOSurfaceLayerDidDrawFrame() override;
+ void IOSurfaceLayerHitError() override;
 
   void GotAcceleratedCAContextFrame(
       CAContextID ca_context_id, gfx::Size pixel_size, float scale_factor);
diff --git a/content/browser/compositor/browser_compositor_output_surface.h b/content/browser/compositor/browser_compositor_output_surface.h
index a6f557d..dd53876 100644
--- a/content/browser/compositor/browser_compositor_output_surface.h
+++ b/content/browser/compositor/browser_compositor_output_surface.h
@@ -25,14 +25,14 @@ class CONTENT_EXPORT BrowserCompositorOutputSurface
       public ui::CompositorVSyncManager::Observer,
       public base::NonThreadSafe {
  public:
-  virtual ~BrowserCompositorOutputSurface();
+  ~BrowserCompositorOutputSurface() override;
 
   // cc::OutputSurface implementation.
-  virtual bool BindToClient(cc::OutputSurfaceClient* client) override;
+  bool BindToClient(cc::OutputSurfaceClient* client) override;
 
   // ui::CompositorOutputSurface::Observer implementation.
-  virtual void OnUpdateVSyncParameters(base::TimeTicks timebase,
-                                       base::TimeDelta interval) override;
+  void OnUpdateVSyncParameters(base::TimeTicks timebase,
+                               base::TimeDelta interval) override;
 
   void OnUpdateVSyncParametersFromGpu(base::TimeTicks tiembase,
                                       base::TimeDelta interval);
diff --git a/content/browser/compositor/delegated_frame_host.h b/content/browser/compositor/delegated_frame_host.h
index ef467fa..a789ef6 100644
--- a/content/browser/compositor/delegated_frame_host.h
+++ b/content/browser/compositor/delegated_frame_host.h
@@ -81,7 +81,7 @@ class CONTENT_EXPORT DelegatedFrameHost
       public base::SupportsWeakPtr<DelegatedFrameHost> {
  public:
   DelegatedFrameHost(DelegatedFrameHostClient* client);
-  virtual ~DelegatedFrameHost();
+  ~DelegatedFrameHost() override;
 
   bool CanCopyToBitmap() const;
 
@@ -145,24 +145,22 @@ class CONTENT_EXPORT DelegatedFrameHost
   void UnlockResources();
 
   // Overridden from ui::CompositorObserver:
-  virtual void OnCompositingDidCommit(ui::Compositor* compositor) override;
-  virtual void OnCompositingStarted(ui::Compositor* compositor,
-                                    base::TimeTicks start_time) override;
-  virtual void OnCompositingEnded(ui::Compositor* compositor) override;
-  virtual void OnCompositingAborted(ui::Compositor* compositor) override;
-  virtual void OnCompositingLockStateChanged(
-      ui::Compositor* compositor) override;
+  void OnCompositingDidCommit(ui::Compositor* compositor) override;
+  void OnCompositingStarted(ui::Compositor* compositor,
+                            base::TimeTicks start_time) override;
+  void OnCompositingEnded(ui::Compositor* compositor) override;
+  void OnCompositingAborted(ui::Compositor* compositor) override;
+  void OnCompositingLockStateChanged(ui::Compositor* compositor) override;
 
   // Overridden from ui::CompositorVSyncManager::Observer:
-  virtual void OnUpdateVSyncParameters(base::TimeTicks timebase,
-                                       base::TimeDelta interval) override;
+  void OnUpdateVSyncParameters(base::TimeTicks timebase,
+                               base::TimeDelta interval) override;
 
   // Overridden from ui::LayerOwnerObserver:
-  virtual void OnLayerRecreated(ui::Layer* old_layer,
-                                ui::Layer* new_layer) override;
+  void OnLayerRecreated(ui::Layer* old_layer, ui::Layer* new_layer) override;
 
   // Overridden from ImageTransportFactoryObserver:
-  virtual void OnLostResources() override;
+  void OnLostResources() override;
 
   bool ShouldSkipFrame(gfx::Size size_in_dip) const;
 
@@ -217,14 +215,13 @@ class CONTENT_EXPORT DelegatedFrameHost
   void SendReturnedDelegatedResources(uint32 output_surface_id);
 
   // DelegatedFrameEvictorClient implementation.
-  virtual void EvictDelegatedFrame() override;
+  void EvictDelegatedFrame() override;
 
   // cc::DelegatedFrameProviderClient implementation.
-  virtual void UnusedResourcesAreAvailable() override;
+  void UnusedResourcesAreAvailable() override;
 
   // cc::SurfaceFactoryClient implementation.
-  virtual void ReturnResources(
-      const cc::ReturnedResourceArray& resources) override;
+  void ReturnResources(const cc::ReturnedResourceArray& resources) override;
 
   void DidReceiveFrameFromRenderer(const gfx::Rect& damage_rect);
 
diff --git a/content/browser/compositor/gpu_browser_compositor_output_surface.h b/content/browser/compositor/gpu_browser_compositor_output_surface.h
index 0878d77..c558b56 100644
--- a/content/browser/compositor/gpu_browser_compositor_output_surface.h
+++ b/content/browser/compositor/gpu_browser_compositor_output_surface.h
@@ -32,15 +32,15 @@ class GpuBrowserCompositorOutputSurface
       const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
       scoped_ptr<cc::OverlayCandidateValidator> overlay_candidate_validator);
 
-  virtual ~GpuBrowserCompositorOutputSurface();
+  ~GpuBrowserCompositorOutputSurface() override;
 
  protected:
   // cc::OutputSurface implementation.
-  virtual void SwapBuffers(cc::CompositorFrame* frame) override;
-  virtual bool BindToClient(cc::OutputSurfaceClient* client) override;
+  void SwapBuffers(cc::CompositorFrame* frame) override;
+  bool BindToClient(cc::OutputSurfaceClient* client) override;
 
 #if defined(OS_MACOSX)
-  virtual void OnSurfaceDisplayed() override;
+  void OnSurfaceDisplayed() override;
 #endif
 
   CommandBufferProxyImpl* GetCommandBufferProxy();
diff --git a/content/browser/compositor/gpu_process_transport_factory.h b/content/browser/compositor/gpu_process_transport_factory.h
index e4a6885..cdee6c0 100644
--- a/content/browser/compositor/gpu_process_transport_factory.h
+++ b/content/browser/compositor/gpu_process_transport_factory.h
@@ -37,39 +37,35 @@ class GpuProcessTransportFactory
  public:
   GpuProcessTransportFactory();
 
-  virtual ~GpuProcessTransportFactory();
+  ~GpuProcessTransportFactory() override;
 
   scoped_ptr<WebGraphicsContext3DCommandBufferImpl>
   CreateOffscreenCommandBufferContext();
 
   // ui::ContextFactory implementation.
-  virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(
-      ui::Compositor* compositor, bool software_fallback) override;
-  virtual scoped_refptr<ui::Reflector> CreateReflector(
-      ui::Compositor* source,
-      ui::Layer* target) override;
-  virtual void RemoveReflector(
-      scoped_refptr<ui::Reflector> reflector) override;
-  virtual void RemoveCompositor(ui::Compositor* compositor) override;
-  virtual scoped_refptr<cc::ContextProvider>
-      SharedMainThreadContextProvider() override;
-  virtual bool DoesCreateTestContexts() override;
-  virtual cc::SharedBitmapManager* GetSharedBitmapManager() override;
-  virtual cc::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
-  virtual base::MessageLoopProxy* GetCompositorMessageLoop() override;
-  virtual scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator()
-      override;
+  scoped_ptr<cc::OutputSurface> CreateOutputSurface(
+      ui::Compositor* compositor,
+      bool software_fallback) override;
+  scoped_refptr<ui::Reflector> CreateReflector(ui::Compositor* source,
+                                               ui::Layer* target) override;
+  void RemoveReflector(scoped_refptr<ui::Reflector> reflector) override;
+  void RemoveCompositor(ui::Compositor* compositor) override;
+  scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() override;
+  bool DoesCreateTestContexts() override;
+  cc::SharedBitmapManager* GetSharedBitmapManager() override;
+  cc::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override;
+  base::MessageLoopProxy* GetCompositorMessageLoop() override;
+  scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() override;
 
   // ImageTransportFactory implementation.
-  virtual ui::ContextFactory* GetContextFactory() override;
-  virtual gfx::GLSurfaceHandle GetSharedSurfaceHandle() override;
-  virtual cc::SurfaceManager* GetSurfaceManager() override;
-  virtual GLHelper* GetGLHelper() override;
-  virtual void AddObserver(ImageTransportFactoryObserver* observer) override;
-  virtual void RemoveObserver(
-      ImageTransportFactoryObserver* observer) override;
+  ui::ContextFactory* GetContextFactory() override;
+  gfx::GLSurfaceHandle GetSharedSurfaceHandle() override;
+  cc::SurfaceManager* GetSurfaceManager() override;
+  GLHelper* GetGLHelper() override;
+  void AddObserver(ImageTransportFactoryObserver* observer) override;
+  void RemoveObserver(ImageTransportFactoryObserver* observer) override;
 #if defined(OS_MACOSX)
-  virtual void OnSurfaceDisplayed(int surface_id) override;
+  void OnSurfaceDisplayed(int surface_id) override;
 #endif
 
  private:
diff --git a/content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h b/content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h
index 6eed543..a22ab634 100644
--- a/content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h
+++ b/content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h
@@ -21,15 +21,15 @@ class GpuSurfacelessBrowserCompositorOutputSurface
       const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
       scoped_ptr<cc::OverlayCandidateValidator> overlay_candidate_validator,
       unsigned internalformat);
-  virtual ~GpuSurfacelessBrowserCompositorOutputSurface();
+  ~GpuSurfacelessBrowserCompositorOutputSurface() override;
 
  private:
   // cc::OutputSurface implementation.
-  virtual void SwapBuffers(cc::CompositorFrame* frame) override;
-  virtual void OnSwapBuffersComplete() override;
-  virtual void BindFramebuffer() override;
-  virtual void Reshape(const gfx::Size& size, float scale_factor) override;
-  virtual bool BindToClient(cc::OutputSurfaceClient* client) override;
+  void SwapBuffers(cc::CompositorFrame* frame) override;
+  void OnSwapBuffersComplete() override;
+  void BindFramebuffer() override;
+  void Reshape(const gfx::Size& size, float scale_factor) override;
+  bool BindToClient(cc::OutputSurfaceClient* client) override;
 
   unsigned int internalformat_;
   scoped_ptr<BufferQueue> output_surface_;
diff --git a/content/browser/compositor/io_surface_context_mac.h b/content/browser/compositor/io_surface_context_mac.h
index 2654711..7fc466d 100644
--- a/content/browser/compositor/io_surface_context_mac.h
+++ b/content/browser/compositor/io_surface_context_mac.h
@@ -45,7 +45,7 @@ class IOSurfaceContext
   CGLContextObj cgl_context() const { return cgl_context_; }
 
   // content::GpuDataManagerObserver implementation.
-  virtual void OnGpuSwitching() override;
+  void OnGpuSwitching() override;
 
  private:
   friend class base::RefCounted<IOSurfaceContext>;
@@ -53,7 +53,7 @@ class IOSurfaceContext
   IOSurfaceContext(
       Type type,
       base::ScopedTypeRef<CGLContextObj> clg_context_strong);
-  virtual ~IOSurfaceContext();
+  ~IOSurfaceContext() override;
 
   Type type_;
   base::ScopedTypeRef<CGLContextObj> cgl_context_;
diff --git a/content/browser/compositor/onscreen_display_client.h b/content/browser/compositor/onscreen_display_client.h
index 8b6445c..2d611bd 100644
--- a/content/browser/compositor/onscreen_display_client.h
+++ b/content/browser/compositor/onscreen_display_client.h
@@ -28,7 +28,7 @@ class OnscreenDisplayClient : cc::DisplayClient {
       scoped_ptr<cc::OutputSurface> output_surface,
       cc::SurfaceManager* manager,
       scoped_refptr<base::SingleThreadTaskRunner> task_runner);
-  virtual ~OnscreenDisplayClient();
+  ~OnscreenDisplayClient() override;
 
   bool Initialize();
   cc::Display* display() { return display_.get(); }
@@ -37,13 +37,13 @@ class OnscreenDisplayClient : cc::DisplayClient {
   }
 
   // cc::DisplayClient implementation.
-  virtual void DisplayDamaged() override;
-  virtual void DidSwapBuffers() override;
-  virtual void DidSwapBuffersComplete() override;
-  virtual void CommitVSyncParameters(base::TimeTicks timebase,
-                                     base::TimeDelta interval) override;
-  virtual void OutputSurfaceLost() override;
-  virtual void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override;
+  void DisplayDamaged() override;
+  void DidSwapBuffers() override;
+  void DidSwapBuffersComplete() override;
+  void CommitVSyncParameters(base::TimeTicks timebase,
+                             base::TimeDelta interval) override;
+  void OutputSurfaceLost() override;
+  void SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) override;
 
  private:
   void ScheduleDraw();
diff --git a/content/browser/compositor/owned_mailbox.h b/content/browser/compositor/owned_mailbox.h
index 5c22bcd..c886814 100644
--- a/content/browser/compositor/owned_mailbox.h
+++ b/content/browser/compositor/owned_mailbox.h
@@ -31,10 +31,10 @@ class CONTENT_EXPORT OwnedMailbox : public base::RefCounted<OwnedMailbox>,
   void Destroy();
 
  protected:
-  virtual ~OwnedMailbox();
+  ~OwnedMailbox() override;
 
   // ImageTransportFactoryObserver implementation.
-  virtual void OnLostResources() override;
+  void OnLostResources() override;
 
  private:
   friend class base::RefCounted<OwnedMailbox>;
diff --git a/content/browser/compositor/reflector_impl.h b/content/browser/compositor/reflector_impl.h
index 6123cb5..f771fe4 100644
--- a/content/browser/compositor/reflector_impl.h
+++ b/content/browser/compositor/reflector_impl.h
@@ -53,7 +53,7 @@ class ReflectorImpl : public base::SupportsWeakPtr<ReflectorImpl>,
       BrowserCompositorOutputSurface* surface);
 
   // ui::Reflector implementation.
-  virtual void OnMirroringCompositorResized() override;
+  void OnMirroringCompositorResized() override;
 
   // Called in |BrowserCompositorOutputSurface::SwapBuffers| to copy
   // the full screen image to the |texture_id_|. This must be called
@@ -99,7 +99,7 @@ class ReflectorImpl : public base::SupportsWeakPtr<ReflectorImpl>,
     gpu::MailboxHolder mailbox_holder;
   };
 
-  virtual ~ReflectorImpl();
+  ~ReflectorImpl() override;
 
   void AttachToOutputSurfaceOnImplThread(
       const gpu::MailboxHolder& mailbox_holder,
diff --git a/content/browser/compositor/software_browser_compositor_output_surface.h b/content/browser/compositor/software_browser_compositor_output_surface.h
index 33f362d..1df9b36 100644
--- a/content/browser/compositor/software_browser_compositor_output_surface.h
+++ b/content/browser/compositor/software_browser_compositor_output_surface.h
@@ -31,13 +31,13 @@ class CONTENT_EXPORT SoftwareBrowserCompositorOutputSurface
       IDMap<BrowserCompositorOutputSurface>* output_surface_map,
       const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager);
 
-  virtual ~SoftwareBrowserCompositorOutputSurface();
+  ~SoftwareBrowserCompositorOutputSurface() override;
 
  private:
-  virtual void SwapBuffers(cc::CompositorFrame* frame) override;
+  void SwapBuffers(cc::CompositorFrame* frame) override;
 
 #if defined(OS_MACOSX)
-  virtual void OnSurfaceDisplayed() override;
+  void OnSurfaceDisplayed() override;
 #endif
 
   // On the software path we need to explicitly call the proxy to update the
diff --git a/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc b/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc
index f324e77..d165081 100644
--- a/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc
+++ b/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc
@@ -17,10 +17,9 @@ namespace {
 class FakeVSyncProvider : public gfx::VSyncProvider {
  public:
   FakeVSyncProvider() : call_count_(0) {}
-  virtual ~FakeVSyncProvider() {}
+  ~FakeVSyncProvider() override {}
 
-  virtual void GetVSyncParameters(const UpdateVSyncCallback& callback)
-      override {
+  void GetVSyncParameters(const UpdateVSyncCallback& callback) override {
     callback.Run(timebase_, interval_);
     call_count_++;
   }
@@ -42,9 +41,9 @@ class FakeVSyncProvider : public gfx::VSyncProvider {
 class FakeSoftwareOutputDevice : public cc::SoftwareOutputDevice {
  public:
   FakeSoftwareOutputDevice() : vsync_provider_(new FakeVSyncProvider()) {}
-  virtual ~FakeSoftwareOutputDevice() {}
+  ~FakeSoftwareOutputDevice() override {}
 
-  virtual gfx::VSyncProvider* GetVSyncProvider() override {
+  gfx::VSyncProvider* GetVSyncProvider() override {
     return vsync_provider_.get();
   }
 
diff --git a/content/browser/compositor/software_output_device_mac.h b/content/browser/compositor/software_output_device_mac.h
index 393ac9b..4721c61 100644
--- a/content/browser/compositor/software_output_device_mac.h
+++ b/content/browser/compositor/software_output_device_mac.h
@@ -20,9 +20,9 @@ namespace content {
 class SoftwareOutputDeviceMac : public cc::SoftwareOutputDevice {
  public:
   explicit SoftwareOutputDeviceMac(ui::Compositor* compositor);
-  virtual ~SoftwareOutputDeviceMac();
+  ~SoftwareOutputDeviceMac() override;
 
-  virtual void EndPaint(cc::SoftwareFrameData* frame_data) override;
+  void EndPaint(cc::SoftwareFrameData* frame_data) override;
 
  private:
   ui::Compositor* compositor_;
diff --git a/content/browser/compositor/surface_display_output_surface.h b/content/browser/compositor/surface_display_output_surface.h
index ac1a3e2..698b9f5 100644
--- a/content/browser/compositor/surface_display_output_surface.h
+++ b/content/browser/compositor/surface_display_output_surface.h
@@ -29,7 +29,7 @@ class SurfaceDisplayOutputSurface : public cc::OutputSurface,
       cc::SurfaceManager* surface_manager,
       cc::SurfaceIdAllocator* allocator,
       const scoped_refptr<cc::ContextProvider>& context_provider);
-  virtual ~SurfaceDisplayOutputSurface();
+  ~SurfaceDisplayOutputSurface() override;
 
   void set_display_client(OnscreenDisplayClient* display_client) {
     display_client_ = display_client;
@@ -39,12 +39,11 @@ class SurfaceDisplayOutputSurface : public cc::OutputSurface,
                                base::TimeDelta interval);
 
   // cc::OutputSurface implementation.
-  virtual void SwapBuffers(cc::CompositorFrame* frame) override;
-  virtual bool BindToClient(cc::OutputSurfaceClient* client) override;
+  void SwapBuffers(cc::CompositorFrame* frame) override;
+  bool BindToClient(cc::OutputSurfaceClient* client) override;
 
   // cc::SurfaceFactoryClient implementation.
-  virtual void ReturnResources(
-      const cc::ReturnedResourceArray& resources) override;
+  void ReturnResources(const cc::ReturnedResourceArray& resources) override;
 
  private:
   void SwapBuffersComplete();
diff --git a/content/browser/compositor/test/no_transport_image_transport_factory.h b/content/browser/compositor/test/no_transport_image_transport_factory.h
index 67ba4ec..627a323 100644
--- a/content/browser/compositor/test/no_transport_image_transport_factory.h
+++ b/content/browser/compositor/test/no_transport_image_transport_factory.h
@@ -19,17 +19,17 @@ namespace content {
 class NoTransportImageTransportFactory : public ImageTransportFactory {
  public:
   NoTransportImageTransportFactory();
-  virtual ~NoTransportImageTransportFactory();
+  ~NoTransportImageTransportFactory() override;
 
   // ImageTransportFactory implementation.
-  virtual ui::ContextFactory* GetContextFactory() override;
-  virtual gfx::GLSurfaceHandle GetSharedSurfaceHandle() override;
-  virtual cc::SurfaceManager* GetSurfaceManager() override;
-  virtual GLHelper* GetGLHelper() override;
-  virtual void AddObserver(ImageTransportFactoryObserver* observer) override;
-  virtual void RemoveObserver(ImageTransportFactoryObserver* observer) override;
+  ui::ContextFactory* GetContextFactory() override;
+  gfx::GLSurfaceHandle GetSharedSurfaceHandle() override;
+  cc::SurfaceManager* GetSurfaceManager() override;
+  GLHelper* GetGLHelper() override;
+  void AddObserver(ImageTransportFactoryObserver* observer) override;
+  void RemoveObserver(ImageTransportFactoryObserver* observer) override;
 #if defined(OS_MACOSX)
-  virtual void OnSurfaceDisplayed(int surface_id) override {}
+  void OnSurfaceDisplayed(int surface_id) override {}
 #endif
 
  private: