media: Move CdmInitializedPromise to media/.

media/base/cdm_initialized_promise.cc

Index: media/base/cdm_initialized_promise.cc
diff --git a/content/renderer/media/crypto/cdm_initialized_promise.cc b/media/base/cdm_initialized_promise.cc
similarity index 60%
rename from content/renderer/media/crypto/cdm_initialized_promise.cc
rename to media/base/cdm_initialized_promise.cc
index 8d9b7afd6314297e8e13f1e9fa8c1d40ab1c00f3..dcc9c79c830c865c5efc974052becce6e0abcf04 100644
--- a/content/renderer/media/crypto/cdm_initialized_promise.cc
+++ b/media/base/cdm_initialized_promise.cc
@@ -2,13 +2,12 @@
 // 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/cdm_initialized_promise.h"
+#include "media/base/cdm_initialized_promise.h"
 
-namespace content {
+namespace media {
 
-CdmInitializedPromise::CdmInitializedPromise(
-    const media::CdmCreatedCB& cdm_created_cb,
-    scoped_ptr<media::MediaKeys> cdm)
+CdmInitializedPromise::CdmInitializedPromise(const CdmCreatedCB& cdm_created_cb,
+                                             scoped_ptr<MediaKeys> cdm)
     : cdm_created_cb_(cdm_created_cb), cdm_(cdm.Pass()) {
 }
 
@@ -20,11 +19,12 @@ void CdmInitializedPromise::resolve() {
   cdm_created_cb_.Run(cdm_.Pass(), "");
 }
 
-void CdmInitializedPromise::reject(media::MediaKeys::Exception exception_code,
+void CdmInitializedPromise::reject(MediaKeys::Exception exception_code,
                                    uint32 system_code,
                                    const std::string& error_message) {
   MarkPromiseSettled();
   cdm_created_cb_.Run(nullptr, error_message);
+  // Usually after this |this| (and the |cdm_| within it) will be destroyed.
 }
 
-}  // namespace content
+}  // namespace media