Shaka Player for Kaleidoscope (public part)

Change-Id: Id8d677caba6f2353d969efb210f01a4e831acacf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427432Reviewed-by: Tommy Steimel <steimel@chromium.org>
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810233}

chrome/browser/media/kaleidoscope/BUILD.gn

@@ -37,6 +37,7 @@ if (enable_kaleidoscope) {
       "-E",
       "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir),
     ]
+    inputs = [ "//third_party/shaka-player/dist/shaka-player.ui.js" ]
     deps = [
       "//chrome/browser/media/kaleidoscope/mojom:mojom_js",
       "//url/mojom:url_mojom_gurl_js",

chrome/browser/media/kaleidoscope/kaleidoscope_internal_resources.grd

@@ -27,6 +27,7 @@
       <include name="IDR_GEOMETRY_MOJOM_LITE_JS" file="${root_gen_dir}/ui/gfx/geometry/mojom/geometry.mojom-lite.js" use_base_dir="false" type="BINDATA" />
       <include name="IDR_KALEIDOSCOPE_MOJOM_LITE_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/mojom/kaleidoscope.mojom-lite.js" use_base_dir="false" type="BINDATA" />
       <include name="IDR_KALEIDOSCOPE_NTP_MODULE_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/module/module.js" use_base_dir="false" type="BINDATA" />
+      <include name="IDR_KALEIDOSCOPE_SHAKA_PLAYER_JS" file="../../../../third_party/shaka-player/dist/shaka-player.ui.js" type="BINDATA" />
 
       <!-- Strings -->
       <include name="IDR_KALEIDOSCOPE_LOCALE_EN" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/_locales/en/messages.json" use_base_dir="false" type="BINDATA" />

chrome/browser/media/kaleidoscope/kaleidoscope_ui.cc

@@ -305,7 +305,7 @@ content::WebUIDataSource* KaleidoscopeUI::CreateUntrustedWebUIDataSource() {
   untrusted_source->OverrideContentSecurityPolicy(
       network::mojom::CSPDirectiveName::ImgSrc, "img-src * data:;");
   untrusted_source->OverrideContentSecurityPolicy(
-      network::mojom::CSPDirectiveName::MediaSrc, "media-src * data:;");
+      network::mojom::CSPDirectiveName::MediaSrc, "media-src * data: blob:;");
 
   // Allow access to anywhere using fetch.
   untrusted_source->OverrideContentSecurityPolicy(
@@ -331,6 +331,8 @@ content::WebUIDataSource* KaleidoscopeUI::CreateUntrustedWebUIDataSource() {
   untrusted_source->AddResourcePath("toolbar.js", IDR_KALEIDOSCOPE_TOOLBAR_JS);
   untrusted_source->AddResourcePath("side_nav_container.js",
                                     IDR_KALEIDOSCOPE_SIDE_NAV_CONTAINER_JS);
+  untrusted_source->AddResourcePath("shaka-player.ui.js",
+                                    IDR_KALEIDOSCOPE_SHAKA_PLAYER_JS);
 
   untrusted_source->AddResourcePath("geometry.mojom-lite.js",
                                     IDR_GEOMETRY_MOJOM_LITE_JS);