[AccessibilityPage] Add browser proxies for a11y page and subpages

Adds browser proxies for the A11y Page, Manage A11y Subpage, and Text
to Speech subpage. Allows the future creation of test browser proxies
to create tests for deep linking in the A11y pages.

Bug: 1084154
Change-Id: I83e4b69fac1b07b8e2a2c9813ac57be1642a0e99
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2399570
Commit-Queue: Daniel Classon <dclasson@google.com>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805566}

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

@@ -304,8 +304,7 @@ group("closure_compile_module") {
     "localized_link:closure_compile_module",
     "multidevice_page:closure_compile_module",
     "nearby_share_page:closure_compile_module",
-
-    #"os_a11y_page:closure_compile_module",
+    "os_a11y_page:closure_compile_module",
     "os_about_page:closure_compile_module",
 
     #"os_apps_page:closure_compile_module",

chrome/browser/resources/settings/chromeos/os_a11y_page/BUILD.gn

@@ -8,17 +8,26 @@ js_type_check("closure_compile") {
   deps = [
     ":externs",
     ":manage_a11y_page",
+    ":manage_a11y_page_browser_proxy",
     ":os_a11y_page",
+    ":os_a11y_page_browser_proxy",
     ":switch_access_constants",
     ":switch_access_subpage",
     ":tts_subpage",
+    ":tts_subpage_browser_proxy",
     "../../a11y_page:captions_subpage",
     "../../appearance_page:fonts_browser_proxy",
   ]
 }
 
+js_library("os_a11y_page_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr" ]
+  externs_list = [ "$externs_path/chrome_send.js" ]
+}
+
 js_library("os_a11y_page") {
   deps = [
+    ":os_a11y_page_browser_proxy",
     "..:os_route",
     "../../:router",
     "../../settings_page:settings_animated_pages",
@@ -27,8 +36,14 @@ js_library("os_a11y_page") {
   ]
 }
 
+js_library("manage_a11y_page_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr" ]
+  externs_list = [ "$externs_path/chrome_send.js" ]
+}
+
 js_library("manage_a11y_page") {
   deps = [
+    ":manage_a11y_page_browser_proxy",
     "..:os_route",
     "..:route_origin_behavior",
     "../..:router",
@@ -54,9 +69,15 @@ js_library("switch_access_subpage") {
   externs_list = [ "$externs_path/settings_private.js" ]
 }
 
+js_library("tts_subpage_browser_proxy") {
+  deps = [ "//ui/webui/resources/js:cr" ]
+  externs_list = [ "$externs_path/chrome_send.js" ]
+}
+
 js_library("tts_subpage") {
   deps = [
     ":externs",
+    ":tts_subpage_browser_proxy",
     "../..:router",
     "../../controls:settings_slider",
     "../../languages_page:languages_browser_proxy",
@@ -71,16 +92,21 @@ js_library("externs") {
 }
 
 # TODO: Uncomment as the Polymer3 migration makes progress.
-#js_type_check("closure_compile_module") {
-#  is_polymer3 = true
-#  deps = [
-#    ":externs.m",
-#    ":manage_a11y_page.m",
-#    ":os_a11y_page.m",
-#    ":switch_access_subpage.m",
-#    ":tts_subpage.m"
-#  ]
-#}
+js_type_check("closure_compile_module") {
+  is_polymer3 = true
+  deps = [
+    #    ":externs.m",
+    #    ":manage_a11y_page.m",
+    ":manage_a11y_page_browser_proxy.m",
+
+    #    ":os_a11y_page.m",
+    ":os_a11y_page_browser_proxy.m",
+
+    #    ":switch_access_subpage.m",
+    #    ":tts_subpage.m"
+    ":tts_subpage_browser_proxy.m",
+  ]
+}
 
 js_library("externs.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/externs.m.js" ]
@@ -98,6 +124,13 @@ js_library("manage_a11y_page.m") {
   extra_deps = [ ":manage_a11y_page_module" ]
 }
 
+js_library("manage_a11y_page_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page_browser_proxy.m.js" ]
+  deps = [ "//ui/webui/resources/js:cr.m" ]
+  externs_list = [ "$externs_path/chrome_send.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
 js_library("os_a11y_page.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.m.js" ]
   deps = [
@@ -106,6 +139,13 @@ js_library("os_a11y_page.m") {
   extra_deps = [ ":os_a11y_page_module" ]
 }
 
+js_library("os_a11y_page_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page_browser_proxy.m.js" ]
+  deps = [ "//ui/webui/resources/js:cr.m" ]
+  externs_list = [ "$externs_path/chrome_send.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
 js_library("switch_access_subpage.m") {
   sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/switch_access_subpage.m.js" ]
   deps = [
@@ -122,6 +162,13 @@ js_library("tts_subpage.m") {
   extra_deps = [ ":tts_subpage_module" ]
 }
 
+js_library("tts_subpage_browser_proxy.m") {
+  sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/os_a11y_page/tts_subpage_browser_proxy.m.js" ]
+  deps = [ "//ui/webui/resources/js:cr.m" ]
+  externs_list = [ "$externs_path/chrome_send.js" ]
+  extra_deps = [ ":modulize" ]
+}
+
 import("//tools/polymer/polymer.gni")
 
 group("polymer3_elements") {
@@ -161,5 +208,10 @@ polymer_modulizer("tts_subpage") {
 import("//ui/webui/resources/tools/js_modulizer.gni")
 
 js_modulizer("modulize") {
-  input_files = [ "externs.js" ]
+  input_files = [
+    "externs.js",
+    "manage_a11y_page_browser_proxy.js",
+    "os_a11y_page_browser_proxy.js",
+    "tts_subpage_browser_proxy.js",
+  ]
 }

chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.html

@@ -14,6 +14,7 @@
 <link rel="import" href="../device_page/device_page_browser_proxy.html">
 <link rel="import" href="../localized_link/localized_link.html">
 <link rel="import" href="../route_origin_behavior.html">
+<link rel="import" href="manage_a11y_page_browser_proxy.html">
 
 <dom-module id="settings-manage-a11y-page">
   <template>

chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page.js

@@ -239,11 +239,15 @@ Polymer({
   /** settings.RouteOriginBehavior override */
   route_: settings.routes.MANAGE_ACCESSIBILITY,
 
+  /** @private {?ManageA11yPageBrowserProxy} */
+  manageBrowserProxy_: null,
+
   /** @private {?settings.DevicePageBrowserProxy} */
   deviceBrowserProxy_: null,
 
   /** @override */
   created() {
+    this.manageBrowserProxy_ = ManageA11yPageBrowserProxyImpl.getInstance();
     this.deviceBrowserProxy_ =
         settings.DevicePageBrowserProxyImpl.getInstance();
   },
@@ -265,7 +269,7 @@ Polymer({
   ready() {
     this.addWebUIListener(
         'initial-data-ready', this.onManageAllyPageReady_.bind(this));
-    chrome.send('manageA11yPageReady');
+    this.manageBrowserProxy_.manageA11yPageReady();
 
     this.addWebUIListener(
         'tablet-mode-changed', this.onTabletModeChanged_.bind(this));
@@ -314,7 +318,7 @@ Polymer({
    * @private
    */
   toggleStartupSoundEnabled_(e) {
-    chrome.send('setStartupSoundEnabled', [e.detail]);
+    this.manageBrowserProxy_.setStartupSoundEnabled(e.detail);
   },
 
   /** @private */
@@ -325,7 +329,7 @@ Polymer({
 
   /** @private */
   onChromeVoxSettingsTap_() {
-    chrome.send('showChromeVoxSettings');
+    this.manageBrowserProxy_.showChromeVoxSettings();
   },
 
   /** @private */
@@ -336,7 +340,7 @@ Polymer({
 
   /** @private */
   onSelectToSpeakSettingsTap_() {
-    chrome.send('showSelectToSpeakSettings');
+    this.manageBrowserProxy_.showSelectToSpeakSettings();
   },
 
   /** @private */
@@ -429,7 +433,8 @@ Polymer({
     this.set(
         'prefs.settings.a11y.tablet_mode_shelf_nav_buttons_enabled.value',
         enabled);
-    chrome.send('recordSelectedShowShelfNavigationButtonValue', [enabled]);
+    this.manageBrowserProxy_.recordSelectedShowShelfNavigationButtonValue(
+        enabled);
   },
 
   /**

chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page_browser_proxy.html

+<link rel="import" href="chrome://resources/html/cr.html">
+<script src="manage_a11y_page_browser_proxy.js"></script>
\ No newline at end of file

chrome/browser/resources/settings/chromeos/os_a11y_page/manage_a11y_page_browser_proxy.js

+// Copyright 2020 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.
+
+// clang-format off
+// #import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';
+// clang-format on
+
+/** @interface */
+/* #export */ class ManageA11yPageBrowserProxy {
+  /**
+   * Opens the options page for Chrome Vox.
+   */
+  showChromeVoxSettings() {}
+
+  /**
+   * Opens the options page for select to speak.
+   */
+  showSelectToSpeakSettings() {}
+
+  /**
+   * Sets the startup sound to enabled.
+   * @param {boolean} enabled
+   */
+  setStartupSoundEnabled(enabled) {}
+
+  /**
+   * Records the value of the show shelf navigation button.
+   * @param {boolean} enabled
+   */
+  recordSelectedShowShelfNavigationButtonValue(enabled) {}
+
+  /**
+   * Requests whether startup sound and tablet mode are enabled. Result
+   * is returned by the 'initial-data-ready' WebUI listener event.
+   */
+  manageA11yPageReady() {}
+}
+
+/**
+ * @implements {ManageA11yPageBrowserProxy}
+ */
+/* #export */ class ManageA11yPageBrowserProxyImpl {
+  /** @override */
+  showChromeVoxSettings() {
+    chrome.send('showChromeVoxSettings');
+  }
+
+  /** @override */
+  showSelectToSpeakSettings() {
+    chrome.send('showSelectToSpeakSettings');
+  }
+
+  /** @override */
+  setStartupSoundEnabled(enabled) {
+    chrome.send('setStartupSoundEnabled', [enabled]);
+  }
+
+  /** @override */
+  recordSelectedShowShelfNavigationButtonValue(enabled) {
+    chrome.send('recordSelectedShowShelfNavigationButtonValue', [enabled]);
+  }
+
+  /** @override */
+  manageA11yPageReady() {
+    chrome.send('manageA11yPageReady');
+  }
+}
+
+// The singleton instance_ is replaced with a test version of this wrapper
+// during testing.
+cr.addSingletonGetter(ManageA11yPageBrowserProxyImpl);
\ No newline at end of file

chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.html

@@ -11,6 +11,7 @@
 <link rel="import" href="../../settings_page/settings_subpage.html">
 <link rel="import" href="../../settings_shared_css.html">
 <link rel="import" href="manage_a11y_page.html">
+<link rel="import" href="os_a11y_page_browser_proxy.html">
 <link rel="import" href="switch_access_subpage.html">
 <link rel="import" href="tts_subpage.html">
 

chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page.js

@@ -60,7 +60,14 @@ Polymer({
         return loadTimeData.getBoolean('isKioskModeActive');
       }
     },
+  },
+
+  /** @private {?OsA11yPageBrowserProxy} */
+  browserProxy_: null,
 
+  /** @override */
+  created() {
+    this.browserProxy_ = OsA11yPageBrowserProxyImpl.getInstance();
   },
 
   /** @override */
@@ -70,7 +77,7 @@ Polymer({
         this.onScreenReaderStateChanged_.bind(this));
 
     // Enables javascript and gets the screen reader state.
-    chrome.send('a11yPageReady');
+    this.browserProxy_.a11yPageReady();
   },
 
   /**
@@ -87,7 +94,7 @@ Polymer({
   onToggleAccessibilityImageLabels_() {
     const a11yImageLabelsOn = this.$.a11yImageLabels.checked;
     if (a11yImageLabelsOn) {
-      chrome.send('confirmA11yImageLabels');
+      this.browserProxy_.confirmA11yImageLabels();
     }
   },
 

chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page_browser_proxy.html

+<link rel="import" href="chrome://resources/html/cr.html">
+<script src="os_a11y_page_browser_proxy.js"></script>
\ No newline at end of file

chrome/browser/resources/settings/chromeos/os_a11y_page/os_a11y_page_browser_proxy.js

+// Copyright 2020 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.
+
+// clang-format off
+// #import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';
+// clang-format on
+
+/** @interface */
+/* #export */ class OsA11yPageBrowserProxy {
+  /**
+   * Requests whether screen reader state changed. Result
+   * is returned by the 'screen-reader-state-changed' WebUI listener event.
+   */
+  a11yPageReady() {}
+
+  /**
+   * Opens the a11y image labels modal dialog.
+   */
+  confirmA11yImageLabels() {}
+}
+
+/**
+ * @implements {OsA11yPageBrowserProxy}
+ */
+/* #export */ class OsA11yPageBrowserProxyImpl {
+  /** @override */
+  a11yPageReady() {
+    chrome.send('a11yPageReady');
+  }
+
+  /** @override */
+  confirmA11yImageLabels() {
+    chrome.send('confirmA11yImageLabels');
+  }
+}
+
+// The singleton instance_ is replaced with a test version of this wrapper
+// during testing.
+cr.addSingletonGetter(OsA11yPageBrowserProxyImpl);
\ No newline at end of file

chrome/browser/resources/settings/chromeos/os_a11y_page/tts_subpage.html

@@ -11,6 +11,7 @@
 <link rel="import" href="../../i18n_setup.html">
 <link rel="import" href="../../languages_page/languages_browser_proxy.html">
 <link rel="import" href="../../settings_shared_css.html">
+<link rel="import" href="tts_subpage_browser_proxy.html">
 
 <dom-module id="settings-tts-subpage">
   <template>

chrome/browser/resources/settings/chromeos/os_a11y_page/tts_subpage.js

@@ -77,6 +77,18 @@ Polymer({
     },
   },
 
+  /** @private {?TtsSubpageBrowserProxy} */
+  ttsBrowserProxy_: null,
+
+  /** @private {?settings.LanguagesBrowserProxy} */
+  langBrowserProxy_: null,
+
+  /** @override */
+  created() {
+    this.ttsBrowserProxy_ = TtsSubpageBrowserProxyImpl.getInstance();
+    this.langBrowserProxy_ = settings.LanguagesBrowserProxyImpl.getInstance();
+  },
+
   /** @override */
   ready() {
     // Populate the preview text with textToSpeechPreviewInput. Users can change
@@ -84,12 +96,12 @@ Polymer({
     this.previewText_ = this.i18n('textToSpeechPreviewInput');
     this.addWebUIListener(
         'all-voice-data-updated', this.populateVoiceList_.bind(this));
-    chrome.send('getAllTtsVoiceData');
+    this.ttsBrowserProxy_.getAllTtsVoiceData();
     this.addWebUIListener(
         'tts-extensions-updated', this.populateExtensionList_.bind(this));
     this.addWebUIListener(
         'tts-preview-state-changed', this.onTtsPreviewStateChanged_.bind(this));
-    chrome.send('getTtsExtensions');
+    this.ttsBrowserProxy_.getTtsExtensions();
   },
 
   /**
@@ -366,22 +378,23 @@ Polymer({
       this.set('defaultPreviewVoice', this.getBestVoiceForLocale_(allVoices));
     }
 
-    const browserProxy = settings.LanguagesBrowserProxyImpl.getInstance();
-    browserProxy.getProspectiveUILanguage().then(prospectiveUILanguage => {
-      let result;
-      if (prospectiveUILanguage && prospectiveUILanguage != '' &&
-          languageCodeMap[prospectiveUILanguage]) {
-        const code = languageCodeMap[prospectiveUILanguage];
-        // First try the pref value.
-        result = this.prefs.settings['tts']['lang_to_voice_name'].value[code];
-      }
-      if (!result) {
-        // If it's not a pref value yet, or the prospectiveUILanguage was
-        // missing, try using the voice score.
-        result = this.getBestVoiceForLocale_(allVoices);
-      }
-      this.set('defaultPreviewVoice', result);
-    });
+    this.langBrowserProxy_.getProspectiveUILanguage().then(
+        prospectiveUILanguage => {
+          let result;
+          if (prospectiveUILanguage && prospectiveUILanguage != '' &&
+              languageCodeMap[prospectiveUILanguage]) {
+            const code = languageCodeMap[prospectiveUILanguage];
+            // First try the pref value.
+            result =
+                this.prefs.settings['tts']['lang_to_voice_name'].value[code];
+          }
+          if (!result) {
+            // If it's not a pref value yet, or the prospectiveUILanguage was
+            // missing, try using the voice score.
+            result = this.getBestVoiceForLocale_(allVoices);
+          }
+          this.set('defaultPreviewVoice', result);
+        });
   },
 
   /**
@@ -404,8 +417,8 @@ Polymer({
 
   /** @private */
   onPreviewTtsClick_() {
-    chrome.send(
-        'previewTtsVoice', [this.previewText_, this.$.previewVoice.value]);
+    this.ttsBrowserProxy_.previewTtsVoice(
+        this.previewText_, this.$.previewVoice.value);
   },
 
   /**
@@ -413,7 +426,7 @@ Polymer({
    * @private
    */
   onEngineSettingsTap_(event) {
-    chrome.send('wakeTtsEngine');
+    this.ttsBrowserProxy_.wakeTtsEngine();
     window.open(event.model.extension.optionsPage);
   },
 });

chrome/browser/resources/settings/chromeos/os_a11y_page/tts_subpage_browser_proxy.html

+<link rel="import" href="chrome://resources/html/cr.html">
+<script src="tts_subpage_browser_proxy.js"></script>
\ No newline at end of file

chrome/browser/resources/settings/chromeos/os_a11y_page/tts_subpage_browser_proxy.js

+// Copyright 2020 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.
+
+// clang-format off
+// #import {addSingletonGetter} from 'chrome://resources/js/cr.m.js';
+// clang-format on
+
+/** @interface */
+/* #export */ class TtsSubpageBrowserProxy {
+  /**
+   * Requests the updated voice data. Returned by the 'all-voice-data-updated'
+   * WebUI Listener event.
+   */
+  getAllTtsVoiceData() {}
+
+  /**
+   * Requests the updated extensions. Returned by the 'tts-extensions-updated'
+   * WebUI Listener event.
+   */
+  getTtsExtensions() {}
+
+  /**
+   * Requests the tts preview. Returns a success boolean in the
+   * 'tts-preview-state-changed' WebUI Listener event.
+   * @param {string} previewText
+   * @param {String} previewVoice
+   */
+  previewTtsVoice(previewText, previewVoice) {}
+
+  /**
+   * Awakens the tts engine.
+   */
+  wakeTtsEngine() {}
+}
+
+/**
+ * @implements {TtsSubpageBrowserProxy}
+ */
+/* #export */ class TtsSubpageBrowserProxyImpl {
+  /** @override */
+  getAllTtsVoiceData() {
+    chrome.send('getAllTtsVoiceData');
+  }
+
+  /** @override */
+  getTtsExtensions() {
+    chrome.send('getTtsExtensions');
+  }
+
+  /** @override */
+  previewTtsVoice(previewText, previewVoice) {
+    chrome.send('previewTtsVoice', [previewText, previewVoice]);
+  }
+
+  /** @override */
+  wakeTtsEngine() {
+    chrome.send('wakeTtsEngine');
+  }
+}
+
+// The singleton instance_ is replaced with a test version of this wrapper
+// during testing.
+cr.addSingletonGetter(TtsSubpageBrowserProxyImpl);
\ No newline at end of file

chrome/browser/resources/settings/os_settings_resources.grd

@@ -69,6 +69,12 @@
       <structure name="IDR_OS_SETTINGS_A11Y_PAGE_HTML"
                  file="chromeos/os_a11y_page/os_a11y_page.html"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_A11Y_PAGE_BROWSER_PROXY_JS"
+                 file="chromeos/os_a11y_page/os_a11y_page_browser_proxy.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_A11Y_PAGE_BROWSER_PROXY_HTML"
+                 file="chromeos/os_a11y_page/os_a11y_page_browser_proxy.html"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_AMBIENT_MODE_PAGE_JS"
                  file="chromeos/ambient_mode_page/ambient_mode_page.js"
                  compress="false" type="chrome_html" />
@@ -306,6 +312,12 @@
       <structure name="IDR_OS_SETTINGS_MANAGE_A11Y_PAGE_HTML"
                  file="chromeos/os_a11y_page/manage_a11y_page.html"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_MANAGE_A11Y_PAGE_BROWSER_PROXY_JS"
+                 file="chromeos/os_a11y_page/manage_a11y_page_browser_proxy.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_MANAGE_A11Y_PAGE_BROWSER_PROXY_HTML"
+                 file="chromeos/os_a11y_page/manage_a11y_page_browser_proxy.html"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_SWITCH_ACCESS_CONSTANTS_JS"
                  file="chromeos/os_a11y_page/switch_access_constants.js"
                  compress="false" type="chrome_html" />
@@ -324,6 +336,12 @@
       <structure name="IDR_OS_SETTINGS_TTS_SUBPAGE_HTML"
                  file="chromeos/os_a11y_page/tts_subpage.html"
                  compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_TTS_SUBPAGE_BROWSER_PROXY_JS"
+                 file="chromeos/os_a11y_page/tts_subpage_browser_proxy.js"
+                 compress="false" type="chrome_html" />
+      <structure name="IDR_OS_SETTINGS_TTS_SUBPAGE_BROWSER_PROXY_HTML"
+                 file="chromeos/os_a11y_page/tts_subpage_browser_proxy.html"
+                 compress="false" type="chrome_html" />
       <structure name="IDR_OS_SETTINGS_MANIFEST"
                  file="os_settings_manifest.json"
                  compress="false" type="chrome_html" />