Fix some override usage in media/

media/blink/cdm_result_promise.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 MEDIA_BLINK_CDM_RESULT_PROMISE_H_
 #define MEDIA_BLINK_CDM_RESULT_PROMISE_H_
 
 #include "base/basictypes.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/media_keys.h"
 #include "media/blink/cdm_result_promise_helper.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
 namespace media {
 
 // Used to convert a WebContentDecryptionModuleResult into a CdmPromiseTemplate
 // so that it can be passed through Chromium. When resolve(T) is called, the
 // appropriate complete...() method on WebContentDecryptionModuleResult will be
 // invoked. If reject() is called instead,
 // WebContentDecryptionModuleResult::completeWithError() is called.
 // If constructed with a |uma_name|, CdmResultPromise will report the promise
 // result (success or rejection code) to UMA.
 template <typename... T>
 class CdmResultPromise : public media::CdmPromiseTemplate<T...> {
  public:
   CdmResultPromise(const blink::WebContentDecryptionModuleResult& result,
                    const std::string& uma_name);
-  virtual ~CdmResultPromise();
+  ~CdmResultPromise() override;
 
   // CdmPromiseTemplate<T> implementation.
-  virtual void resolve(const T&... result) override;
-  virtual void reject(media::MediaKeys::Exception exception_code,
-                      uint32 system_code,
-                      const std::string& error_message) override;
+  void resolve(const T&... result) override;
+  void reject(media::MediaKeys::Exception exception_code,
+              uint32 system_code,
+              const std::string& error_message) override;
 
  private:
   using media::CdmPromiseTemplate<T...>::MarkPromiseSettled;
 
   blink::WebContentDecryptionModuleResult web_cdm_result_;
 
   // UMA name to report result to.
   std::string uma_name_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmResultPromise);
@@ skipping 35 matching lines @@
   ReportCdmResultUMA(uma_name_,
                      ConvertCdmExceptionToResultForUMA(exception_code));
   web_cdm_result_.completeWithError(ConvertCdmException(exception_code),
                                     system_code,
                                     blink::WebString::fromUTF8(error_message));
 }
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_CDM_RESULT_PROMISE_H_