Fix race condition in MD Settings Languages page causing inconsistent settings

chrome/test/data/webui/settings/fake_language_settings_private.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.
 
 /**
  * @fileoverview Fake implementation of chrome.languageSettingsPrivate
  * for testing.
  */
 cr.define('settings', function() {
   /**
@@ skipping 102 matching lines @@
      * @param {function(!Array<!chrome.languageSettingsPrivate.Language>)}
      *     callback
      */
     getLanguageList: function(callback) {
       setTimeout(function() {
         callback(JSON.parse(JSON.stringify(this.languages)));
       }.bind(this));
     },
 
     /**
-     * Sets the accepted languages, used to decide which languages to translate,
-     * generate the Accept-Language header, etc.
-     * @param {!Array<string>} languageCodes
+     * Enables a language, adding it to the Accept-Language list (used to decide
+     * which languages to translate, generate the Accept-Language header, etc.).
+     * @param {string} languageCode
      */
-    setLanguageList: function(languageCodes) {
-      var languages = languageCodes.join(',');
-      this.settingsPrefs_.set('prefs.intl.accept_languages.value', languages);
+    enableLanguage: function(languageCode) {
+      var languageCodes = this.settingsPrefs_.prefs.intl.accept_languages.value;
+      var languages = languageCodes.split(',');
+      if (languages.indexOf(languageCode) != -1)
+        return;
+      languages.push(languageCode);
+      languageCodes = languages.join(',');
+      this.settingsPrefs_.set(
+          'prefs.intl.accept_languages.value', languageCodes);
       if (cr.isChromeOS) {
         this.settingsPrefs_.set(
-            'prefs.settings.language.preferred_languages.value', languages);
+            'prefs.settings.language.preferred_languages.value', languageCodes);
       }
     },
 
+    /**
+     * Disables a language, removing it from the Accept-Language list.
+     * @param {string} languageCode
+     */
+    disableLanguage: function(languageCode) {
+      var languageCodes = this.settingsPrefs_.prefs.intl.accept_languages.value;
+      var languages = languageCodes.split(',');
+      var index = languages.indexOf(languageCode);
+      if (index == -1)
+        return;
+      languages.splice(index, 1);
+      languageCodes = languages.join(',');
+      this.settingsPrefs_.set(
+          'prefs.intl.accept_languages.value', languageCodes);
+      if (cr.isChromeOS) {
+        this.settingsPrefs_.set(
+            'prefs.settings.language.preferred_languages.value', languageCodes);
+      }
+    },
+
     /**
      * Gets the current status of the chosen spell check dictionaries.
      * @param {function(!Array<
      *     !chrome.languageSettingsPrivate.SpellcheckDictionaryStatus>):void}
      *     callback
      */
     getSpellcheckDictionaryStatuses:
         wrapAssertNotReached('getSpellcheckDictionaryStatuses'),
 
     /**
@@ skipping 96 matching lines @@
 
     /**
      * Called when an input method is removed.
      * @type {!ChromeEvent}
      */
     onInputMethodRemoved: new FakeChromeEvent(),
   };
 
   return {FakeLanguageSettingsPrivate: FakeLanguageSettingsPrivate};
 });