Fix the flaky test, ExternalVideoSurfaceContainerTest#testEnableVideoOverlayForEmbeddedVideo.

The test is 30% failed in Galaxy Nexus, JellyBean at DCHECK(!needs_establish_peer_) of
WebMediaPlayerAndroid::play().
We need to defer the steam texture creation also when we have the switch,
kForceUseOverlayEmbeddedVideo.

BUG=372174

Review URL: https://codereview.chromium.org/281523003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269982 0039d316-1c4b-4281-b951-d872f2087c98

content/renderer/media/android/webmediaplayer_android.cc

@@ -128,13 +128,14 @@ WebMediaPlayerAndroid::WebMediaPlayerAndroid(
   player_id_ = manager_->RegisterMediaPlayer(this);
 
 #if defined(VIDEO_HOLE)
-  if (manager_->ShouldUseVideoOverlayForEmbeddedEncryptedVideo()) {
+  force_use_overlay_embedded_video_ = CommandLine::ForCurrentProcess()->
+      HasSwitch(switches::kForceUseOverlayEmbeddedVideo);
+  if (force_use_overlay_embedded_video_ ||
+      manager_->ShouldUseVideoOverlayForEmbeddedEncryptedVideo()) {
     // Defer stream texture creation until we are sure it's necessary.
     needs_establish_peer_ = false;
     current_frame_ = VideoFrame::CreateBlackFrame(gfx::Size(1, 1));
   }
-  force_use_overlay_embedded_video_ = CommandLine::ForCurrentProcess()->
-      HasSwitch(switches::kForceUseOverlayEmbeddedVideo);
 #endif  // defined(VIDEO_HOLE)
   TryCreateStreamTextureProxyIfNeeded();
 }