Settings: Remove global settings.languageSettingsPrivateApiForTest

In Polymer 3/JS modules, there is no settings global namespace and
undefined variables cause an error, so the edit dictionary page cannot
simply check the global settings.languageSettingsPrivateApiForTest.
Instead, use the LanguagesBrowserProxy in the edit dictionary page to
get languageSettingsPrivate, and add a way to set this value in the
TestLanguagesBrowserProxy so that it can be overridden for tests.

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

chrome/browser/resources/settings/languages_page/BUILD.gn

@@ -17,6 +17,7 @@ js_type_check("closure_compile") {
 
 js_library("edit_dictionary_page") {
   deps = [
+    ":languages_browser_proxy",
     "..:global_scroll_target_behavior",
     "..:route",
     "../prefs",

chrome/browser/resources/settings/languages_page/edit_dictionary_page.html

@@ -12,6 +12,7 @@
 <link rel="import" href="../route.html">
 <link rel="import" href="../settings_shared_css.html">
 <link rel="import" href="../settings_vars_css.html">
+<link rel="import" href="./languages_browser_proxy.html">
 
 <dom-module id="settings-edit-dictionary-page">
   <template>

chrome/browser/resources/settings/languages_page/edit_dictionary_page.js

@@ -47,21 +47,21 @@ Polymer({
     },
   },
 
-  /** @type {LanguageSettingsPrivate} */
-  languageSettingsPrivate: null,
+  /** @private {LanguageSettingsPrivate} */
+  languageSettingsPrivate_: null,
 
   /** @override */
   ready() {
-    this.languageSettingsPrivate = settings.languageSettingsPrivateApiForTest ||
-        /** @type {!LanguageSettingsPrivate} */
-        (chrome.languageSettingsPrivate);
+    this.languageSettingsPrivate_ =
+        settings.LanguagesBrowserProxyImpl.getInstance()
+            .getLanguageSettingsPrivate();
 
-    this.languageSettingsPrivate.getSpellcheckWords(words => {
+    this.languageSettingsPrivate_.getSpellcheckWords(words => {
       this.hasWords_ = words.length > 0;
       this.words_ = words;
     });
 
-    this.languageSettingsPrivate.onCustomDictionaryChanged.addListener(
+    this.languageSettingsPrivate_.onCustomDictionaryChanged.addListener(
         this.onCustomDictionaryChanged_.bind(this));
 
     // Add a key handler for the new-word input.
@@ -77,7 +77,7 @@ Polymer({
     const word = this.getTrimmedNewWord_();
     this.newWordValue_ = '';
     if (word) {
-      this.languageSettingsPrivate.addSpellcheckWord(word);
+      this.languageSettingsPrivate_.addSpellcheckWord(word);
     }
   },
 
@@ -204,6 +204,6 @@ Polymer({
    * @param {!{model: !{item: string}}} e
    */
   onRemoveWordTap_(e) {
-    this.languageSettingsPrivate.removeSpellcheckWord(e.model.item);
+    this.languageSettingsPrivate_.removeSpellcheckWord(e.model.item);
   },
 });

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

@@ -1669,8 +1669,10 @@ CrSettingsEditDictionaryPageTest.prototype = {
   extraLibraries: CrSettingsBrowserTest.prototype.extraLibraries.concat([
     '../fake_chrome_event.js',
     'fake_settings_private.js',
+    'chromeos/fake_input_method_private.js',
     '../test_browser_proxy.js',
     'fake_language_settings_private.js',
+    'test_languages_browser_proxy.js',
     'edit_dictionary_page_test.js',
   ]),
 };

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

@@ -66,7 +66,9 @@ suite('settings-edit-dictionary-page', function() {
 
     languageSettingsPrivate = new settings.FakeLanguageSettingsPrivate();
     languageSettingsPrivate.setSettingsPrefs(settingsPrefs);
-    settings.languageSettingsPrivateApiForTest = languageSettingsPrivate;
+    const browserProxy = new settings.TestLanguagesBrowserProxy();
+    settings.LanguagesBrowserProxyImpl.instance_ = browserProxy;
+    browserProxy.setLanguageSettingsPrivate(languageSettingsPrivate);
 
     editDictPage = document.createElement('settings-edit-dictionary-page');
 

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

@@ -30,6 +30,11 @@ cr.define('settings', function() {
     getInputMethodPrivate() {
       return this.inputMethodPrivate_;
     }
+
+    /** @param {!LanguageSettingsPrivate} languageSettingsPrivate */
+    setLanguageSettingsPrivate(languageSettingsPrivate) {
+      this.languageSettingsPrivate_ = languageSettingsPrivate;
+    }
   }
 
   if (cr.isChromeOS || cr.isWindows) {