Relocate last remnants of webkit/renderer/media code.

- Moves webkit/renderer/media/crypto/ppapi/ to media/cdm/ppapi/
- Moves webkit/.../ppapi/cdm/ to media/cdm/ppapi/api/
- Moves everything in webkit_media to media namespace
- Fixes broken builds with use_fake_video_decoder=1 or use_libvpx=1
- Deletes webkit/renderer/media folder (\o/)

BUG=251306
TEST=Chrome builds with mentioned flags, plus branding=Chrome.
TBR=rsleevi

Review URL: https://chromiumcodereview.appspot.com/22362007

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

36 files changed, 152 insertions, 169 deletions

diff --git a/DEPS b/DEPS
index 2270448..159b7a9 100644
--- a/DEPS
+++ b/DEPS
@@ -247,7 +247,7 @@ deps = {
   "src/third_party/accessibility-developer-tools":
     Var("chromium_git") + "/external/accessibility-developer-tools.git@2e3c9c8e49277a0ca1eeba510271eb03f9486d8f",
 
-  "src/webkit/renderer/media/crypto/ppapi/cdm":
+  "src/media/cdm/ppapi/api":
     "/trunk/deps/cdm@181763",
 
   "src/third_party/mesa/src":
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 77251aa..8a257ce 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2073,7 +2073,7 @@
           'dependencies': [
             # Runtime dependency.
             '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
-            '../webkit/support/webkit_support.gyp:clearkeycdmadapter',
+            '../media/media.gyp:clearkeycdmadapter',
           ],
         }],
       ],  # conditions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 32691f1..fa0335f 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -17,6 +17,7 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_prefs',
