Replacing the OVERRIDE with override and FINAL with final in content/browser/media

content/browser/media/android/browser_demuxer_android.cc

 // 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.
 
 #include "content/browser/media/android/browser_demuxer_android.h"
 
 #include "content/common/media/media_player_messages_android.h"
 
 namespace content {
 
 class BrowserDemuxerAndroid::Internal : public media::DemuxerAndroid {
  public:
   Internal(const scoped_refptr<BrowserDemuxerAndroid>& demuxer,
            int demuxer_client_id)
       : demuxer_(demuxer),
         demuxer_client_id_(demuxer_client_id) {}
 
   virtual ~Internal() {
     DCHECK(ClientIDExists()) << demuxer_client_id_;
     demuxer_->RemoveDemuxerClient(demuxer_client_id_);
   }
 
   // media::DemuxerAndroid implementation.
-  virtual void Initialize(media::DemuxerAndroidClient* client) OVERRIDE {
+  virtual void Initialize(media::DemuxerAndroidClient* client) override {
     DCHECK(!ClientIDExists()) << demuxer_client_id_;
     demuxer_->AddDemuxerClient(demuxer_client_id_, client);
   }
 
-  virtual void RequestDemuxerData(media::DemuxerStream::Type type) OVERRIDE {
+  virtual void RequestDemuxerData(media::DemuxerStream::Type type) override {
     DCHECK(ClientIDExists()) << demuxer_client_id_;
     demuxer_->Send(new MediaPlayerMsg_ReadFromDemuxer(
         demuxer_client_id_, type));
   }
 
   virtual void RequestDemuxerSeek(
       const base::TimeDelta& time_to_seek,
-      bool is_browser_seek) OVERRIDE {
+      bool is_browser_seek) override {
     DCHECK(ClientIDExists()) << demuxer_client_id_;
     demuxer_->Send(new MediaPlayerMsg_DemuxerSeekRequest(
         demuxer_client_id_, time_to_seek, is_browser_seek));
   }
 
  private:
   // Helper for DCHECKing that the ID is still registered.
   bool ClientIDExists() {
     return demuxer_->demuxer_clients_.Lookup(demuxer_client_id_);
   }
@@ skipping 86 matching lines @@
 
 void BrowserDemuxerAndroid::OnDurationChanged(int demuxer_client_id,
                                               const base::TimeDelta& duration) {
   media::DemuxerAndroidClient* client =
       demuxer_clients_.Lookup(demuxer_client_id);
   if (client)
     client->OnDemuxerDurationChanged(duration);
 }
 
 }  // namespace content