Move ClearKeyCdm files to media/cdm/ppapi/external_clear_key/.

TBR=ddorwin@chromium.org

Review URL: https://codereview.chromium.org/65553004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242550 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 41 insertions, 41 deletions

diff --git a/media/cdm/ppapi/cdm_video_decoder.cc b/media/cdm/ppapi/external_clear_key/cdm_video_decoder.cc
index 0477c0a..74a1b28 100644
--- a/media/cdm/ppapi/cdm_video_decoder.cc
+++ b/media/cdm/ppapi/external_clear_key/cdm_video_decoder.cc
@@ -4,18 +4,18 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "media/cdm/ppapi/cdm_video_decoder.h"
+#include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h"
 
 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
-#include "media/cdm/ppapi/fake_cdm_video_decoder.h"
+#include "media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h"
 #endif
 
 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
-#include "media/cdm/ppapi/ffmpeg_cdm_video_decoder.h"
+#include "media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h"
 #endif
 
 #if defined(CLEAR_KEY_CDM_USE_LIBVPX_DECODER)
-#include "media/cdm/ppapi/libvpx_cdm_video_decoder.h"
+#include "media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h"
 #endif
 
 namespace media {
diff --git a/media/cdm/ppapi/cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/cdm_video_decoder.h
index 3eefb63..fd84b77 100644
--- a/media/cdm/ppapi/cdm_video_decoder.h
+++ b/media/cdm/ppapi/external_clear_key/cdm_video_decoder.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CDM_PPAPI_CDM_VIDEO_DECODER_H_
-#define MEDIA_CDM_PPAPI_CDM_VIDEO_DECODER_H_
+#ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CDM_VIDEO_DECODER_H_
+#define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CDM_VIDEO_DECODER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/cdm/ppapi/api/content_decryption_module.h"
-#include "media/cdm/ppapi/clear_key_cdm_common.h"
+#include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h"
 
 namespace media {
 
@@ -41,4 +41,4 @@ scoped_ptr<CdmVideoDecoder> CreateVideoDecoder(
 
 }  // namespace media
 
-#endif  // MEDIA_CDM_PPAPI_CDM_VIDEO_DECODER_H_
+#endif  // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CDM_VIDEO_DECODER_H_
diff --git a/media/cdm/ppapi/clear_key_cdm.cc b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
index ea89e82..90ebab4 100644
--- a/media/cdm/ppapi/clear_key_cdm.cc
+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/cdm/ppapi/clear_key_cdm.h"
+#include "media/cdm/ppapi/external_clear_key/clear_key_cdm.h"
 
 #include <algorithm>
 #include <sstream>
@@ -16,7 +16,7 @@
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
 #include "media/cdm/ppapi/cdm_file_io_test.h"
-#include "media/cdm/ppapi/cdm_video_decoder.h"
+#include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h"
 
 #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)
 #include "base/basictypes.h"
@@ -28,8 +28,8 @@ const int64 kNoTimestamp = kint64min;
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "media/base/media.h"
-#include "media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h"
-#include "media/cdm/ppapi/ffmpeg_cdm_video_decoder.h"
+#include "media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h"
+#include "media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h"
 
 // Include FFmpeg avformat.h for av_register_all().
 extern "C" {
diff --git a/media/cdm/ppapi/clear_key_cdm.h b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h
index 79c8af0..45d9c05 100644
--- a/media/cdm/ppapi/clear_key_cdm.h
+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CDM_PPAPI_CLEAR_KEY_CDM_H_
-#define MEDIA_CDM_PPAPI_CLEAR_KEY_CDM_H_
+#ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
+#define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
 
 #include <string>
 #include <vector>
@@ -14,7 +14,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "media/cdm/aes_decryptor.h"
-#include "media/cdm/ppapi/clear_key_cdm_common.h"
+#include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h"
 
 // Enable this to use the fake decoder for testing.
 // TODO(tomfinegan): Move fake audio decoder into a separate class.
@@ -150,4 +150,4 @@ class ClearKeyCdm : public ClearKeyCdmInterface {
 
 }  // namespace media
 
-#endif  // MEDIA_CDM_PPAPI_CLEAR_KEY_CDM_H_
+#endif  // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
diff --git a/media/cdm/ppapi/clear_key_cdm_common.h b/media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h
index 39727b9..d6dbdb3 100644
--- a/media/cdm/ppapi/clear_key_cdm_common.h
+++ b/media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CDM_PPAPI_CLEAR_KEY_CDM_COMMON_H_
-#define MEDIA_CDM_PPAPI_CLEAR_KEY_CDM_COMMON_H_
+#ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_COMMON_H_
+#define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_COMMON_H_
 
 #include "media/cdm/ppapi/api/content_decryption_module.h"
 
@@ -15,4 +15,4 @@ typedef ClearKeyCdmInterface::Host ClearKeyCdmHost;
 
 }  // namespace media
 
-#endif  // MEDIA_CDM_PPAPI_CLEAR_KEY_CDM_COMMON_H_
+#endif  // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_COMMON_H_
diff --git a/media/cdm/ppapi/fake_cdm_video_decoder.cc b/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.cc
index b23e5a7..4c0d870 100644
--- a/media/cdm/ppapi/fake_cdm_video_decoder.cc
+++ b/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/cdm/ppapi/fake_cdm_video_decoder.h"
+#include "media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h"
 
 #include "base/logging.h"
 
diff --git a/media/cdm/ppapi/fake_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h
index 05b16ad..57469d1 100644
--- a/media/cdm/ppapi/fake_cdm_video_decoder.h
+++ b/media/cdm/ppapi/external_clear_key/fake_cdm_video_decoder.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CDM_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
-#define MEDIA_CDM_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
+#ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FAKE_CDM_VIDEO_DECODER_H_
+#define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FAKE_CDM_VIDEO_DECODER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "media/cdm/ppapi/api/content_decryption_module.h"
-#include "media/cdm/ppapi/cdm_video_decoder.h"
+#include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h"
 
 namespace media {
 
@@ -38,4 +38,4 @@ class FakeCdmVideoDecoder : public CdmVideoDecoder {
 
 }  // namespace media
 
-#endif  // MEDIA_CDM_PPAPI_FAKE_CDM_VIDEO_DECODER_H_
+#endif  // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FAKE_CDM_VIDEO_DECODER_H_
diff --git a/media/cdm/ppapi/ffmpeg_cdm_audio_decoder.cc b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc
index 082b35e..012aaf5 100644
--- a/media/cdm/ppapi/ffmpeg_cdm_audio_decoder.cc
+++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h"
+#include "media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h"
 
 #include <algorithm>
 
diff --git a/media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h
index 81362d4..518022c 100644
--- a/media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h
+++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CDM_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
-#define MEDIA_CDM_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
+#ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_AUDIO_DECODER_H_
+#define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_AUDIO_DECODER_H_
 
 #include <vector>
 
@@ -11,7 +11,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
-#include "media/cdm/ppapi/clear_key_cdm_common.h"
+#include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h"
 
 struct AVCodecContext;
 struct AVFrame;
@@ -92,4 +92,4 @@ class FFmpegCdmAudioDecoder {
 
 }  // namespace media
 
-#endif  // MEDIA_CDM_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
+#endif  // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_AUDIO_DECODER_H_
diff --git a/media/cdm/ppapi/ffmpeg_cdm_video_decoder.cc b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc
index 7ffda24..83b16b1 100644
--- a/media/cdm/ppapi/ffmpeg_cdm_video_decoder.cc
+++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/cdm/ppapi/ffmpeg_cdm_video_decoder.h"
+#include "media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
diff --git a/media/cdm/ppapi/ffmpeg_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h
index 9ce87e6..3e30029 100644
--- a/media/cdm/ppapi/ffmpeg_cdm_video_decoder.h
+++ b/media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CDM_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
-#define MEDIA_CDM_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
+#ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_VIDEO_DECODER_H_
+#define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_VIDEO_DECODER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "media/cdm/ppapi/cdm_video_decoder.h"
-#include "media/cdm/ppapi/clear_key_cdm_common.h"
+#include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h"
+#include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h"
 
 struct AVCodecContext;
 struct AVFrame;
@@ -59,4 +59,4 @@ class FFmpegCdmVideoDecoder : public CdmVideoDecoder {
 
 }  // namespace media
 
-#endif  // MEDIA_CDM_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
+#endif  // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_FFMPEG_CDM_VIDEO_DECODER_H_
diff --git a/media/cdm/ppapi/libvpx_cdm_video_decoder.cc b/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.cc
index cb8f19e..b5a8043 100644
--- a/media/cdm/ppapi/libvpx_cdm_video_decoder.cc
+++ b/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/cdm/ppapi/libvpx_cdm_video_decoder.h"
+#include "media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -15,8 +15,8 @@
 #define VPX_CODEC_DISABLE_COMPAT 1
 extern "C" {
 // Note: vpx_decoder.h must be first or compile will fail.
-#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"  // NOLINT
 #include "third_party/libvpx/source/libvpx/vpx/vp8dx.h"
+#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"  // NOLINT
 }
 
 // Enable USE_COPYPLANE_WITH_LIBVPX to use |CopyPlane()| instead of memcpy to
diff --git a/media/cdm/ppapi/libvpx_cdm_video_decoder.h b/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h
index d3ad264..efa0e36 100644
--- a/media/cdm/ppapi/libvpx_cdm_video_decoder.h
+++ b/media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_CDM_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
-#define MEDIA_CDM_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
+#ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_LIBVPX_CDM_VIDEO_DECODER_H_
+#define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_LIBVPX_CDM_VIDEO_DECODER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "media/cdm/ppapi/api/content_decryption_module.h"
-#include "media/cdm/ppapi/cdm_video_decoder.h"
+#include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h"
 
 struct vpx_codec_ctx;
 struct vpx_image;
@@ -52,4 +52,4 @@ class LibvpxCdmVideoDecoder : public CdmVideoDecoder {
 
 }  // namespace media
 
-#endif  // MEDIA_CDM_PPAPI_LIBVPX_CDM_VIDEO_DECODER_H_
+#endif  // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_LIBVPX_CDM_VIDEO_DECODER_H_