| Index: media/cdm/ppapi/fake_cdm_video_decoder.h
|
| diff --git a/webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.h b/media/cdm/ppapi/fake_cdm_video_decoder.h
|
| similarity index 68%
|
| rename from webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.h
|
| rename to media/cdm/ppapi/fake_cdm_video_decoder.h
|
| index 7c110e2a3283d81e364ffa49e8cf95057457d322..05b16ad0565346ace1e8c91e8d4e0937a7f7e7e3 100644
|
| --- a/webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.h
|
| +++ b/media/cdm/ppapi/fake_cdm_video_decoder.h
|
| @@ -2,19 +2,19 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
|
| -#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
|
| +#ifndef MEDIA_CDM_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
|
| +#define MEDIA_CDM_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
|
|
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| -#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
|
| -#include "webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h"
|
| +#include "media/cdm/ppapi/api/content_decryption_module.h"
|
| +#include "media/cdm/ppapi/cdm_video_decoder.h"
|
|
|
| -namespace webkit_media {
|
| +namespace media {
|
|
|
| class FakeCdmVideoDecoder : public CdmVideoDecoder {
|
| public:
|
| - explicit FakeCdmVideoDecoder(cdm::Allocator* allocator);
|
| + explicit FakeCdmVideoDecoder(cdm::Host* host);
|
| virtual ~FakeCdmVideoDecoder();
|
|
|
| // CdmVideoDecoder implementation.
|
| @@ -36,6 +36,6 @@ class FakeCdmVideoDecoder : public CdmVideoDecoder {
|
| DISALLOW_COPY_AND_ASSIGN(FakeCdmVideoDecoder);
|
| };
|
|
|
| -} // namespace webkit_media
|
| +} // namespace media
|
|
|
| -#endif // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
|
| +#endif // MEDIA_CDM_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
|
|
|