Stop setting --enable-overlay-fullscreen-video on Android

content/child/runtime_features.cc

 // Copyright 2013 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.
 
 #include "content/child/runtime_features.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 138 matching lines @@
 
   if (command_line.HasSwitch(switches::kForceDisplayList2dCanvas))
     WebRuntimeFeatures::forceDisplayList2dCanvas(true);
 
   if (command_line.HasSwitch(switches::kEnableWebGLDraftExtensions))
     WebRuntimeFeatures::enableWebGLDraftExtensions(true);
 
   if (command_line.HasSwitch(switches::kEnableWebGLImageChromium))
     WebRuntimeFeatures::enableWebGLImageChromium(true);
 
-  if (command_line.HasSwitch(switches::kEnableOverlayFullscreenVideo))
-    WebRuntimeFeatures::enableOverlayFullscreenVideo(true);
+  // TODO(watk): Remove EnableOverlayFullscreenVideo once blink is updated to
+  // use ForceOverlayFullscreenVideo instead. http://crbug.com/511376
+  if (command_line.HasSwitch(switches::kEnableOverlayFullscreenVideo) ||
+      command_line.HasSwitch(switches::kForceOverlayFullscreenVideo)) {
+    WebRuntimeFeatures::forceOverlayFullscreenVideo(true);
+  }
 
   if (ui::IsOverlayScrollbarEnabled())
     WebRuntimeFeatures::enableOverlayScrollbars(true);
 
   if (command_line.HasSwitch(switches::kEnableBleedingEdgeRenderingFastPaths))
     WebRuntimeFeatures::enableBleedingEdgeFastPaths(true);
 
   if (command_line.HasSwitch(switches::kEnablePreciseMemoryInfo))
     WebRuntimeFeatures::enablePreciseMemoryInfo(true);
 
@@ skipping 51 matching lines @@
   if (command_line.HasSwitch(switches::kDisableBlinkFeatures)) {
     std::vector<std::string> disabled_features = base::SplitString(
         command_line.GetSwitchValueASCII(switches::kDisableBlinkFeatures),
         ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     for (const std::string& feature : disabled_features)
       WebRuntimeFeatures::enableFeatureFromString(feature, false);
   }
 }
 
 }  // namespace content