media: Rename MediaKeys to ContentDecryptionModule

media/base/cdm_callback_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_BASE_CDM_CALLBACK_PROMISE_H_
 #define MEDIA_BASE_CDM_CALLBACK_PROMISE_H_
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "media/base/cdm_promise.h"
+// TODO(xhwang): Remove this include after http://crbug.com/656706 is fixed.
+#include "media/base/content_decryption_module.h"
 #include "media/base/media_export.h"
-#include "media/base/media_keys.h"
 
 namespace media {
 
 typedef base::Callback<void(CdmPromise::Exception exception_code,
                             uint32_t system_code,
                             const std::string& error_message)>
     PromiseRejectedCB;
 
 template <typename... T>
 class MEDIA_EXPORT CdmCallbackPromise : public CdmPromiseTemplate<T...> {
@@ skipping 15 matching lines @@
 
   base::Callback<void(const T&...)> resolve_cb_;
   PromiseRejectedCB reject_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(CdmCallbackPromise);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_CDM_CALLBACK_PROMISE_H_