Replacing the OVERRIDE with override and FINAL with final in content/browser/[accessibility|battery…

content/browser/compositor/surface_display_output_surface.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_
 #define CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_
 
 #include "cc/output/output_surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
@@ skipping 21 matching lines @@
   virtual ~SurfaceDisplayOutputSurface();
 
   void set_display_client(OnscreenDisplayClient* display_client) {
     display_client_ = display_client;
   }
   cc::SurfaceFactory* factory() { return &factory_; }
   void ReceivedVSyncParameters(base::TimeTicks timebase,
                                base::TimeDelta interval);
 
   // cc::OutputSurface implementation.
-  virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE;
-  virtual bool BindToClient(cc::OutputSurfaceClient* client) OVERRIDE;
+  virtual void SwapBuffers(cc::CompositorFrame* frame) override;
+  virtual bool BindToClient(cc::OutputSurfaceClient* client) override;
 
   // cc::SurfaceFactoryClient implementation.
   virtual void ReturnResources(
-      const cc::ReturnedResourceArray& resources) OVERRIDE;
+      const cc::ReturnedResourceArray& resources) override;
 
  private:
   void SwapBuffersComplete();
 
   OnscreenDisplayClient* display_client_;
   cc::SurfaceManager* surface_manager_;
   cc::SurfaceFactory factory_;
   gfx::Size display_size_;
   cc::SurfaceId surface_id_;
   cc::SurfaceIdAllocator allocator_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_