Move libvpx_new to libvpx

media/cdm/ppapi/external_clear_key/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 "media/cdm/ppapi/external_clear_key/libvpx_cdm_video_decoder.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.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_new/source/libvpx/vpx/vp8dx.h"
-#include "third_party/libvpx_new/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
 // copy video frame data.
 // #define USE_COPYPLANE_WITH_LIBVPX 1
 
 namespace media {
 
 static const int kDecodeThreads = 2;
 
@@ skipping 156 matching lines @@
                               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 media