Revert of Do not wait for first video frame to start playing audio in a MediaStream. (patchset #2 i…

content/renderer/media/webmediaplayer_ms.cc

Index: content/renderer/media/webmediaplayer_ms.cc
diff --git a/content/renderer/media/webmediaplayer_ms.cc b/content/renderer/media/webmediaplayer_ms.cc
index b03fedd8d5365e00e9c19a7bc58af7418c6bf407..d437247d18053d97a778c326d8bc707e6b520d81 100644
--- a/content/renderer/media/webmediaplayer_ms.cc
+++ b/content/renderer/media/webmediaplayer_ms.cc
@@ -152,8 +152,8 @@ void WebMediaPlayerMS::load(LoadType load_type,
   }
   if (video_frame_provider_)
     video_frame_provider_->Start();
-  if (audio_renderer_) {
-    // Do not wait for first video frame to start playing
+  if (audio_renderer_ && !video_frame_provider_) {
+    // This is audio-only mode.
     SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata);
     SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData);
   }
@@ -488,10 +488,8 @@ void WebMediaPlayerMS::OnFrameAvailable(
 
   if (!received_first_frame_) {
     received_first_frame_ = true;
-    if (getReadyState() < WebMediaPlayer::ReadyStateHaveEnoughData) {
-      SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata);
-      SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData);
-    }
+    SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata);
+    SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData);
 
     if (video_frame_provider_.get()) {
       video_weblayer_.reset(new cc_blink::WebLayerImpl(