| Index: media/cdm/ppapi/libvpx_cdm_video_decoder.h
|
| diff --git a/webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h b/media/cdm/ppapi/libvpx_cdm_video_decoder.h
|
| similarity index 78%
|
| rename from webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h
|
| rename to media/cdm/ppapi/libvpx_cdm_video_decoder.h
|
| index 59674b6de9f3187bf995525eb1a7d68f0911dbd9..3edaa076225bfd14355864042176f0b9426abd48 100644
|
| --- a/webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h
|
| +++ b/media/cdm/ppapi/libvpx_cdm_video_decoder.h
|
| @@ -2,18 +2,18 @@
|
| // 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_LIBVPX_CDM_VIDEO_DECODER_H_
|
| -#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
|
| +#ifndef MEDIA_CDM_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
|
| +#define MEDIA_CDM_PPAPI_LIBVPX_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"
|
|
|
| struct vpx_codec_ctx;
|
| struct vpx_image;
|
|
|
| -namespace webkit_media {
|
| +namespace media {
|
|
|
| class LibvpxCdmVideoDecoder : public CdmVideoDecoder {
|
| public:
|
| @@ -50,6 +50,6 @@ class LibvpxCdmVideoDecoder : public CdmVideoDecoder {
|
| DISALLOW_COPY_AND_ASSIGN(LibvpxCdmVideoDecoder);
|
| };
|
|
|
| -} // namespace webkit_media
|
| +} // namespace media
|
|
|
| -#endif // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
|
| +#endif // MEDIA_CDM_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
|
|
|