MD Settings: reduce complexity and overhead of prefs singleton

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

Index: chrome/test/data/webui/settings/languages_tests.js
diff --git a/chrome/test/data/webui/settings/languages_tests.js b/chrome/test/data/webui/settings/languages_tests.js
index fd7cd659188a936b726d8400eb40bb74febd88ca..d1d98ac63f9792b25a7349cb86d993b435941d6d 100644
--- a/chrome/test/data/webui/settings/languages_tests.js
+++ b/chrome/test/data/webui/settings/languages_tests.js
@@ -73,7 +73,7 @@ cr.define('settings-languages', function() {
     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);
@@ -117,34 +117,34 @@ cr.define('settings-languages', function() {
     });
 
     test('reorder languages', function() {
-      languageHelper.enableLanguage('sw');
+      languageHelper.enableLanguage('en-CA');
       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);
+      assertEquals('sw', languageHelper.languages.enabled[1].language.code);
+      assertEquals('en-CA', languageHelper.languages.enabled[2].language.code);
 
       // Can move a language up.
-      languageHelper.moveLanguage('sw', -1);
+      languageHelper.moveLanguage('en-CA', -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);
+      assertEquals('en-CA', languageHelper.languages.enabled[1].language.code);
+      assertEquals('sw', 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) {