Index: media/cdm/default_cdm_factory.h |
diff --git a/media/base/cdm_factory.h b/media/cdm/default_cdm_factory.h |
similarity index 58% |
copy from media/base/cdm_factory.h |
copy to media/cdm/default_cdm_factory.h |
index 0ff84135c626998c0e4d66db2c0e47d4f41f0278..18db3a3f50e8d750281b51dec828fc9b8bebc5f3 100644 |
--- a/media/base/cdm_factory.h |
+++ b/media/cdm/default_cdm_factory.h |
@@ -2,37 +2,33 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef MEDIA_BASE_CDM_FACTORY_H_ |
-#define MEDIA_BASE_CDM_FACTORY_H_ |
+#ifndef MEDIA_CDM_DEFAULT_CDM_FACTORY_H_ |
+#define MEDIA_CDM_DEFAULT_CDM_FACTORY_H_ |
-#include <string> |
- |
-#include "base/memory/scoped_ptr.h" |
-#include "media/base/media_export.h" |
-#include "media/base/media_keys.h" |
- |
-class GURL; |
+#include "base/macros.h" |
+#include "media/base/cdm_factory.h" |
namespace media { |
-class MEDIA_EXPORT CdmFactory { |
+class DefaultCdmFactory : public CdmFactory { |
public: |
- CdmFactory(); |
- virtual ~CdmFactory(); |
+ DefaultCdmFactory(); |
+ ~DefaultCdmFactory() final; |
- virtual scoped_ptr<MediaKeys> Create( |
+ // CdmFactory implementation. |
+ scoped_ptr<MediaKeys> Create( |
const std::string& key_system, |
const GURL& security_origin, |
const SessionMessageCB& session_message_cb, |
const SessionClosedCB& session_closed_cb, |
const SessionErrorCB& session_error_cb, |
const SessionKeysChangeCB& session_keys_change_cb, |
- const SessionExpirationUpdateCB& session_expiration_update_cb) = 0; |
+ const SessionExpirationUpdateCB& session_expiration_update_cb) final; |
private: |
- DISALLOW_COPY_AND_ASSIGN(CdmFactory); |
+ DISALLOW_COPY_AND_ASSIGN(DefaultCdmFactory); |
}; |
} // namespace media |
-#endif // MEDIA_BASE_CDM_FACTORY_H_ |
+#endif // MEDIA_CDM_DEFAULT_CDM_FACTORY_H_ |