BASELINE: Update Chromium to 58.0.3029.54

Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

1 files changed, 8 insertions, 17 deletions

diff --git a/chromium/media/filters/android/media_codec_audio_decoder.cc b/chromium/media/filters/android/media_codec_audio_decoder.cc
index 8c59934ed3a..be3d2c97b64 100644
--- a/chromium/media/filters/android/media_codec_audio_decoder.cc
+++ b/chromium/media/filters/android/media_codec_audio_decoder.cc
@@ -9,7 +9,7 @@
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "media/base/android/sdk_media_codec_bridge.h"
+#include "media/base/android/media_codec_bridge_impl.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/bind_to_current_loop.h"
@@ -72,10 +72,9 @@ void MediaCodecAudioDecoder::Initialize(const AudioDecoderConfig& config,
     return;
   }
 
-  // We can support only the codecs that AudioCodecBridge can decode.
-  // TODO(xhwang): Get this list from AudioCodecBridge or just rely on
-  // AudioCodecBridge::ConfigureAndStart() to determine whether the codec is
-  // supported.
+  // We can support only the codecs that MediaCodecBridge can decode.
+  // TODO(xhwang): Get this list from MediaCodecBridge or just rely on
+  // attempting to create one to determine whether the codec is supported.
   const bool is_codec_supported = config.codec() == kCodecVorbis ||
                                   config.codec() == kCodecAAC ||
                                   config.codec() == kCodecOpus;
@@ -117,19 +116,11 @@ bool MediaCodecAudioDecoder::CreateMediaCodecLoop() {
   DVLOG(1) << __func__ << ": config:" << config_.AsHumanReadableString();
 
   codec_loop_.reset();
-
-  std::unique_ptr<AudioCodecBridge> audio_codec_bridge(
-      AudioCodecBridge::Create(config_.codec()));
-  if (!audio_codec_bridge) {
-    DLOG(ERROR) << __func__ << " failed: cannot create AudioCodecBridge";
-    return false;
-  }
-
   jobject media_crypto_obj = media_crypto_ ? media_crypto_->obj() : nullptr;
-
-  if (!audio_codec_bridge->ConfigureAndStart(config_, media_crypto_obj)) {
-    DLOG(ERROR) << __func__ << " failed: cannot configure audio codec for "
-                << config_.AsHumanReadableString();
+  std::unique_ptr<MediaCodecBridge> audio_codec_bridge(
+      MediaCodecBridgeImpl::CreateAudioDecoder(config_, media_crypto_obj));
+  if (!audio_codec_bridge) {
+    DLOG(ERROR) << __func__ << " failed: cannot create MediaCodecBridge";
     return false;
   }