| Index: media/cdm/default_cdm_factory.h
|
| diff --git a/media/base/cdm_factory.h b/media/cdm/default_cdm_factory.h
|
| similarity index 60%
|
| copy from media/base/cdm_factory.h
|
| copy to media/cdm/default_cdm_factory.h
|
| index 570c042db65a7f18bc97474b9a4bb916263d7311..cd9049df71c1dc3126642f59d2165435b12506f9 100644
|
| --- a/media/base/cdm_factory.h
|
| +++ b/media/cdm/default_cdm_factory.h
|
| @@ -2,25 +2,21 @@
|
| // 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,
|
| @@ -28,12 +24,12 @@ class MEDIA_EXPORT CdmFactory {
|
| 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_
|
|
|