Convert kaleidoscope.js to use the JS buildchain

Now we can also get rid of utils.js from the build
as well.

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

chrome/browser/media/kaleidoscope/kaleidoscope_internal_resources.grd

@@ -22,9 +22,8 @@
       <include name="IDR_KALEIDOSCOPE_CONTENT_WORKER_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/ks-content-worker.js" use_base_dir="false" type="BINDATA" />
       <include name="IDR_KALEIDOSCOPE_HTML" file="internal/resources/kaleidoscope.html" type="BINDATA" />
       <include name="IDR_KALEIDOSCOPE_ICONS_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/icons.js" use_base_dir="false" type="BINDATA" />
-      <include name="IDR_KALEIDOSCOPE_JS" file="internal/resources/kaleidoscope.js" type="BINDATA" />
+      <include name="IDR_KALEIDOSCOPE_JS" file="${root_gen_dir}/chrome/browser/media/kaleidoscope/internal/resources/ks-kaleidoscope.js" use_base_dir="false" type="BINDATA" />
       <include name="IDR_KALEIDOSCOPE_MESSAGES_JS" file="internal/resources/messages.js" type="BINDATA" />
-      <include name="IDR_KALEIDOSCOPE_UTILS_JS" file="internal/resources/utils.js" type="BINDATA" />
       <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" />

chrome/browser/media/kaleidoscope/kaleidoscope_ui.cc

@@ -224,8 +224,6 @@ void ConfigureMainFrameWebUIDataSource(content::WebUIDataSource* html_source) {
   html_source->AddResourcePath("kaleidoscope.js", IDR_KALEIDOSCOPE_JS);
   html_source->AddResourcePath("messages.js", IDR_KALEIDOSCOPE_MESSAGES_JS);
 
-  // TODO(beccahughes): Remove
-  html_source->AddResourcePath("utils.js", IDR_KALEIDOSCOPE_UTILS_JS);
   html_source->AddResourcePath("content-worker.js",
                                IDR_KALEIDOSCOPE_CONTENT_WORKER_JS);