Revert of Refactor MediaCodecBridge to add support for NDK APIs

content/common/gpu/media/avda_shared_state.h

 // Copyright 2015 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 CONTENT_COMMON_GPU_AVDA_SHARED_STATE_H_
 #define CONTENT_COMMON_GPU_AVDA_SHARED_STATE_H_
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
-#include "media/base/android/sdk_media_codec_bridge.h"
+#include "media/base/android/media_codec_bridge.h"
 #include "ui/gl/gl_image.h"
 
 namespace gfx {
 class SurfaceTexture;
 }
 
 namespace content {
 
 // Shared state to allow communication between the AVDA and the
 // GLImages that configure GL for drawing the frames.
@@ skipping 20 matching lines @@
  protected:
   virtual ~AVDASharedState() {}
 
  private:
   friend class base::RefCounted<AVDASharedState>;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_AVDA_SHARED_STATE_H_