Fix the ChromeOS video player for HTML5 imports deprecation.

Some undocumented functionality regressed in r713537 with the feature removal. Skip presubmit. Change has +1/OWNERS approval, but a linter complains about changes outside the scope of this CL. No-Presubmit: true Bug: 1035051 Change-Id: Ie106df252fcf1784fdeffbcf1d789df5c8b7ea40 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2040754 Commit-Queue: Trent Apted <tapted@chromium.org> Reviewed-by: Luciano Pacheco <lucmult@chromium.org> Cr-Commit-Position: refs/heads/master@{#739167}

Fix the ChromeOS video player for HTML5 imports deprecation.
Some undocumented functionality regressed in r713537 with the feature removal. Skip presubmit. Change has +1/OWNERS approval, but a linter complains about changes outside the scope of this CL. No-Presubmit: true Bug: 1035051 Change-Id: Ie106df252fcf1784fdeffbcf1d789df5c8b7ea40 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2040754 Commit-Queue: Trent Apted <tapted@chromium.org> Reviewed-by: Luciano Pacheco <lucmult@chromium.org> Cr-Commit-Position: refs/heads/master@{#739167}
002a81c4 · Trent Apted · Commit Bot · 30475ef5 · 002a81c4 · 002a81c4
Commit 002a81c4 authored Feb 06, 2020 by Trent Apted Committed by Commit Bot Feb 06, 2020
3 changed files
--- a/ui/file_manager/video_player/js/video_player.js
+++ b/ui/file_manager/video_player/js/video_player.js
@@ -888,6 +888,7 @@ function initVolumeManager(callback) {
 const initPromise = Promise.all([
  new Promise(initStrings.wrap(null)),
  new Promise(initVolumeManager.wrap(null)),
+  new Promise(resolve => window.HTMLImports.whenReady(resolve)),
 ]);
 /**

--- a/ui/file_manager/video_player/manifest.json
+++ b/ui/file_manager/video_player/manifest.json
@@ -70,6 +70,7 @@
    // enhhojjnijigcajfphajepfemndkmdlo is the Dev Media Router component extension ID.
    // pkedcjkdefgpdelpbcmbmeomcjbeemfm is the Stable Media Router component extension ID.
    // ljoplibgfehghmibaoaepfagnmbbfiga is the ui/file_manager/integration_tests component extension ID.
-    "content_security_policy": "default-src 'none'; script-src 'self' blob: filesystem: chrome://resources chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj chrome-extension://enhhojjnijigcajfphajepfemndkmdlo chrome-extension://pkedcjkdefgpdelpbcmbmeomcjbeemfm chrome-extension://ljoplibgfehghmibaoaepfagnmbbfiga; style-src 'self' blob: filesystem: chrome://resources 'unsafe-inline'; img-src 'self' blob: filesystem: chrome://theme chrome://resources data: https://www.googledrive.com; media-src 'self' blob: filesystem:; object-src 'self' blob: filesystem:; font-src chrome://resources;"
+    // connect-src for Polymer: crbug.com/1022018
+    "content_security_policy": "default-src 'none'; script-src 'self' blob: filesystem: chrome://resources chrome-extension://hhaomjibdihmijegdhdafkllkbggdgoj chrome-extension://enhhojjnijigcajfphajepfemndkmdlo chrome-extension://pkedcjkdefgpdelpbcmbmeomcjbeemfm chrome-extension://ljoplibgfehghmibaoaepfagnmbbfiga; style-src 'self' blob: filesystem: chrome://resources 'unsafe-inline'; img-src 'self' blob: filesystem: chrome://theme chrome://resources data: https://www.googledrive.com; media-src 'self' blob: filesystem:; object-src 'self' blob: filesystem:; font-src chrome://resources; connect-src chrome://resources;"
  }
 }
--- a/ui/file_manager/video_player/video_player.html
+++ b/ui/file_manager/video_player/video_player.html
@@ -7,6 +7,7 @@
 <html>
 <head>
  <title>#xFEFF;</title>
+  <script src="chrome://resources/polymer/v1_0/html-imports/html-imports.min.js"></script>
  <link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
  <link rel="stylesheet" type="text/css" href="css/media_controls.css">
  <link rel="stylesheet" href="chrome://resources/css/menu.css">