Material WebUI: cr-slider element for intelligent range mapping

chrome/test/data/webui/settings/device_page_tests.js

Index: chrome/test/data/webui/settings/device_page_tests.js
diff --git a/chrome/test/data/webui/settings/device_page_tests.js b/chrome/test/data/webui/settings/device_page_tests.js
index 0be90aaacd90b8ce6acc4116de558fdd5a888340..a9dd371b42a5d0ab997b037394e3fa77df279529 100644
--- a/chrome/test/data/webui/settings/device_page_tests.js
+++ b/chrome/test/data/webui/settings/device_page_tests.js
@@ -91,7 +91,7 @@ cr.define('settings_device_page', function() {
             value: 500,
           },
           xkb_auto_repeat_interval_r2: {
-            key: 'settings.language.xkb_auto_repeat_delay_r2',
+            key: 'settings.language.xkb_auto_repeat_interval_r2',
             type: chrome.settingsPrivate.PrefType.NUMBER,
             value: 500,
           },
@@ -216,36 +216,35 @@ cr.define('settings_device_page', function() {
       assertTrue(!!collapse);
       expectTrue(collapse.opened);
 
-      // Values are based on indices of auto-repeat options in keyboard.js.
-      expectEquals(keyboardPage.$.delaySlider.immediateValue, 3);
-      expectEquals(keyboardPage.$.repeatRateSlider.immediateValue, 2);
+      expectEquals(500, keyboardPage.$.delaySlider.value);
+      expectEquals(500, keyboardPage.$.repeatRateSlider.value);
 
-      // Test interaction with slider.
+      // Test interaction with the cr-slider's underlying paper-slider.
       MockInteractions.pressAndReleaseKeyOn(
-          keyboardPage.$.delaySlider, 37 /* left */);
+          keyboardPage.$.delaySlider.$.slider, 37 /* left */);
       MockInteractions.pressAndReleaseKeyOn(
-          keyboardPage.$.repeatRateSlider, 39 /* right */);
+          keyboardPage.$.repeatRateSlider.$.slider, 39 /* right */);
       expectEquals(
-          fakePrefs.settings.language.xkb_auto_repeat_delay_r2.value, 1000);
+          1000, fakePrefs.settings.language.xkb_auto_repeat_delay_r2.value);
       expectEquals(
-          fakePrefs.settings.language.xkb_auto_repeat_interval_r2.value,
-          300);
+          300,
+          fakePrefs.settings.language.xkb_auto_repeat_interval_r2.value);
 
       // Test sliders change when prefs change.
       devicePage.set(
           'prefs.settings.language.xkb_auto_repeat_delay_r2.value', 1500);
-      expectEquals(keyboardPage.$.delaySlider.immediateValue, 1);
+      expectEquals(1500, keyboardPage.$.delaySlider.value);
       devicePage.set(
           'prefs.settings.language.xkb_auto_repeat_interval_r2.value', 2000);
-      expectEquals(keyboardPage.$.repeatRateSlider.immediateValue, 0);
+      expectEquals(2000, keyboardPage.$.repeatRateSlider.value);
 
       // Test sliders round to nearest value when prefs change.
       devicePage.set(
           'prefs.settings.language.xkb_auto_repeat_delay_r2.value', 600);
-      expectEquals(keyboardPage.$.delaySlider.immediateValue, 3 /* 500 */);
+      expectEquals(600, keyboardPage.$.delaySlider.value);
       devicePage.set(
           'prefs.settings.language.xkb_auto_repeat_interval_r2.value', 45);
-      expectEquals(keyboardPage.$.repeatRateSlider.immediateValue, 6 /* 50 */);
+      expectEquals(45, keyboardPage.$.repeatRateSlider.value);
 
       devicePage.set(
           'prefs.settings.language.xkb_auto_repeat_enabled_r2.value', false);
@@ -259,38 +258,6 @@ cr.define('settings_device_page', function() {
               .keyboardShortcutsOverlayShown_);
     });
 
-    // Test more edge cases for slider rounding logic.
-    // TODO(michaelpg): Move this test to settings-slider tests once that
-    // element is created.
-    test('keyboard sliders', function() {
-      var keyboardPage = showAndGetDeviceSubpage('keyboard');
-      assertTrue(!!keyboardPage);
-
-      var testArray = [80, 20, 350, 1000, 200, 100];
-      var testFindNearestIndex = function(expectedIndex, value) {
-        expectEquals(
-            expectedIndex, keyboardPage.findNearestIndex_(testArray, value));
-      };
-      testFindNearestIndex(0, 51);
-      testFindNearestIndex(0, 80);
-      testFindNearestIndex(0, 89);
-      testFindNearestIndex(1, -100);
-      testFindNearestIndex(1, 20);
-      testFindNearestIndex(1, 49);
-      testFindNearestIndex(2, 400);
-      testFindNearestIndex(2, 350);
-      testFindNearestIndex(2, 300);
-      testFindNearestIndex(3, 200000);
-      testFindNearestIndex(3, 1000);
-      testFindNearestIndex(3, 700);
-      testFindNearestIndex(4, 220);
-      testFindNearestIndex(4, 200);
-      testFindNearestIndex(4, 151);
-      testFindNearestIndex(5, 149);
-      testFindNearestIndex(5, 100);
-      testFindNearestIndex(5, 91);
-    });
-
     test('display subpage', function() {
       // Open the display subpage.
       var displayPage = showAndGetDeviceSubpage('display');