media: Move CdmInitializedPromise to media/.

content/renderer/media/crypto/ppapi_decryptor.cc

Index: content/renderer/media/crypto/ppapi_decryptor.cc
diff --git a/content/renderer/media/crypto/ppapi_decryptor.cc b/content/renderer/media/crypto/ppapi_decryptor.cc
index a4b9148422ff15a4e526c6d8523c1114ef25cafb..737b6a0d955b0a148203ac3f6e69601feae94741 100644
--- a/content/renderer/media/crypto/ppapi_decryptor.cc
+++ b/content/renderer/media/crypto/ppapi_decryptor.cc
@@ -11,10 +11,10 @@
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
-#include "content/renderer/media/crypto/cdm_initialized_promise.h"
 #include "content/renderer/pepper/content_decryptor_delegate.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
 #include "media/base/audio_decoder_config.h"
+#include "media/base/cdm_initialized_promise.h"
 #include "media/base/cdm_key_information.h"
 #include "media/base/data_buffer.h"
 #include "media/base/decoder_buffer.h"
@@ -56,8 +56,8 @@ void PpapiDecryptor::Create(
   // PpapiDecryptor ownership passed to the promise, but keep a copy in order
   // to call InitializeCdm().
   PpapiDecryptor* ppapi_decryptor_copy = ppapi_decryptor.get();
-  scoped_ptr<CdmInitializedPromise> promise(
-      new CdmInitializedPromise(cdm_created_cb, ppapi_decryptor.Pass()));
+  scoped_ptr<media::CdmInitializedPromise> promise(
+      new media::CdmInitializedPromise(cdm_created_cb, ppapi_decryptor.Pass()));
   ppapi_decryptor_copy->InitializeCdm(key_system, allow_distinctive_identifier,
                                       allow_persistent_state, promise.Pass());
 }