Relocate last remnants of webkit/renderer/media code.

media/cdm/ppapi/ffmpeg_cdm_video_decoder.h

 // 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.
 
-#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:
   explicit FFmpegCdmVideoDecoder(cdm::Host* host);
   virtual ~FFmpegCdmVideoDecoder();
 
   // CdmVideoDecoder implementation.
   virtual bool Initialize(const cdm::VideoDecoderConfig& config) OVERRIDE;
   virtual void Deinitialize() OVERRIDE;
   virtual void Reset() OVERRIDE;
@@ skipping 19 matching lines @@
   AVCodecContext* codec_context_;
   AVFrame* av_frame_;
 
   bool is_initialized_;
 
   cdm::Host* const host_;
 
   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_