MD Settings: reduce complexity and overhead of prefs singleton

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('settings-languages', function() {
   /**
    * Data-binds two Polymer properties using the property-changed events and
    * set/notifyPath API. Useful for testing components which would normally be
    * used together.
    * @param {!HTMLElement} el1
@@ skipping 55 matching lines @@
     var languageHelper;
     var languageSettingsPrivate;
 
     suiteSetup(function() {
       CrSettingsPrefs.deferInitialization = true;
     });
 
     setup(function() {
       var settingsPrefs = document.createElement('settings-prefs');
       var settingsPrivate = new settings.FakeSettingsPrivate(getFakePrefs());
-      settingsPrefs.initializeForTesting(settingsPrivate);
+      settingsPrefs.initialize(settingsPrivate);
 
       languageSettingsPrivate = new settings.FakeLanguageSettingsPrivate();
       languageSettingsPrivate.setSettingsPrefs(settingsPrefs);
       settings.languageSettingsPrivateApiForTest = languageSettingsPrivate;
 
       languageHelper = document.createElement('settings-languages');
 
       // Prefs would normally be data-bound to settings-languages.
       fakeDataBind(settingsPrefs, languageHelper, 'prefs');
 
@@ skipping 23 matching lines @@
 
       languageHelper.enableLanguage('en-CA');
       assertTrue(languageHelper.isLanguageEnabled('en-CA'));
       languageHelper.disableLanguage('sw');
       assertFalse(languageHelper.isLanguageEnabled('sw'));
 
       // TODO(michaelpg): Test other modifications.
     });
 
     test('reorder languages', function() {
-      languageHelper.enableLanguage('sw');
+      languageHelper.enableLanguage('en-CA');
+      assertEquals('en-US', languageHelper.languages.enabled[0].language.code);
+      assertEquals('sw', languageHelper.languages.enabled[1].language.code);
+      assertEquals('en-CA', languageHelper.languages.enabled[2].language.code);
+
+      // Can move a language up.
+      languageHelper.moveLanguage('en-CA', -1);
       assertEquals('en-US', languageHelper.languages.enabled[0].language.code);
       assertEquals('en-CA', languageHelper.languages.enabled[1].language.code);
       assertEquals('sw', languageHelper.languages.enabled[2].language.code);
 
-      // Can move a language up.
-      languageHelper.moveLanguage('sw', -1);
-      assertEquals('en-US', languageHelper.languages.enabled[0].language.code);
-      assertEquals('sw', languageHelper.languages.enabled[1].language.code);
-      assertEquals('en-CA', languageHelper.languages.enabled[2].language.code);
-
       // Can move a language down.
       languageHelper.moveLanguage('en-US', 1);
-      assertEquals('sw', languageHelper.languages.enabled[0].language.code);
+      assertEquals('en-CA', languageHelper.languages.enabled[0].language.code);
       assertEquals('en-US', languageHelper.languages.enabled[1].language.code);
-      assertEquals('en-CA', languageHelper.languages.enabled[2].language.code);
+      assertEquals('sw', languageHelper.languages.enabled[2].language.code);
 
       // Moving the first language up has no effect.
-      languageHelper.moveLanguage('sw', -1);
-      assertEquals('sw', languageHelper.languages.enabled[0].language.code);
+      languageHelper.moveLanguage('en-CA', -1);
+      assertEquals('en-CA', languageHelper.languages.enabled[0].language.code);
       assertEquals('en-US', languageHelper.languages.enabled[1].language.code);
-      assertEquals('en-CA', languageHelper.languages.enabled[2].language.code);
+      assertEquals('sw', languageHelper.languages.enabled[2].language.code);
 
       // Moving the last language down has no effect.
-      languageHelper.moveLanguage('en-CA', 1);
-      assertEquals('sw', languageHelper.languages.enabled[0].language.code);
+      languageHelper.moveLanguage('sw', 1);
+      assertEquals('en-CA', languageHelper.languages.enabled[0].language.code);
       assertEquals('en-US', languageHelper.languages.enabled[1].language.code);
-      assertEquals('en-CA', languageHelper.languages.enabled[2].language.code);
+      assertEquals('sw', languageHelper.languages.enabled[2].language.code);
     });
 
     if (cr.isChromeOS) {
       test('modifying input methods', function() {
         assertEquals(2, languageHelper.languages.inputMethods.enabled.length);
         var inputMethods = languageHelper.getInputMethodsForLanguage('en-US');
         assertEquals(3, inputMethods.length);
 
         // We can remove one input method.
         var dvorak =
@@ skipping 19 matching lines @@
         // The US Swahili keyboard should still be enabled, because it supports
         // English which is still enabled.
         assertTrue(languageHelper.languages.inputMethods.enabled.some(
               function(inputMethod) {
                 return inputMethod.id == swUS;
               }));
       });
     }
   });
 });