Relocate last remnants of webkit/renderer/media code.

media/cdm/ppapi/cdm_video_decoder.cc

 // 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 "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) {
   scoped_ptr<CdmVideoDecoder> video_decoder;
 #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
   video_decoder.reset(new FakeCdmVideoDecoder(host));
 
   if (!video_decoder->Initialize(config))
     video_decoder.reset();
 #else
@@ skipping 14 matching lines @@
 
   if (!video_decoder->Initialize(config))
     video_decoder.reset();
 #endif
 
 #endif  // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
 
   return video_decoder.Pass();
 }
 
-}  // namespace webkit_media
+}  // namespace media