media: Move CdmInitializedPromise to media/.

media/base/cdm_initialized_promise.h

Index: media/base/cdm_initialized_promise.h
diff --git a/content/renderer/media/crypto/cdm_initialized_promise.h b/media/base/cdm_initialized_promise.h
similarity index 54%
rename from content/renderer/media/crypto/cdm_initialized_promise.h
rename to media/base/cdm_initialized_promise.h
index 7c3d4c38116c98bac993876ad46c494b0dee8f27..bc4a56970ce0db4917c6d8abec770e55f836719d 100644
--- a/content/renderer/media/crypto/cdm_initialized_promise.h
+++ b/media/base/cdm_initialized_promise.h
@@ -2,38 +2,37 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_MEDIA_CRYPTO_CDM_INITIALIZED_PROMISE_H_
-#define CONTENT_RENDERER_MEDIA_CRYPTO_CDM_INITIALIZED_PROMISE_H_
-
-#include <string>
+#ifndef MEDIA_BASE_CDM_INITIALIZED_PROMISE_H_
+#define MEDIA_BASE_CDM_INITIALIZED_PROMISE_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "media/base/cdm_factory.h"
 #include "media/base/cdm_promise.h"
+#include "media/base/media_export.h"
 #include "media/base/media_keys.h"
 
-namespace content {
+namespace media {
 
 // Promise to be resolved when the CDM is initialized. It owns the MediaKeys
 // object until the initialization completes, which it then passes to
 // |cdm_created_cb|.
-class CdmInitializedPromise : public media::SimpleCdmPromise {
+class MEDIA_EXPORT CdmInitializedPromise : public SimpleCdmPromise {
  public:
-  CdmInitializedPromise(const media::CdmCreatedCB& cdm_created_cb,
-                        scoped_ptr<media::MediaKeys> cdm);
+  CdmInitializedPromise(const CdmCreatedCB& cdm_created_cb,
+                        scoped_ptr<MediaKeys> cdm);
   ~CdmInitializedPromise() override;
 
   // SimpleCdmPromise implementation.
   void resolve() override;
-  void reject(media::MediaKeys::Exception exception_code,
+  void reject(MediaKeys::Exception exception_code,
               uint32 system_code,
               const std::string& error_message) override;
 
  private:
-  media::CdmCreatedCB cdm_created_cb_;
-  scoped_ptr<media::MediaKeys> cdm_;
+  CdmCreatedCB cdm_created_cb_;
+  scoped_ptr<MediaKeys> cdm_;
 };
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_RENDERER_MEDIA_CRYPTO_CDM_INITIALIZED_PROMISE_H_
+#endif  // MEDIA_BASE_CDM_INITIALIZED_PROMISE_H_