replace OVERRIDE and FINAL with override and final in media/

media/cdm/ppapi/cdm_helpers.h

 // Copyright 2013 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 MEDIA_CDM_PPAPI_CDM_HELPERS_H_
 #define MEDIA_CDM_PPAPI_CDM_HELPERS_H_
 
 #include <map>
 #include <utility>
 
@@ skipping 15 matching lines @@
 // pp::Buffer_Dev.
 // This class holds a reference to the Buffer_Dev throughout its lifetime.
 // TODO(xhwang): Find a better name. It's confusing to have PpbBuffer,
 // pp::Buffer_Dev and PPB_Buffer_Dev.
 class PpbBuffer : public cdm::Buffer {
  public:
   static PpbBuffer* Create(const pp::Buffer_Dev& buffer, uint32_t buffer_id,
                            PpbBufferAllocator* allocator);
 
   // cdm::Buffer implementation.
-  virtual void Destroy() OVERRIDE;
-  virtual uint32_t Capacity() const OVERRIDE;
-  virtual uint8_t* Data() OVERRIDE;
-  virtual void SetSize(uint32_t size) OVERRIDE;
-  virtual uint32_t Size() const OVERRIDE { return size_; }
+  virtual void Destroy() override;
+  virtual uint32_t Capacity() const override;
+  virtual uint8_t* Data() override;
+  virtual void SetSize(uint32_t size) override;
+  virtual uint32_t Size() const override { return size_; }
 
   // Takes the |buffer_| from this class and returns it.
   // Note: The caller must ensure |allocator->Release()| is called later so that
   // the buffer can be reused by the allocator.
   // Since pp::Buffer_Dev is ref-counted, the caller now holds one reference to
   // the buffer and this class holds no reference. Note that other references
   // may still exist. For example, PpbBufferAllocator always holds a reference
   // to all allocated buffers.
   pp::Buffer_Dev TakeBuffer();
 
@@ skipping 39 matching lines @@
   FreeBufferMap free_buffers_;
 
   DISALLOW_COPY_AND_ASSIGN(PpbBufferAllocator);
 };
 
 class DecryptedBlockImpl : public cdm::DecryptedBlock {
  public:
   DecryptedBlockImpl() : buffer_(NULL), timestamp_(0) {}
   virtual ~DecryptedBlockImpl() { if (buffer_) buffer_->Destroy(); }
 
-  virtual void SetDecryptedBuffer(cdm::Buffer* buffer) OVERRIDE {
+  virtual void SetDecryptedBuffer(cdm::Buffer* buffer) override {
     buffer_ = static_cast<PpbBuffer*>(buffer);
   }
-  virtual cdm::Buffer* DecryptedBuffer() OVERRIDE { return buffer_; }
+  virtual cdm::Buffer* DecryptedBuffer() override { return buffer_; }
 
-  virtual void SetTimestamp(int64_t timestamp) OVERRIDE {
+  virtual void SetTimestamp(int64_t timestamp) override {
     timestamp_ = timestamp;
   }
-  virtual int64_t Timestamp() const OVERRIDE { return timestamp_; }
+  virtual int64_t Timestamp() const override { return timestamp_; }
 
  private:
   PpbBuffer* buffer_;
   int64_t timestamp_;
 
   DISALLOW_COPY_AND_ASSIGN(DecryptedBlockImpl);
 };
 
 class VideoFrameImpl : public cdm::VideoFrame {
  public:
   VideoFrameImpl();
   virtual ~VideoFrameImpl();
 
-  virtual void SetFormat(cdm::VideoFormat format) OVERRIDE {
+  virtual void SetFormat(cdm::VideoFormat format) override {
     format_ = format;
   }
-  virtual cdm::VideoFormat Format() const OVERRIDE { return format_; }
+  virtual cdm::VideoFormat Format() const override { return format_; }
 
-  virtual void SetSize(cdm::Size size) OVERRIDE { size_ = size; }
-  virtual cdm::Size Size() const OVERRIDE { return size_; }
+  virtual void SetSize(cdm::Size size) override { size_ = size; }
+  virtual cdm::Size Size() const override { return size_; }
 
-  virtual void SetFrameBuffer(cdm::Buffer* frame_buffer) OVERRIDE {
+  virtual void SetFrameBuffer(cdm::Buffer* frame_buffer) override {
     frame_buffer_ = static_cast<PpbBuffer*>(frame_buffer);
   }
-  virtual cdm::Buffer* FrameBuffer() OVERRIDE { return frame_buffer_; }
+  virtual cdm::Buffer* FrameBuffer() override { return frame_buffer_; }
 
   virtual void SetPlaneOffset(cdm::VideoFrame::VideoPlane plane,
-                              uint32_t offset) OVERRIDE {
+                              uint32_t offset) override {
     PP_DCHECK(plane < kMaxPlanes);
     plane_offsets_[plane] = offset;
   }
-  virtual uint32_t PlaneOffset(VideoPlane plane) OVERRIDE {
+  virtual uint32_t PlaneOffset(VideoPlane plane) override {
     PP_DCHECK(plane < kMaxPlanes);
     return plane_offsets_[plane];
   }
 
-  virtual void SetStride(VideoPlane plane, uint32_t stride) OVERRIDE {
+  virtual void SetStride(VideoPlane plane, uint32_t stride) override {
     PP_DCHECK(plane < kMaxPlanes);
     strides_[plane] = stride;
   }
-  virtual uint32_t Stride(VideoPlane plane) OVERRIDE {
+  virtual uint32_t Stride(VideoPlane plane) override {
     PP_DCHECK(plane < kMaxPlanes);
     return strides_[plane];
   }
 
-  virtual void SetTimestamp(int64_t timestamp) OVERRIDE {
+  virtual void SetTimestamp(int64_t timestamp) override {
     timestamp_ = timestamp;
   }
-  virtual int64_t Timestamp() const OVERRIDE { return timestamp_; }
+  virtual int64_t Timestamp() const override { return timestamp_; }
 
  private:
   // The video buffer format.
   cdm::VideoFormat format_;
 
   // Width and height of the video frame.
   cdm::Size size_;
 
   // The video frame buffer.
   PpbBuffer* frame_buffer_;
@@ skipping 14 matching lines @@
 
 class AudioFramesImpl : public cdm::AudioFrames_2 {
  public:
   AudioFramesImpl() : buffer_(NULL), format_(cdm::kUnknownAudioFormat) {}
   virtual ~AudioFramesImpl() {
     if (buffer_)
       buffer_->Destroy();
   }
 
   // AudioFrames implementation.
-  virtual void SetFrameBuffer(cdm::Buffer* buffer) OVERRIDE {
+  virtual void SetFrameBuffer(cdm::Buffer* buffer) override {
     buffer_ = static_cast<PpbBuffer*>(buffer);
   }
-  virtual cdm::Buffer* FrameBuffer() OVERRIDE {
+  virtual cdm::Buffer* FrameBuffer() override {
     return buffer_;
   }
-  virtual void SetFormat(cdm::AudioFormat format) OVERRIDE {
+  virtual void SetFormat(cdm::AudioFormat format) override {
     format_ = format;
   }
-  virtual cdm::AudioFormat Format() const OVERRIDE {
+  virtual cdm::AudioFormat Format() const override {
     return format_;
   }
 
   cdm::Buffer* PassFrameBuffer() {
     PpbBuffer* temp_buffer = buffer_;
     buffer_ = NULL;
     return temp_buffer;
   }
 
  private:
   PpbBuffer* buffer_;
   cdm::AudioFormat format_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioFramesImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_CDM_PPAPI_CDM_HELPERS_H_