Replacing the OVERRIDE with override and FINAL with final in gpu

gpu/command_buffer/service/query_manager.cc

 // 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.
 
 #include "gpu/command_buffer/service/query_manager.h"
 
 #include "base/atomicops.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
@@ skipping 16 matching lines @@
     : public AsyncPixelTransferCompletionObserver {
  public:
   AsyncPixelTransferCompletionObserverImpl(base::subtle::Atomic32 submit_count)
       : submit_count_(submit_count), cancelled_(false) {}
 
   void Cancel() {
     base::AutoLock locked(lock_);
     cancelled_ = true;
   }
 
-  virtual void DidComplete(const AsyncMemoryParams& mem_params) OVERRIDE {
+  virtual void DidComplete(const AsyncMemoryParams& mem_params) override {
     base::AutoLock locked(lock_);
     if (!cancelled_) {
       DCHECK(mem_params.buffer().get());
       void* data = mem_params.GetDataAddress();
       QuerySync* sync = static_cast<QuerySync*>(data);
       base::subtle::Release_Store(&sync->process_count, submit_count_);
     }
   }
 
  private:
   virtual ~AsyncPixelTransferCompletionObserverImpl() {}
 
   base::subtle::Atomic32 submit_count_;
 
   base::Lock lock_;
   bool cancelled_;
 
   DISALLOW_COPY_AND_ASSIGN(AsyncPixelTransferCompletionObserverImpl);
 };
 
 class AsyncPixelTransfersCompletedQuery
     : public QueryManager::Query,
       public base::SupportsWeakPtr<AsyncPixelTransfersCompletedQuery> {
  public:
   AsyncPixelTransfersCompletedQuery(
       QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset);
 
-  virtual bool Begin() OVERRIDE;
-  virtual bool End(base::subtle::Atomic32 submit_count) OVERRIDE;
-  virtual bool Process() OVERRIDE;
-  virtual void Destroy(bool have_context) OVERRIDE;
+  virtual bool Begin() override;
+  virtual bool End(base::subtle::Atomic32 submit_count) override;
+  virtual bool Process() override;
+  virtual void Destroy(bool have_context) override;
 
  protected:
   virtual ~AsyncPixelTransfersCompletedQuery();
 
   scoped_refptr<AsyncPixelTransferCompletionObserverImpl> observer_;
 };
 
 AsyncPixelTransfersCompletedQuery::AsyncPixelTransfersCompletedQuery(
     QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset)
     : Query(manager, target, shm_id, shm_offset) {
@@ skipping 53 matching lines @@
     observer_->Cancel();
 }
 
 }  // namespace
 
 class AllSamplesPassedQuery : public QueryManager::Query {
  public:
   AllSamplesPassedQuery(
       QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset,
       GLuint service_id);
-  virtual bool Begin() OVERRIDE;
-  virtual bool End(base::subtle::Atomic32 submit_count) OVERRIDE;
-  virtual bool Process() OVERRIDE;
-  virtual void Destroy(bool have_context) OVERRIDE;
+  virtual bool Begin() override;
+  virtual bool End(base::subtle::Atomic32 submit_count) override;
+  virtual bool Process() override;
+  virtual void Destroy(bool have_context) override;
 
  protected:
   virtual ~AllSamplesPassedQuery();
 
  private:
   // Service side query id.
   GLuint service_id_;
 };
 
 AllSamplesPassedQuery::AllSamplesPassedQuery(
@@ skipping 35 matching lines @@
 }
 
 AllSamplesPassedQuery::~AllSamplesPassedQuery() {
 }
 
 class CommandsIssuedQuery : public QueryManager::Query {
  public:
   CommandsIssuedQuery(
       QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset);
 
-  virtual bool Begin() OVERRIDE;
-  virtual bool End(base::subtle::Atomic32 submit_count) OVERRIDE;
-  virtual bool Process() OVERRIDE;
-  virtual void Destroy(bool have_context) OVERRIDE;
+  virtual bool Begin() override;
+  virtual bool End(base::subtle::Atomic32 submit_count) override;
+  virtual bool Process() override;
+  virtual void Destroy(bool have_context) override;
 
  protected:
   virtual ~CommandsIssuedQuery();
 
  private:
   base::TimeTicks begin_time_;
 };
 
 CommandsIssuedQuery::CommandsIssuedQuery(
       QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset)