+        '../crypto/crypto.gyp:crypto',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../build/linux/system.gyp:dbus',
         '../build/linux/system.gyp:ssl',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index f32a66a..115ba8a 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -979,7 +979,7 @@
               'dependencies': [
                 # Runtime dependencies.
                 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
-                '../webkit/support/webkit_support.gyp:clearkeycdmadapter',
+                '../media/media.gyp:clearkeycdmadapter',
               ],
             }],
             ['input_speech==0', {
diff --git a/content/renderer/media/crypto/content_decryption_module_factory.cc b/content/renderer/media/crypto/content_decryption_module_factory.cc
index 3ce22f3..9310101 100644
--- a/content/renderer/media/crypto/content_decryption_module_factory.cc
+++ b/content/renderer/media/crypto/content_decryption_module_factory.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "content/renderer/media/crypto/key_systems.h"
-#include "media/crypto/aes_decryptor.h"
+#include "media/cdm/aes_decryptor.h"
 
 #if defined(ENABLE_PEPPER_CDMS)
 #include "content/renderer/media/crypto/ppapi_decryptor.h"
diff --git a/media/crypto/DEPS b/media/cdm/DEPS
index 4ef4138..4ef4138 100644
--- a/media/crypto/DEPS
+++ b/media/cdm/DEPS
diff --git a/media/crypto/aes_decryptor.cc b/media/cdm/aes_decryptor.cc
index fd7c628..da11442 100644
--- a/media/crypto/aes_decryptor.cc
+++ b/media/cdm/aes_decryptor.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "media/crypto/aes_decryptor.h"
+#include "media/cdm/aes_decryptor.h"
 
 #include <vector>
 
diff --git a/media/crypto/aes_decryptor.h b/media/cdm/aes_decryptor.h
index aec55d7..fda5a0f 100644
--- a/media/crypto/aes_decryptor.h
+++ b/media/cdm/aes_decryptor.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
diff --git a/media/crypto/aes_decryptor_unittest.cc b/media/cdm/aes_decryptor_unittest.cc
index 8feaec4..1edb8e8 100644
--- a/media/crypto/aes_decryptor_unittest.cc
+++ b/media/cdm/aes_decryptor_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -10,7 +10,7 @@
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
 #include "media/base/mock_filters.h"
-#include "media/crypto/aes_decryptor.h"
+#include "media/cdm/aes_decryptor.h"
 #include "media/webm/webm_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/cdm/ppapi/DEPS b/media/cdm/ppapi/DEPS
new file mode 100644
index 0000000..473873d
--- /dev/null
+++ b/media/cdm/ppapi/DEPS
@@ -0,0 +1,7 @@
+# Since media/ does not depend on anything in media/cdm/ppapi/, these extra
+# dependencies are okay.
+include_rules = [
+  "+ppapi/c",
+  "+ppapi/cpp",
+  "+ppapi/utility",
+]
diff --git a/webkit/renderer/media/crypto/ppapi/cdm_video_decoder.cc b/media/cdm/ppapi/cdm_video_decoder.cc
index 5f2d71d..95523d4 100644
--- a/webkit/renderer/media/crypto/ppapi/cdm_video_decoder.cc
+++ b/media/cdm/ppapi/cdm_video_decoder.cc
@@ -4,22 +4,21 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.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/cdm_video_decoder.h"
 
 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
-#include "webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.h"
+#include "media/cdm/ppapi/fake_cdm_video_decoder.h"
 #endif
 
 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
-#include "webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h"
+#include "media/cdm/ppapi/ffmpeg_cdm_video_decoder.h"
 #endif
 
 #if defined(CLEAR_KEY_CDM_USE_LIBVPX_DECODER)
-#include "webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h"
+#include "media/cdm/ppapi/libvpx_cdm_video_decoder.h"
 #endif
 
-namespace webkit_media {
+namespace media {
 
 scoped_ptr<CdmVideoDecoder> CreateVideoDecoder(
     cdm::Host* host, const cdm::VideoDecoderConfig& config) {
@@ -54,4 +53,4 @@ scoped_ptr<CdmVideoDecoder> CreateVideoDecoder(
   return video_decoder.Pass();
 }
 
-}  // namespace webkit_media
+}  // namespace media
diff --git a/webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h b/media/cdm/ppapi/cdm_video_decoder.h
index 86caff9..25d48f4 100644
--- a/webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h
+++ b/media/cdm/ppapi/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 WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_
-#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_
+#ifndef MEDIA_CDM_PPAPI_CDM_VIDEO_DECODER_H_
+#define MEDIA_CDM_PPAPI_CDM_VIDEO_DECODER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
+#include "media/cdm/ppapi/api/content_decryption_module.h"
 
-namespace webkit_media {
+namespace media {
 
 class CdmVideoDecoder {
  public:
@@ -38,6 +38,6 @@ class CdmVideoDecoder {
 scoped_ptr<CdmVideoDecoder> CreateVideoDecoder(
     cdm::Host* host, const cdm::VideoDecoderConfig& config);
 
-}  // namespace webkit_media
+}  // namespace media
 
-#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_CDM_VIDEO_DECODER_H_
+#endif  // MEDIA_CDM_PPAPI_CDM_VIDEO_DECODER_H_
diff --git a/webkit/renderer/media/crypto/ppapi/cdm_wrapper.cc b/media/cdm/ppapi/cdm_wrapper.cc
index f175831..6348f19 100644
--- a/webkit/renderer/media/crypto/ppapi/cdm_wrapper.cc
+++ b/media/cdm/ppapi/cdm_wrapper.cc
@@ -10,6 +10,8 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "media/cdm/ppapi/api/content_decryption_module.h"
+#include "media/cdm/ppapi/linked_ptr.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/private/pp_content_decryptor.h"
@@ -25,8 +27,6 @@
 #include "ppapi/cpp/var.h"
 #include "ppapi/cpp/var_array_buffer.h"
 #include "ppapi/utility/completion_callback_factory.h"
-#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
-#include "webkit/renderer/media/crypto/ppapi/linked_ptr.h"
 
 #if defined(CHECK_DOCUMENT_URL)
 #include "ppapi/cpp/dev/url_util_dev.h"
@@ -204,7 +204,7 @@ cdm::StreamType PpDecryptorStreamTypeToCdmStreamType(
 
 }  // namespace
 
-namespace webkit_media {
+namespace media {
 
 // cdm::Buffer implementation that provides access to memory owned by a
 // pp::Buffer_Dev.
@@ -1186,13 +1186,13 @@ class CdmWrapperModule : public pp::Module {
   }
 };
 
-}  // namespace webkit_media
+}  // namespace media
 
 namespace pp {
 
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
-  return new webkit_media::CdmWrapperModule();
+  return new media::CdmWrapperModule();
 }
 
 }  // namespace pp
diff --git a/webkit/renderer/media/crypto/ppapi/clear_key_cdm.cc b/media/cdm/ppapi/clear_key_cdm.cc
index 7f35fd8..cd6a61f 100644
--- a/webkit/renderer/media/crypto/ppapi/clear_key_cdm.cc
+++ b/media/cdm/ppapi/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 "webkit/renderer/media/crypto/ppapi/clear_key_cdm.h"
+#include "media/cdm/ppapi/clear_key_cdm.h"
 
 #include <algorithm>
 #include <sstream>
@@ -15,7 +15,7 @@
 #include "base/time/time.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
-#include "webkit/renderer/media/crypto/ppapi/cdm_video_decoder.h"
+#include "media/cdm/ppapi/cdm_video_decoder.h"
 
 #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)
 #include "base/basictypes.h"
@@ -27,8 +27,8 @@ static const int64 kNoTimestamp = kint64min;
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "media/base/media.h"
-#include "webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h"
-#include "webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h"
+#include "media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h"
+#include "media/cdm/ppapi/ffmpeg_cdm_video_decoder.h"
 
 // Include FFmpeg avformat.h for av_register_all().
 extern "C" {
@@ -140,14 +140,14 @@ void* CreateCdmInstance(
     return NULL;
 
   return static_cast<cdm::ContentDecryptionModule*>(
-      new webkit_media::ClearKeyCdm(host));
+      new media::ClearKeyCdm(host));
 }
 
 const char* GetCdmVersion() {
   return kClearKeyCdmVersion;
 }
 
-namespace webkit_media {
+namespace media {
 
 ClearKeyCdm::Client::Client() : status_(kKeyError) {}
 
@@ -315,7 +315,7 @@ cdm::Status ClearKeyCdm::InitializeAudioDecoder(
     const cdm::AudioDecoderConfig& audio_decoder_config) {
 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
   if (!audio_decoder_)
-    audio_decoder_.reset(new webkit_media::FFmpegCdmAudioDecoder(host_));
+    audio_decoder_.reset(new media::FFmpegCdmAudioDecoder(host_));
 
   if (!audio_decoder_->Initialize(audio_decoder_config))
     return cdm::kSessionError;
@@ -555,4 +555,4 @@ cdm::Status ClearKeyCdm::GenerateFakeAudioFrames(
 }
 #endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 
-}  // namespace webkit_media
+}  // namespace media
diff --git a/webkit/renderer/media/crypto/ppapi/clear_key_cdm.h b/media/cdm/ppapi/clear_key_cdm.h
index d82f90d..67637eb 100644
--- a/webkit/renderer/media/crypto/ppapi/clear_key_cdm.h
+++ b/media/cdm/ppapi/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 WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
-#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
+#ifndef MEDIA_CDM_PPAPI_CLEAR_KEY_CDM_H_
+#define MEDIA_CDM_PPAPI_CLEAR_KEY_CDM_H_
 
 #include <string>
 #include <vector>
@@ -13,8 +13,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
-#include "media/crypto/aes_decryptor.h"
-#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
+#include "media/cdm/aes_decryptor.h"
+#include "media/cdm/ppapi/api/content_decryption_module.h"
 
 // Enable this to use the fake decoder for testing.
 // TODO(tomfinegan): Move fake audio decoder into a separate class.
@@ -23,12 +23,8 @@
 #endif
 
 namespace media {
-class DecoderBuffer;
-}
-
-namespace webkit_media {
-
 class CdmVideoDecoder;
+class DecoderBuffer;
 class FFmpegCdmAudioDecoder;
 
 // Clear key implementation of the cdm::ContentDecryptionModule interface.
@@ -87,7 +83,7 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
 
     void KeyAdded(const std::string& session_id);
     void KeyError(const std::string& session_id,
-                  media::MediaKeys::KeyError error_code,
+                  MediaKeys::KeyError error_code,
                   int system_code);
     void KeyMessage(const std::string& session_id,
                     const std::vector<uint8>& message,
@@ -113,7 +109,7 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
   // |decrypted_buffer| should be ignored by the caller.
   cdm::Status DecryptToMediaDecoderBuffer(
       const cdm::InputBuffer& encrypted_buffer,
-      scoped_refptr<media::DecoderBuffer>* decrypted_buffer);
+      scoped_refptr<DecoderBuffer>* decrypted_buffer);
 
 #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)
   int64 CurrentTimeStampInMicroseconds() const;
@@ -130,7 +126,7 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
 #endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 
   Client client_;
-  media::AesDecryptor decryptor_;
+  AesDecryptor decryptor_;
 
   // Protects the |client_| from being accessed by the |decryptor_|
   // simultaneously.
@@ -165,6 +161,6 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule {
   DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);
 };
 
-}  // namespace webkit_media
+}  // namespace media
 
-#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
+#endif  // MEDIA_CDM_PPAPI_CLEAR_KEY_CDM_H_
diff --git a/webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.cc b/media/cdm/ppapi/fake_cdm_video_decoder.cc
index 1870621..b23e5a7 100644
--- a/webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.cc
+++ b/media/cdm/ppapi/fake_cdm_video_decoder.cc
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.h"
+#include "media/cdm/ppapi/fake_cdm_video_decoder.h"
 
 #include "base/logging.h"
-#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
 
-namespace webkit_media {
+namespace media {
 
 FakeCdmVideoDecoder::FakeCdmVideoDecoder(cdm::Host* host)
     : is_initialized_(false),
@@ -89,4 +88,4 @@ cdm::Status FakeCdmVideoDecoder::DecodeFrame(const uint8_t* compressed_frame,
   return cdm::kSuccess;
 }
 
-}  // namespace webkit_media
+}  // namespace media
diff --git a/webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.h b/media/cdm/ppapi/fake_cdm_video_decoder.h
index 7c110e2..05b16ad 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_
diff --git a/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc b/media/cdm/ppapi/ffmpeg_cdm_audio_decoder.cc
index 1391de8..ed619b2 100644
--- a/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc
+++ b/media/cdm/ppapi/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 "webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h"
+#include "media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h"
 
 #include <algorithm>
 
@@ -12,7 +12,6 @@
 #include "media/base/buffers.h"
 #include "media/base/data_buffer.h"
 #include "media/base/limits.h"
-#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
 
 // Include FFmpeg header files.
 extern "C" {
@@ -22,7 +21,7 @@ MSVC_PUSH_DISABLE_WARNING(4244);
 MSVC_POP_WARNING();
 }  // extern "C"
 
-namespace webkit_media {
+namespace media {
 
 // Maximum number of channels with defined layout in src/media.
 static const int kMaxChannels = 8;
@@ -90,7 +89,7 @@ FFmpegCdmAudioDecoder::FFmpegCdmAudioDecoder(cdm::Host* host)
       channels_(0),
       av_sample_format_(0),
       bytes_per_frame_(0),
-      last_input_timestamp_(media::kNoTimestamp()),
+      last_input_timestamp_(kNoTimestamp()),
       output_bytes_to_drop_(0) {
 }
 
@@ -143,7 +142,7 @@ bool FFmpegCdmAudioDecoder::Initialize(const cdm::AudioDecoderConfig& config) {
     int channels = codec_context_->channels;
     if (codec_context_->sample_fmt == AV_SAMPLE_FMT_FLT)
       channels = 1;
-    converter_bus_ = media::AudioBus::CreateWrapper(channels);
+    converter_bus_ = AudioBus::CreateWrapper(channels);
   }
 
   // Success!
@@ -152,7 +151,7 @@ bool FFmpegCdmAudioDecoder::Initialize(const cdm::AudioDecoderConfig& config) {
   samples_per_second_ = config.samples_per_second;
   bytes_per_frame_ = codec_context_->channels * bits_per_channel_ / 8;
   output_timestamp_helper_.reset(
-      new media::AudioTimestampHelper(config.samples_per_second));
+      new AudioTimestampHelper(config.samples_per_second));
   serialized_audio_frames_.reserve(bytes_per_frame_ * samples_per_second_);
   is_initialized_ = true;
 
@@ -183,9 +182,9 @@ bool FFmpegCdmAudioDecoder::IsValidConfig(
          config.channel_count > 0 &&
          config.channel_count <= kMaxChannels &&
          config.bits_per_channel > 0 &&
-         config.bits_per_channel <= media::limits::kMaxBitsPerSample &&
+         config.bits_per_channel <= limits::kMaxBitsPerSample &&
          config.samples_per_second > 0 &&
-         config.samples_per_second <= media::limits::kMaxSampleRate;
+         config.samples_per_second <= limits::kMaxSampleRate;
 }
 
 cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
@@ -200,7 +199,7 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
 
   bool is_vorbis = codec_context_->codec_id == AV_CODEC_ID_VORBIS;
   if (!is_end_of_stream) {
-    if (last_input_timestamp_ == media::kNoTimestamp()) {
+    if (last_input_timestamp_ == kNoTimestamp()) {
       if (is_vorbis && timestamp < base::TimeDelta()) {
         // Dropping frames for negative timestamps as outlined in section A.2
         // in the Vorbis spec. http://xiph.org/vorbis/doc/Vorbis_I_spec.html
@@ -210,7 +209,7 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
       } else {
         last_input_timestamp_ = timestamp;
       }
-    } else if (timestamp != media::kNoTimestamp()) {
+    } else if (timestamp != kNoTimestamp()) {
       if (timestamp < last_input_timestamp_) {
         base::TimeDelta diff = timestamp - last_input_timestamp_;
         DVLOG(1) << "Input timestamps are not monotonically increasing! "
@@ -260,9 +259,9 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
     packet.size -= result;
     packet.data += result;
 
-    if (output_timestamp_helper_->base_timestamp() == media::kNoTimestamp() &&
+    if (output_timestamp_helper_->base_timestamp() == kNoTimestamp() &&
         !is_end_of_stream) {
-      DCHECK(timestamp != media::kNoTimestamp());
+      DCHECK(timestamp != kNoTimestamp());
       if (output_bytes_to_drop_ > 0) {
         // Currently Vorbis is the only codec that causes us to drop samples.
         // If we have to drop samples it always means the timeline starts at 0.
@@ -311,7 +310,7 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
       output_bytes_to_drop_ -= dropped_size;
     }
 
-    scoped_refptr<media::DataBuffer> output;
+    scoped_refptr<DataBuffer> output;
     if (decoded_audio_size > 0) {
       DCHECK_EQ(decoded_audio_size % bytes_per_frame_, 0)
           << "Decoder didn't output full frames";
@@ -336,7 +335,7 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
               av_frame_->extended_data[i]));
         }
 
-        output = new media::DataBuffer(decoded_audio_size);
+        output = new DataBuffer(decoded_audio_size);
         output->set_data_size(decoded_audio_size);
 
         DCHECK_EQ(frames_to_interleave, converter_bus_->frames() - skip_frames);
@@ -344,7 +343,7 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
             skip_frames, frames_to_interleave, bits_per_channel_ / 8,
             output->writable_data());
       } else {
-        output = media::DataBuffer::CopyFrom(
+        output = DataBuffer::CopyFrom(
             av_frame_->extended_data[0] + start_sample * bytes_per_frame_,
             decoded_audio_size);
       }
@@ -384,8 +383,8 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
 }
 
 void FFmpegCdmAudioDecoder::ResetTimestampState() {
-  output_timestamp_helper_->SetBaseTimestamp(media::kNoTimestamp());
-  last_input_timestamp_ = media::kNoTimestamp();
+  output_timestamp_helper_->SetBaseTimestamp(kNoTimestamp());
+  last_input_timestamp_ = kNoTimestamp();
   output_bytes_to_drop_ = 0;
 }
 
@@ -410,4 +409,4 @@ void FFmpegCdmAudioDecoder::SerializeInt64(int64 value) {
   memcpy(&serialized_audio_frames_[0] + previous_size, &value, sizeof(value));
 }
 
-}  // namespace webkit_media
+}  // namespace media
diff --git a/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h b/media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h
index 2e93974..1b4fb8f 100644
--- a/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h
+++ b/media/cdm/ppapi/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 WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
-#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
+#ifndef MEDIA_CDM_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
+#define MEDIA_CDM_PPAPI_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 "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
+#include "media/cdm/ppapi/api/content_decryption_module.h"
 
 struct AVCodecContext;
 struct AVFrame;
@@ -21,12 +21,12 @@ class AudioBus;
 class AudioTimestampHelper;
 }
 
-namespace webkit_media {
+namespace media {
 
-// TODO(xhwang): This class is partially cloned from media::FFmpegAudioDecoder.
-// When media::FFmpegAudioDecoder is updated, it's a pain to keep this class
-// in sync with media::FFmpegAudioDecoder. We need a long term sustainable
-// solution for this. See http://crbug.com/169203
+// TODO(xhwang): This class is partially cloned from FFmpegAudioDecoder. When
+// FFmpegAudioDecoder is updated, it's a pain to keep this class in sync with
+// FFmpegAudioDecoder. We need a long term sustainable solution for this. See
+// http://crbug.com/169203
 class FFmpegCdmAudioDecoder {
  public:
   explicit FFmpegCdmAudioDecoder(cdm::Host* host);
@@ -75,13 +75,13 @@ class FFmpegCdmAudioDecoder {
   int av_sample_format_;
 
   // Used for computing output timestamps.
-  scoped_ptr<media::AudioTimestampHelper> output_timestamp_helper_;
+  scoped_ptr<AudioTimestampHelper> output_timestamp_helper_;
   int bytes_per_frame_;
   base::TimeDelta last_input_timestamp_;
 
   // We may need to convert the audio data coming out of FFmpeg from planar
   // float to integer.
-  scoped_ptr<media::AudioBus> converter_bus_;
+  scoped_ptr<AudioBus> converter_bus_;
 
   // Number of output sample bytes to drop before generating output buffers.
   // This is required for handling negative timestamps when decoding Vorbis
@@ -94,6 +94,6 @@ class FFmpegCdmAudioDecoder {
   DISALLOW_COPY_AND_ASSIGN(FFmpegCdmAudioDecoder);
 };
 
-}  // namespace webkit_media
+}  // namespace media
 
-#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
+#endif  // MEDIA_CDM_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
diff --git a/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc b/media/cdm/ppapi/ffmpeg_cdm_video_decoder.cc
index faaa8f7..9a2439d 100644
--- a/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.cc
+++ b/media/cdm/ppapi/ffmpeg_cdm_video_decoder.cc
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h"
+#include "media/cdm/ppapi/ffmpeg_cdm_video_decoder.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/buffers.h"
 #include "media/base/limits.h"
-#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
 
 // Include FFmpeg header files.
 extern "C" {
@@ -18,7 +17,7 @@ MSVC_PUSH_DISABLE_WARNING(4244);
 MSVC_POP_WARNING();
 }  // extern "C"
 
-namespace webkit_media {
+namespace media {
 
 static const int kDecodeThreads = 1;
 
@@ -199,9 +198,9 @@ bool FFmpegCdmVideoDecoder::IsValidOutputConfig(cdm::VideoFormat format,
   return ((format == cdm::kYv12 || format == cdm::kI420) &&
           (data_size.width % 2) == 0 && (data_size.height % 2) == 0 &&
           data_size.width > 0 && data_size.height > 0 &&
-          data_size.width <= media::limits::kMaxDimension &&
-          data_size.height <= media::limits::kMaxDimension &&
-          data_size.width * data_size.height <= media::limits::kMaxCanvas);
+          data_size.width <= limits::kMaxDimension &&
+          data_size.height <= limits::kMaxDimension &&
+          data_size.width * data_size.height <= limits::kMaxCanvas);
 }
 
 cdm::Status FFmpegCdmVideoDecoder::DecodeFrame(
@@ -342,4 +341,4 @@ void FFmpegCdmVideoDecoder::ReleaseFFmpegResources() {
   }
 }
 
-}  // namespace webkit_media
+}  // namespace media
diff --git a/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h b/media/cdm/ppapi/ffmpeg_cdm_video_decoder.h
index 5c4bb2b..17e2b57 100644
--- a/webkit/renderer/media/crypto/ppapi/ffmpeg_cdm_video_decoder.h
+++ b/media/cdm/ppapi/ffmpeg_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_FFMPEG_CDM_VIDEO_DECODER_H_
-#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
+#ifndef MEDIA_CDM_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
+#define MEDIA_CDM_PPAPI_FFMPEG_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 AVCodecContext;
 struct AVFrame;
 
-namespace webkit_media {
+namespace media {
 
 class FFmpegCdmVideoDecoder : public CdmVideoDecoder {
  public:
@@ -53,6 +53,6 @@ class FFmpegCdmVideoDecoder : public CdmVideoDecoder {
   DISALLOW_COPY_AND_ASSIGN(FFmpegCdmVideoDecoder);
 };
 
-}  // namespace webkit_media
+}  // namespace media
 
-#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
+#endif  // MEDIA_CDM_PPAPI_FFMPEG_CDM_VIDEO_DECODER_H_
diff --git a/webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.cc b/media/cdm/ppapi/libvpx_cdm_video_decoder.cc
index beb365cd..a81c485 100644
--- a/webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.cc
+++ b/media/cdm/ppapi/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 "webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h"
+#include "media/cdm/ppapi/libvpx_cdm_video_decoder.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -14,17 +14,16 @@
 // backwards compatibility for legacy applications using the library.
 #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"
 }
 
-#include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h"
-
 // Enable USE_COPYPLANE_WITH_LIBVPX to use |CopyPlane()| instead of memcpy to
 // copy video frame data.
 // #define USE_COPYPLANE_WITH_LIBVPX 1
 
-namespace webkit_media {
+namespace media {
 
 static const int kDecodeThreads = 2;
 
@@ -94,9 +93,9 @@ bool LibvpxCdmVideoDecoder::IsValidOutputConfig(cdm::VideoFormat format,
   return ((format == cdm::kYv12 || format == cdm::kI420) &&
           (data_size.width % 2) == 0 && (data_size.height % 2) == 0 &&
           data_size.width > 0 && data_size.height > 0 &&
-          data_size.width <= media::limits::kMaxDimension &&
-          data_size.height <= media::limits::kMaxDimension &&
-          data_size.width * data_size.height <= media::limits::kMaxCanvas);
+          data_size.width <= limits::kMaxDimension &&
+          data_size.height <= limits::kMaxDimension &&
+          data_size.width * data_size.height <= limits::kMaxCanvas);
 }
 
 cdm::Status LibvpxCdmVideoDecoder::DecodeFrame(
@@ -193,4 +192,4 @@ bool LibvpxCdmVideoDecoder::CopyVpxImageTo(cdm::VideoFrame* cdm_video_frame) {
   return true;
 }
 
-}  // namespace webkit_media
+}  // namespace media
diff --git a/webkit/renderer/media/crypto/ppapi/libvpx_cdm_video_decoder.h b/media/cdm/ppapi/libvpx_cdm_video_decoder.h
index 59674b6..3edaa07 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_
diff --git a/webkit/renderer/media/crypto/ppapi/linked_ptr.h b/media/cdm/ppapi/linked_ptr.h
index 5dd61fe..f3eccbb 100644
--- a/webkit/renderer/media/crypto/ppapi/linked_ptr.h
+++ b/media/cdm/ppapi/linked_ptr.h
@@ -37,8 +37,8 @@
 //  - is thread safe for copying and deletion
 //  - supports weak_ptrs
 
-#ifndef WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_LINKED_PTR_H_
-#define WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_LINKED_PTR_H_
+#ifndef MEDIA_CDM_PPAPI_LINKED_PTR_H_
+#define MEDIA_CDM_PPAPI_LINKED_PTR_H_
 
 #include "ppapi/cpp/logging.h"
 
@@ -182,4 +182,4 @@ linked_ptr<T> make_linked_ptr(T* ptr) {
   return linked_ptr<T>(ptr);
 }
 
-#endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PPAPI_LINKED_PTR_H_
+#endif  // MEDIA_CDM_PPAPI_LINKED_PTR_H_
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index f260708..26f65b9 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -11,7 +11,7 @@
 #include "media/base/decoder_buffer.h"
 #include "media/base/media_keys.h"
 #include "media/base/test_data_util.h"
-#include "media/crypto/aes_decryptor.h"
+#include "media/cdm/aes_decryptor.h"
 #include "media/filters/chunk_demuxer.h"
 
 using testing::AnyNumber;
diff --git a/media/media.gyp b/media/media.gyp
index c0a08e4..c685090 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -314,8 +314,8 @@
         'base/video_util.h',
         'base/yuv_convert.cc',
         'base/yuv_convert.h',
-        'crypto/aes_decryptor.cc',
-        'crypto/aes_decryptor.h',
+        'cdm/aes_decryptor.cc',
+        'cdm/aes_decryptor.h',
         'ffmpeg/ffmpeg_common.cc',
         'ffmpeg/ffmpeg_common.h',
         'filters/audio_decoder_selector.cc',
@@ -945,7 +945,7 @@
         'base/video_frame_unittest.cc',
         'base/video_util_unittest.cc',
         'base/yuv_convert_unittest.cc',
-        'crypto/aes_decryptor_unittest.cc',
+        'cdm/aes_decryptor_unittest.cc',
         'ffmpeg/ffmpeg_common_unittest.cc',
         'filters/audio_decoder_selector_unittest.cc',
         'filters/audio_file_reader_unittest.cc',
@@ -1294,6 +1294,9 @@
       ], # targets
     }],
     ['OS!="ios"', {
+      'includes': [
+        'media_cdm.gypi',
+      ],
       'targets': [
         {
           # Minimal target for NaCl and other renderer side media clients which
diff --git a/webkit/renderer/media/webkit_media.gypi b/media/media_cdm.gypi
index 198ebfe..a4a94f7 100644
--- a/webkit/renderer/media/webkit_media.gypi
+++ b/media/media_cdm.gypi
@@ -29,8 +29,8 @@
         ['use_fake_video_decoder == 1' , {
           'defines': ['CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER'],
           'sources': [
-            'crypto/ppapi/fake_cdm_video_decoder.cc',
-            'crypto/ppapi/fake_cdm_video_decoder.h',
+            'cdm/ppapi/fake_cdm_video_decoder.cc',
+            'cdm/ppapi/fake_cdm_video_decoder.h',
           ],
         }],
         ['use_ffmpeg == 1'  , {
@@ -39,14 +39,14 @@
             '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
           'sources': [
-            'crypto/ppapi/ffmpeg_cdm_audio_decoder.cc',
-            'crypto/ppapi/ffmpeg_cdm_audio_decoder.h',
+            'cdm/ppapi/ffmpeg_cdm_audio_decoder.cc',
+            'cdm/ppapi/ffmpeg_cdm_audio_decoder.h',
           ],
         }],
         ['use_ffmpeg == 1 and use_fake_video_decoder == 0'  , {
           'sources': [
-            'crypto/ppapi/ffmpeg_cdm_video_decoder.cc',
-            'crypto/ppapi/ffmpeg_cdm_video_decoder.h',
+            'cdm/ppapi/ffmpeg_cdm_video_decoder.cc',
+            'cdm/ppapi/ffmpeg_cdm_video_decoder.h',
           ],
         }],
         ['use_libvpx == 1 and use_fake_video_decoder == 0' , {
@@ -55,8 +55,8 @@
             '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
           ],
           'sources': [
-            'crypto/ppapi/libvpx_cdm_video_decoder.cc',
-            'crypto/ppapi/libvpx_cdm_video_decoder.h',
+            'cdm/ppapi/libvpx_cdm_video_decoder.cc',
+            'cdm/ppapi/libvpx_cdm_video_decoder.h',
           ],
         }],
         ['os_posix == 1 and OS != "mac" and enable_pepper_cdms==1', {
@@ -73,16 +73,16 @@
       ],
       'defines': ['CDM_IMPLEMENTATION'],
       'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/media/media.gyp:media',
+        'media',
         # Include the following for media::AudioBus.
-        '<(DEPTH)/media/media.gyp:shared_memory_support',
+        'shared_memory_support',
+        '<(DEPTH)/base/base.gyp:base',
       ],
       'sources': [
-        'crypto/ppapi/cdm_video_decoder.cc',
-        'crypto/ppapi/cdm_video_decoder.h',
-        'crypto/ppapi/clear_key_cdm.cc',
-        'crypto/ppapi/clear_key_cdm.h',
+        'cdm/ppapi/cdm_video_decoder.cc',
+        'cdm/ppapi/cdm_video_decoder.h',
+        'cdm/ppapi/clear_key_cdm.cc',
+        'cdm/ppapi/clear_key_cdm.h',
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
@@ -97,9 +97,9 @@
         'clearkeycdm',
       ],
       'sources': [
-        'crypto/ppapi/cdm_wrapper.cc',
-        'crypto/ppapi/cdm/content_decryption_module.h',
-        'crypto/ppapi/linked_ptr.h',
+        'cdm/ppapi/api/content_decryption_module.h',
+        'cdm/ppapi/cdm_wrapper.cc',
+        'cdm/ppapi/linked_ptr.h',
       ],
       'conditions': [
         ['os_posix == 1 and OS != "mac" and enable_pepper_cdms==1', {
diff --git a/ppapi/DEPS b/ppapi/DEPS
index 7d05cd9..4b60426 100644
--- a/ppapi/DEPS
+++ b/ppapi/DEPS
@@ -1,5 +1,4 @@
 include_rules = [
-  "+media",
   "+third_party/WebKit/public/platform",
   "+third_party/WebKit/public/web",
   "+third_party/skia",
diff --git a/ppapi/shared_impl/DEPS b/ppapi/shared_impl/DEPS
index 313cbac..ca43b89 100644
--- a/ppapi/shared_impl/DEPS
+++ b/ppapi/shared_impl/DEPS
@@ -2,6 +2,7 @@ include_rules = [
   "+base",
   "+gpu",
   "+media/audio",
+  "+media/base",
   "+skia",
   "+webkit/common/webpreferences.h",
 
diff --git a/third_party/widevine/cdm/widevine_cdm.gyp b/third_party/widevine/cdm/widevine_cdm.gyp
index 0d08bc6b..a4185e6 100644
--- a/third_party/widevine/cdm/widevine_cdm.gyp
+++ b/third_party/widevine/cdm/widevine_cdm.gyp
@@ -56,9 +56,9 @@
             'widevine_cdm_binaries',
           ],
           'sources': [
-            '<(DEPTH)/webkit/renderer/media/crypto/ppapi/cdm_wrapper.cc',
-            '<(DEPTH)/webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h',
-            '<(DEPTH)/webkit/renderer/media/crypto/ppapi/linked_ptr.h',
+            '<(DEPTH)/media/cdm/ppapi/api/content_decryption_module.h',
+            '<(DEPTH)/media/cdm/ppapi/cdm_wrapper.cc',
+            '<(DEPTH)/media/cdm/ppapi/linked_ptr.h',
           ],
           'conditions': [
             [ 'os_posix == 1 and OS != "mac"', {
diff --git a/webkit/DEPS b/webkit/DEPS
index fb09b7c..4571d4c 100644
--- a/webkit/DEPS
+++ b/webkit/DEPS
@@ -37,7 +37,6 @@ include_rules = [
   "+ui/base/keycodes",
 
   # TODO(brettw) - review these; move up if it's ok, or remove the dependency
-  "+crypto",
   "+net",
   "+third_party/npapi/bindings",
 
diff --git a/webkit/renderer/media/DEPS b/webkit/renderer/media/DEPS
deleted file mode 100644
index c3a5b96..0000000
--- a/webkit/renderer/media/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+media",
-]
diff --git a/webkit/renderer/media/OWNERS b/webkit/renderer/media/OWNERS
deleted file mode 100644
index 679494d..0000000
--- a/webkit/renderer/media/OWNERS
+++ /dev/null
@@ -1,9 +0,0 @@
-acolwell@chromium.org
-dalecurtis@chromium.org
-ddorwin@chromium.org
-fischman@chromium.org
-scherkus@chromium.org
-shadi@chromium.org
-vrk@chromium.org
-xhwang@chromium.org
-wjia@chromium.org
diff --git a/webkit/renderer/media/crypto/ppapi/DEPS b/webkit/renderer/media/crypto/ppapi/DEPS
deleted file mode 100644
index 00317f1..0000000
--- a/webkit/renderer/media/crypto/ppapi/DEPS
+++ /dev/null
@@ -1,4 +0,0 @@
-include_rules = [
-  "+ppapi",
-  "+third_party/libvpx",
-]
diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp
index 9e58c4a..5bbf80a 100644
--- a/webkit/support/webkit_support.gyp
+++ b/webkit/support/webkit_support.gyp
@@ -11,7 +11,6 @@
       'includes': [
         '../../build/win_precompile.gypi',
         '../glue/webkit_glue.gypi',
-        '../renderer/media/webkit_media.gypi',
         'webkit_support.gypi',
       ],
     }],
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index 42c97c3..25d9de1 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -97,7 +97,6 @@
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/crypto/crypto.gyp:crypto',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',