Revert of Refactor MediaCodecBridge to add support for NDK APIs

media/base/android/video_decoder_job.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/base/android/video_decoder_job.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/threading/thread.h"
+#include "media/base/android/media_codec_bridge.h"
 #include "media/base/android/media_drm_bridge.h"
-#include "media/base/android/sdk_media_codec_bridge.h"
 
 namespace media {
 
 class VideoDecoderThread : public base::Thread {
  public:
   VideoDecoderThread() : base::Thread("MediaSource_VideoDecoderThread") {
     Start();
   }
 };
 
@@ skipping 135 matching lines @@
   return (output_width_ != prev_output_width) ||
       (output_height_ != prev_output_height);
 }
 
 bool VideoDecoderJob::IsProtectedSurfaceRequired() {
   return is_content_encrypted() && drm_bridge() &&
       drm_bridge()->IsProtectedSurfaceRequired();
 }
 
 }  // namespace media