ChromeVox Cleanup: Shorten PhoneticData API name.

Bug: N/A
Change-Id: Idc2bd9e15811692ba976c60a35c65e248a7aa8ca
Relnotes: N/A
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2157775
Commit-Queue: Akihiro Ota <akihiroota@chromium.org>
Reviewed-by: David Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#761052}

chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js

@@ -1011,12 +1011,10 @@ CommandHandler.onCommand = function(command) {
 
       // Get unicode-aware array of characters.
       const characterArray = [...word];
-      // We currently only load phonetic data for the browser UI language.
       const language = chrome.i18n.getUILanguage();
       for (let i = 0; i < characterArray.length; ++i) {
         const character = characterArray[i];
-        const phoneticText =
-            PhoneticData.getPhoneticDisambiguation(language, character);
+        const phoneticText = PhoneticData.forCharacter(character, language);
         // Speak the character followed by its phonetic disambiguation, if it
         // was found.
         new Output()

chrome/browser/resources/chromeos/accessibility/chromevox/background/phonetic_data.js

@@ -20,22 +20,25 @@ PhoneticData.init = function() {
 };
 
 /**
- * Returns the phonetic disambiguation for |character| in |locale|.
+ * Returns the phonetic disambiguation for |char| in |locale|.
  * Returns empty string if disambiguation can't be found.
+ * @param {string} char
  * @param {string} locale
- * @param {string} character
  * @return {string}
  */
-PhoneticData.getPhoneticDisambiguation = function(locale, character) {
+PhoneticData.forCharacter = function(char, locale) {
   const phoneticDictionaries =
       chrome.extension.getBackgroundPage().PhoneticDictionaries;
-  if (!locale || !character || !phoneticDictionaries ||
-      !phoneticDictionaries.phoneticMap_) {
-    return '';
+  if (!phoneticDictionaries || !phoneticDictionaries.phoneticMap_) {
+    throw Error('PhoneticDictionaries map must be defined.');
+  }
+
+  if (!char || !locale) {
+    throw Error('PhoneticData api requires non-empty arguments.');
   }
 
+  char = char.toLowerCase();
   locale = locale.toLowerCase();
-  character = character.toLowerCase();
   let map = null;
   if (locale === 'ja') {
     map = JaPhoneticData.phoneticMap_;
@@ -50,5 +53,5 @@ PhoneticData.getPhoneticDisambiguation = function(locale, character) {
     return '';
   }
 
-  return map[character] || '';
+  return map[char] || '';
 };

chrome/browser/resources/chromeos/accessibility/chromevox/common/tts_background.js

@@ -726,8 +726,7 @@ TtsBackground = class extends ChromeTtsBase {
       properties['lang'] = chrome.i18n.getUILanguage();
     }
 
-    const phoneticText =
-        PhoneticData.getPhoneticDisambiguation(properties['lang'], text);
+    const phoneticText = PhoneticData.forCharacter(text, properties['lang']);
     if (phoneticText) {
       properties['delay'] = true;
       this.speak(phoneticText, QueueMode.QUEUE, properties);