Rename speech synthesis voice names.

This fixes an issue where built-in voices duplicate voice names for US English Female TTS (by Google), an engine available
from the webstore.

This change depends on a Chrome OS change to make the same voice renaming changes. When out of sync, it appears the voices don't work.

TEST=Manually verify every voice works (driven by ChromeVox).
BUG=none

Review URL: https://codereview.chromium.org/398593002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285302 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 20 insertions, 32 deletions

diff --git a/chrome/browser/resources/chromeos/speech_synthesis/manifest.json b/chrome/browser/resources/chromeos/speech_synthesis/manifest.json
index 02f0ca4..0edded7 100644
--- a/chrome/browser/resources/chromeos/speech_synthesis/manifest.json
+++ b/chrome/browser/resources/chromeos/speech_synthesis/manifest.json
@@ -29,71 +29,65 @@
   "tts_engine": {
     "voices": [
       {
-        "voice_name": "German Female TTS (by Google)",
+        "voice_name": "Chrome OS German",
         "lang": "de-DE",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "GB English Female TTS (by Google)",
+        "voice_name": "Chrome OS British English",
         "lang": "en-GB",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "Indian English Female TTS (by Google)",
+        "voice_name": "Chrome OS Indian English",
         "lang": "en-IN",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "US English Female TTS (by Google)",
+        "voice_name": "Chrome OS US English",
         "lang": "en-US",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "Spanish Female TTS (by Google)",
+        "voice_name": "Chrome OS Spanish",
         "lang": "es-ES",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "US Spanish Female TTS (by Google)",
+        "voice_name": "Chrome OS US Spanish",
         "lang": "es-US",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "French Female TTS (by Google)",
+        "voice_name": "Chrome OS French",
         "lang": "fr-FR",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "Italian Female TTS (by Google)",
+        "voice_name": "Chrome OS Italian",
         "lang": "it-IT",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "Korean Female TTS (by Google)",
+        "voice_name": "Chrome OS Korean",
         "lang": "ko-KR",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "Brazilian Portuguese Female TTS (by Google)",
+        "voice_name": "Chrome OS Brazilian Portuguese",
         "lang": "pt-BR",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       }
     ]
-  },
-  "icons": {
-    "128": "google-tts-128.png",
-    "16": "google-tts-16.png",
-    "256": "google-tts-256.png",
-    "48": "google-tts-48.png"
   }
 }
diff --git a/chrome/browser/resources/chromeos/speech_synthesis/manifest_guest.json b/chrome/browser/resources/chromeos/speech_synthesis/manifest_guest.json
index 4eabd8e..c7efa02 100644
--- a/chrome/browser/resources/chromeos/speech_synthesis/manifest_guest.json
+++ b/chrome/browser/resources/chromeos/speech_synthesis/manifest_guest.json
@@ -30,71 +30,65 @@
   "tts_engine": {
     "voices": [
       {
-        "voice_name": "German Female TTS (by Google)",
+        "voice_name": "Chrome OS German",
         "lang": "de-DE",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "GB English Female TTS (by Google)",
+        "voice_name": "Chrome OS British English",
         "lang": "en-GB",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "Indian English Female TTS (by Google)",
+        "voice_name": "Chrome OS Indian English",
         "lang": "en-IN",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "US English Female TTS (by Google)",
+        "voice_name": "Chrome OS US English",
         "lang": "en-US",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "Spanish Female TTS (by Google)",
+        "voice_name": "Chrome OS Spanish",
         "lang": "es-ES",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "US Spanish Female TTS (by Google)",
+        "voice_name": "Chrome OS US Spanish",
         "lang": "es-US",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "French Female TTS (by Google)",
+        "voice_name": "Chrome OS French",
         "lang": "fr-FR",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "Italian Female TTS (by Google)",
+        "voice_name": "Chrome OS Italian",
         "lang": "it-IT",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "Korean Female TTS (by Google)",
+        "voice_name": "Chrome OS Korean",
         "lang": "ko-KR",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       },
       {
-        "voice_name": "Brazilian Portuguese Female TTS (by Google)",
+        "voice_name": "Chrome OS Brazilian Portuguese",
         "lang": "pt-BR",
         "gender": "female",
         "event_types": [ "start", "word", "end", "error" ]
       }
     ]
-  },
-  "icons": {
-    "128": "google-tts-128.png",
-    "16": "google-tts-16.png",
-    "256": "google-tts-256.png",
-    "48": "google-tts-48.png"
   }
 }