Remove flag to enable native controls for Chrome OS video player.

The flag is now enabled by default.

Bug: None
Change-Id: Iab273e0d44c0e511c9e2efd1dfaa37d9dafa5a9a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2018089
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Reviewed-by: Stuart Langley <slangley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772026}

chrome/browser/about_flags.cc

@@ -4116,13 +4116,6 @@ const FeatureEntry kFeatureEntries[] = {
      FEATURE_VALUE_TYPE(features::kArcCupsApi)},
 #endif  // OS_CHROMEOS
 
-#if defined(OS_CHROMEOS)
-    {"enable-native-controls",
-     flag_descriptions::kEnableVideoPlayerNativeControlsName,
-     flag_descriptions::kEnableVideoPlayerNativeControlsDescription, kOsCrOS,
-     FEATURE_VALUE_TYPE(chromeos::features::kVideoPlayerNativeControls)},
-#endif
-
 #if defined(OS_ANDROID)
     {"background-task-component-update",
      flag_descriptions::kBackgroundTaskComponentUpdateName,

chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc

@@ -32,9 +32,6 @@ FileManagerPrivateGetStringsFunction::~FileManagerPrivateGetStringsFunction() =
 ExtensionFunction::ResponseAction FileManagerPrivateGetStringsFunction::Run() {
   auto dict = GetFileManagerStrings();
 
-  dict->SetBoolean("VIDEO_PLAYER_NATIVE_CONTROLS_ENABLED",
-                   base::FeatureList::IsEnabled(
-                       chromeos::features::kVideoPlayerNativeControls));
   dict->SetBoolean("HIDE_SPACE_INFO",
                    chromeos::DemoSession::IsDeviceInDemoMode());
   dict->SetBoolean("ARC_USB_STORAGE_UI_ENABLED",

chromeos/constants/chromeos_features.cc

@@ -401,10 +401,6 @@ const base::Feature kUserActivityPrediction{"UserActivityPrediction",
 const base::Feature kUseSearchClickForRightClick{
     "UseSearchClickForRightClick", base::FEATURE_DISABLED_BY_DEFAULT};
 
-// Enable or disable native controls in video player on Chrome OS.
-const base::Feature kVideoPlayerNativeControls{
-    "VideoPlayerNativeControls", base::FEATURE_ENABLED_BY_DEFAULT};
-
 // Enable or disable bordered key for virtual keyboard on Chrome OS.
 const base::Feature kVirtualKeyboardBorderedKey{
     "VirtualKeyboardBorderedKey", base::FEATURE_DISABLED_BY_DEFAULT};

chromeos/constants/chromeos_features.h

@@ -177,8 +177,6 @@ extern const base::Feature kUserActivityPrediction;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kUseSearchClickForRightClick;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
-extern const base::Feature kVideoPlayerNativeControls;
-COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kVirtualKeyboardBorderedKey;
 COMPONENT_EXPORT(CHROMEOS_CONSTANTS)
 extern const base::Feature kVirtualKeyboardFloatingResizable;

ui/file_manager/video_player/js/video_player.js

@@ -2,12 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * Boolean flag used to toggle native control
- * @type {boolean}
- */
-let useNativeControls = false;
-
 /**
  * @param {!HTMLElement} playerContainer Main container.
  * @param {!HTMLElement} videoContainer Container for the video element.
@@ -320,17 +314,7 @@ function unload() {
   // Releases keep awake just in case (should be released on unloading video).
   chrome.power.releaseKeepAwake();
 
-  if (useNativeControls) {
-    nativePlayer.savePosition(true);
-    return;
-  }
-
-  if (!player.controls || !player.controls.getMedia()) {
-    return;
-  }
-
-  player.controls.savePosition(true /* exiting */);
-  player.controls.cleanup();
+  nativePlayer.savePosition(true);
 }
 
 /**
@@ -872,8 +856,6 @@ const nativePlayer = new NativeControlsVideoPlayer();
 function initStrings(callback) {
   chrome.fileManagerPrivate.getStrings(function(strings) {
     loadTimeData.data = strings;
-    useNativeControls =
-        loadTimeData.getBoolean('VIDEO_PLAYER_NATIVE_CONTROLS_ENABLED');
     callback();
   }.wrap(null));
 }
@@ -918,14 +900,8 @@ initPromise
           metrics.recordOpenVideoPlayerAction();
           metrics.recordNumberOfOpenedFiles(entries.length);
 
-          if (!useNativeControls) {
-            player.prepare(entries);
-            // TODO(lucmult): |player| and |fulfill| are not used.
-            player.playFirstVideo(/*player, fulfill*/);
-          } else {
-            nativePlayer.prepare(entries);
-            nativePlayer.playFirstVideo();
-          }
+          nativePlayer.prepare(entries);
+          nativePlayer.playFirstVideo();
         }.wrap());
       }.wrap());
     }.wrap());