Relocate last remnants of webkit/renderer/media code.

media/cdm/ppapi/libvpx_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 "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"
 #include "media/base/buffers.h"
 #include "media/base/limits.h"
 
 // Include libvpx header files.
 // VPX_CODEC_DISABLE_COMPAT excludes parts of the libvpx API that provide
 // 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;
 
 LibvpxCdmVideoDecoder::LibvpxCdmVideoDecoder(cdm::Host* host)
     : is_initialized_(false),
       host_(host),
       vpx_codec_(NULL),
       vpx_image_(NULL) {
 }
 
@@ skipping 49 matching lines @@
 void LibvpxCdmVideoDecoder::Reset() {
   DVLOG(1) << "Reset()";
 }
 
 // static
 bool LibvpxCdmVideoDecoder::IsValidOutputConfig(cdm::VideoFormat format,
                                                 const cdm::Size& data_size) {
   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(
     const uint8_t* compressed_frame,
     int32_t compressed_frame_size,
     int64_t timestamp,
     cdm::VideoFrame* decoded_frame) {
   DVLOG(1) << "DecodeFrame()";
   DCHECK(decoded_frame);
 
@@ skipping 76 matching lines @@
   cdm_video_frame->SetStride(cdm::VideoFrame::kYPlane,
                               vpx_image_->stride[VPX_PLANE_Y]);
   cdm_video_frame->SetStride(cdm::VideoFrame::kUPlane,
                               vpx_image_->stride[VPX_PLANE_U]);
   cdm_video_frame->SetStride(cdm::VideoFrame::kVPlane,
                               vpx_image_->stride[VPX_PLANE_V]);
 
   return true;
 }
 
-}  // namespace webkit_media
+}  // namespace media