Revert of Refactor MediaCodecBridge to add support for NDK APIs

components/cdm/browser/cdm_message_filter_android.cc

Index: components/cdm/browser/cdm_message_filter_android.cc
diff --git a/components/cdm/browser/cdm_message_filter_android.cc b/components/cdm/browser/cdm_message_filter_android.cc
index 14043e1cbf1a4f5344ffc1f727daa3a222e438b1..e9399f618985a77c832e2abc8e72176ce3a40575 100644
--- a/components/cdm/browser/cdm_message_filter_android.cc
+++ b/components/cdm/browser/cdm_message_filter_android.cc
@@ -9,10 +9,11 @@
 
 #include "components/cdm/common/cdm_messages_android.h"
 #include "ipc/ipc_message_macros.h"
-#include "media/base/android/media_codec_util.h"
+#include "media/base/android/media_codec_bridge.h"
 #include "media/base/android/media_drm_bridge.h"
 
 using content::BrowserThread;
+using media::MediaCodecBridge;
 using media::MediaDrmBridge;
 using media::SupportedCodecs;
 
@@ -58,7 +59,7 @@ static SupportedCodecs GetSupportedCodecs(
     if ((request.codecs & info.codec) &&
         MediaDrmBridge::IsKeySystemSupportedWithType(
             key_system, info.container_mime_type) &&
-        media::MediaCodecUtil::CanDecode(info.codec_name, is_secure)) {
+        MediaCodecBridge::CanDecode(info.codec_name, is_secure)) {
       supported_codecs |= info.codec;
     }
   }