@@ skipping 23 matching lines @@
 }
 
 CommandsIssuedQuery::~CommandsIssuedQuery() {
 }
 
 class CommandLatencyQuery : public QueryManager::Query {
  public:
   CommandLatencyQuery(
       QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset);
 
-  virtual bool Begin() OVERRIDE;
-  virtual bool End(base::subtle::Atomic32 submit_count) OVERRIDE;
-  virtual bool Process() OVERRIDE;
-  virtual void Destroy(bool have_context) OVERRIDE;
+  virtual bool Begin() override;
+  virtual bool End(base::subtle::Atomic32 submit_count) override;
+  virtual bool Process() override;
+  virtual void Destroy(bool have_context) override;
 
  protected:
   virtual ~CommandLatencyQuery();
 };
 
 CommandLatencyQuery::CommandLatencyQuery(
       QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset)
     : Query(manager, target, shm_id, shm_offset) {
 }
 
@@ skipping 22 matching lines @@
 }
 
 
 class AsyncReadPixelsCompletedQuery
     : public QueryManager::Query,
       public base::SupportsWeakPtr<AsyncReadPixelsCompletedQuery> {
  public:
   AsyncReadPixelsCompletedQuery(
       QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset);
 
-  virtual bool Begin() OVERRIDE;
-  virtual bool End(base::subtle::Atomic32 submit_count) OVERRIDE;
-  virtual bool Process() OVERRIDE;
-  virtual void Destroy(bool have_context) OVERRIDE;
+  virtual bool Begin() override;
+  virtual bool End(base::subtle::Atomic32 submit_count) override;
+  virtual bool Process() override;
+  virtual void Destroy(bool have_context) override;
 
  protected:
   void Complete();
   virtual ~AsyncReadPixelsCompletedQuery();
 
  private:
   bool completed_;
   bool complete_result_;
 };
 
@@ skipping 36 matching lines @@
 
 AsyncReadPixelsCompletedQuery::~AsyncReadPixelsCompletedQuery() {
 }
 
 
 class GetErrorQuery : public QueryManager::Query {
  public:
   GetErrorQuery(
       QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset);
 
-  virtual bool Begin() OVERRIDE;
-  virtual bool End(base::subtle::Atomic32 submit_count) OVERRIDE;
-  virtual bool Process() OVERRIDE;
-  virtual void Destroy(bool have_context) OVERRIDE;
+  virtual bool Begin() override;
+  virtual bool End(base::subtle::Atomic32 submit_count) override;
+  virtual bool Process() override;
+  virtual void Destroy(bool have_context) override;
 
  protected:
   virtual ~GetErrorQuery();
 
  private:
 };
 
 GetErrorQuery::GetErrorQuery(
       QueryManager* manager, GLenum target, int32 shm_id, uint32 shm_offset)
     : Query(manager, target, shm_id, shm_offset) {
@@ skipping 23 matching lines @@
 }
 
 class CommandsCompletedQuery : public QueryManager::Query {
  public:
   CommandsCompletedQuery(QueryManager* manager,
                          GLenum target,
                          int32 shm_id,
                          uint32 shm_offset);
 
   // Overridden from QueryManager::Query:
-  virtual bool Begin() OVERRIDE;
-  virtual bool End(base::subtle::Atomic32 submit_count) OVERRIDE;
-  virtual bool Process() OVERRIDE;
-  virtual void Destroy(bool have_context) OVERRIDE;
+  virtual bool Begin() override;
+  virtual bool End(base::subtle::Atomic32 submit_count) override;
+  virtual bool Process() override;
+  virtual void Destroy(bool have_context) override;
 
  protected:
   virtual ~CommandsCompletedQuery();
 
  private:
   scoped_ptr<gfx::GLFence> fence_;
 };
 
 CommandsCompletedQuery::CommandsCompletedQuery(QueryManager* manager,
                                                GLenum target,
@@ skipping 323 matching lines @@
 bool QueryManager::EndQuery(Query* query, base::subtle::Atomic32 submit_count) {
   DCHECK(query);
   if (!RemovePendingQuery(query)) {
     return false;
   }
   return query->End(submit_count);
 }
 
 }  // namespace gles2
 }  // namespace gpu