Replacing the OVERRIDE with override and FINAL with final in gpu

gpu/command_buffer/client/client_test_helper.h

 // Copyright (c) 2012 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.
 
 // Helper classes for implementing gpu client side unit tests.
 
 #ifndef GPU_COMMAND_BUFFER_CLIENT_CLIENT_TEST_HELPER_H_
 #define GPU_COMMAND_BUFFER_CLIENT_CLIENT_TEST_HELPER_H_
 
 #include "base/compiler_specific.h"
@@ skipping 10 matching lines @@
 class CommandBufferHelper;
 
 class MockCommandBufferBase : public CommandBufferServiceBase {
  public:
   static const int32 kTransferBufferBaseId = 0x123;
   static const int32 kMaxTransferBuffers = 6;
 
   MockCommandBufferBase();
   virtual ~MockCommandBufferBase();
 
-  virtual bool Initialize() OVERRIDE;
-  virtual State GetLastState() OVERRIDE;
-  virtual int32 GetLastToken() OVERRIDE;
-  virtual void WaitForTokenInRange(int32 start, int32 end) OVERRIDE;
-  virtual void WaitForGetOffsetInRange(int32 start, int32 end) OVERRIDE;
-  virtual void SetGetBuffer(int transfer_buffer_id) OVERRIDE;
-  virtual void SetGetOffset(int32 get_offset) OVERRIDE;
+  virtual bool Initialize() override;
+  virtual State GetLastState() override;
+  virtual int32 GetLastToken() override;
+  virtual void WaitForTokenInRange(int32 start, int32 end) override;
+  virtual void WaitForGetOffsetInRange(int32 start, int32 end) override;
+  virtual void SetGetBuffer(int transfer_buffer_id) override;
+  virtual void SetGetOffset(int32 get_offset) override;
   virtual scoped_refptr<gpu::Buffer> CreateTransferBuffer(size_t size,
-                                                          int32* id) OVERRIDE;
-  virtual scoped_refptr<gpu::Buffer> GetTransferBuffer(int32 id) OVERRIDE;
-  virtual void SetToken(int32 token) OVERRIDE;
-  virtual void SetParseError(error::Error error) OVERRIDE;
-  virtual void SetContextLostReason(error::ContextLostReason reason) OVERRIDE;
+                                                          int32* id) override;
+  virtual scoped_refptr<gpu::Buffer> GetTransferBuffer(int32 id) override;
+  virtual void SetToken(int32 token) override;
+  virtual void SetParseError(error::Error error) override;
+  virtual void SetContextLostReason(error::ContextLostReason reason) override;
 
   // Get's the Id of the next transfer buffer that will be returned
   // by CreateTransferBuffer. This is useful for testing expected ids.
   int32 GetNextFreeTransferBufferId();
 
   void FlushHelper(int32 put_offset);
   void DestroyTransferBufferHelper(int32 id);
 
   virtual void OnFlush() = 0;
 
  private:
   scoped_refptr<Buffer> transfer_buffer_buffers_[kMaxTransferBuffers];
   CommandBufferEntry* ring_buffer_;
   scoped_refptr<Buffer> ring_buffer_buffer_;
   State state_;
 };
 
 class MockClientCommandBuffer : public MockCommandBufferBase {
  public:
   MockClientCommandBuffer();
   virtual ~MockClientCommandBuffer();
 
   // This is so we can use all the gmock functions when Flush is called.
   MOCK_METHOD0(OnFlush, void());
   MOCK_METHOD1(DestroyTransferBuffer, void(int32 id));
 
-  virtual void Flush(int32 put_offset) OVERRIDE;
+  virtual void Flush(int32 put_offset) override;
 
   void DelegateToFake();
 };
 
 class MockClientCommandBufferMockFlush : public MockClientCommandBuffer {
  public:
   MockClientCommandBufferMockFlush();
   virtual ~MockClientCommandBufferMockFlush();
 
   MOCK_METHOD1(Flush, void(int32 put_offset));
@@ skipping 23 matching lines @@
   MOCK_METHOD1(CreateStreamTexture, uint32(uint32));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockClientGpuControl);
 };
 
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_CLIENT_CLIENT_TEST_HELPER_H_