| Index: content/renderer/media/crypto/content_decryption_module_factory.h
|
| diff --git a/content/renderer/media/crypto/content_decryption_module_factory.h b/content/renderer/media/crypto/content_decryption_module_factory.h
|
| deleted file mode 100644
|
| index be91112a902456418bab9c677a7e7e1bd0963c36..0000000000000000000000000000000000000000
|
| --- a/content/renderer/media/crypto/content_decryption_module_factory.h
|
| +++ /dev/null
|
| @@ -1,48 +0,0 @@
|
| -// 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.
|
| -
|
| -#ifndef CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_
|
| -#define CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_
|
| -
|
| -#include <string>
|
| -
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "media/base/media_keys.h"
|
| -
|
| -#if defined(ENABLE_PEPPER_CDMS)
|
| -#include "content/renderer/media/crypto/pepper_cdm_wrapper.h"
|
| -#endif
|
| -
|
| -class GURL;
|
| -
|
| -namespace content {
|
| -
|
| -#if defined(ENABLE_BROWSER_CDMS)
|
| -class RendererCdmManager;
|
| -#endif
|
| -
|
| -class ContentDecryptionModuleFactory {
|
| - public:
|
| - // |create_pepper_cdm_cb| will be called synchronously if necessary. The other
|
| - // callbacks can be called asynchronously.
|
| - static scoped_ptr<media::MediaKeys> Create(
|
| - const std::string& key_system,
|
| - const GURL& security_origin,
|
| -#if defined(ENABLE_PEPPER_CDMS)
|
| - const CreatePepperCdmCB& create_pepper_cdm_cb,
|
| -#elif defined(ENABLE_BROWSER_CDMS)
|
| - RendererCdmManager* manager,
|
| - int* cdm_id, // Output parameter indicating the CDM ID of the MediaKeys.
|
| -#endif // defined(ENABLE_PEPPER_CDMS)
|
| - const media::SessionMessageCB& session_message_cb,
|
| - const media::SessionReadyCB& session_ready_cb,
|
| - const media::SessionClosedCB& session_closed_cb,
|
| - const media::SessionErrorCB& session_error_cb,
|
| - const media::SessionKeysChangeCB& session_keys_change_cb,
|
| - const media::SessionExpirationUpdateCB& session_expiration_update_cb);
|
| -};
|
| -
|
| -} // namespace content
|
| -
|
| -#endif // CONTENT_RENDERER_MEDIA_CRYPTO_CONTENT_DECRYPTION_MODULE_FACTORY_H_
|
|
|