media: Move CdmInitializedPromise to media/.

content/renderer/media/crypto/ppapi_decryptor.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/renderer/media/crypto/ppapi_decryptor.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/location.h"
 #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"
 #include "media/base/key_systems.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
 
 namespace content {
 
 void PpapiDecryptor::Create(
@@ skipping 21 matching lines @@
   }
 
   scoped_ptr<PpapiDecryptor> ppapi_decryptor(
       new PpapiDecryptor(pepper_cdm_wrapper.Pass(), session_message_cb,
                          session_closed_cb, legacy_session_error_cb,
                          session_keys_change_cb, session_expiration_update_cb));
 
   // 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());
 }
 
 PpapiDecryptor::PpapiDecryptor(
     scoped_ptr<PepperCdmWrapper> pepper_cdm_wrapper,
     const media::SessionMessageCB& session_message_cb,
     const media::SessionClosedCB& session_closed_cb,
     const media::LegacySessionErrorCB& legacy_session_error_cb,
     const media::SessionKeysChangeCB& session_keys_change_cb,
@@ skipping 371 matching lines @@
   DCHECK(render_task_runner_->BelongsToCurrentThread());
   pepper_cdm_wrapper_.reset();
 }
 
 ContentDecryptorDelegate* PpapiDecryptor::CdmDelegate() {
   DCHECK(render_task_runner_->BelongsToCurrentThread());
   return (pepper_cdm_wrapper_) ? pepper_cdm_wrapper_->GetCdmDelegate() : NULL;
 }
 
 }  // namespace content