CrSlider: Fixes for Polymer 3 migration

Various fixes for the migration CL at:
https://chromium-review.googlesource.com/c/chromium/src/+/2004184

Bug: 1042558
Change-Id: I5204114771f738a4bbe67524c598ba3652e522ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2012889Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733799}

chrome/test/data/webui/cr_elements/cr_slider_test.js

@@ -4,7 +4,7 @@
 
 // clang-format off
 // #import 'chrome://resources/cr_elements/cr_slider/cr_slider.m.js';
-// #import {Polymer, flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
+// #import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 // #import {flushTasks, eventToPromise} from '../test_util.m.js';
 // #import {pressAndReleaseKeyOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';
 // clang-format on

ui/webui/resources/cr_elements/cr_slider/BUILD.gn

@@ -22,6 +22,7 @@ polymer_modulizer("cr_slider") {
   html_file = "cr_slider.html"
   html_type = "dom-module"
   auto_imports = [ "ui/webui/resources/html/event_tracker.html|EventTracker" ]
+  namespace_rewrites = [ "cr_slider.SliderTick|SliderTick" ]
 }
 
 js_type_check("closure_compile_module") {
@@ -36,7 +37,6 @@ js_library("cr_slider.m") {
   deps = [
     "//third_party/polymer/v3_0/components-chromium/paper-behaviors:paper-ripple-behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
-    "//ui/webui/resources/js:cr.m",
     "//ui/webui/resources/js:event_tracker.m",
   ]
   extra_deps = [ ":cr_slider_module" ]

ui/webui/resources/cr_elements/cr_slider/cr_slider.js

@@ -19,7 +19,7 @@ cr.define('cr_slider', function() {
    *   ariaValue: (number|undefined),
    * }}
    */
-  let SliderTick;
+  /* #export */ let SliderTick;
 
   /**
    * @param {number} min
@@ -32,9 +32,7 @@ cr.define('cr_slider', function() {
   }
 
   /**
-   * Object is actually a SliderTick, but the closure compiler won't
-   * recognise it with the way this code is structured.
-   * @param {!(Object|number)} tick
+   * @param {!(cr_slider.SliderTick|number)} tick
    * @return {number}
    */
   function getAriaValue(tick) {
@@ -124,9 +122,7 @@ cr.define('cr_slider', function() {
       /**
        * The data associated with each tick on the slider. Each element in the
        * array contains a value and the label corresponding to that value.
-       * Object is actually a SliderTick, but the closure compiler won't
-       * recognise it with the way this code is structured.
-       * @type {!Array<Object>|!Array<number>}
+       * @type {!Array<cr_slider.SliderTick>|!Array<number>}
        */
       ticks: {
         type: Array,

ui/webui/resources/cr_elements_resources_v3.grdp

@@ -116,6 +116,11 @@
          use_base_dir="false"
          type="BINDATA"
          compress="gzip" />
+  <include name="IDR_CR_ELEMENTS_CR_SLIDER_M_JS"
+         file="${root_gen_dir}/ui/webui/resources/cr_elements/cr_slider/cr_slider.m.js"
+         use_base_dir="false"
+         type="BINDATA"
+         compress="gzip" />
   <include name="IDR_CR_ELEMENTS_CR_SPLITTER_JS"
          file="cr_elements/cr_splitter/cr_splitter.js"
          type="BINDATA"
@@ -185,11 +190,6 @@
          use_base_dir="false"
          type="BINDATA"
          compress="gzip" />
-  <include name="IDR_CR_ELEMENTS_CR_SLIDER_M_JS"
-         file="${root_gen_dir}/ui/webui/resources/cr_elements/cr_slider/cr_slider.m.js"
-         use_base_dir="false"
-         type="BINDATA"
-         compress="gzip" />
   <if expr="chromeos">
     <include name="IDR_CR_ELEMENTS_CR_SEARCHABLE_DROP_DOWN_M_JS"
            file="${root_gen_dir}/ui/webui/resources/cr_elements/cr_searchable_drop_down/cr_searchable_drop_down.m.js"