Revert: defer ChromeVox load, play progress tones natively

This reverts changes:
4fe3a6a4 Ensure AccessibilityManager::ChromeVoxDeferredLoader's warmup utterance targets Googletts
8df286c2 Moves load progress tones from js to native

which were mainly workarounds for slow Google tts during the web assembly porteffort.

This revert removes now unnecessary complexity around ChromeVox's load path now that text to speech is native.

R=dmazzoni@chromium.org

TBR=dmazzoni@chromium.org

Change-Id: I8cdc9a946b1c112011aabfd3babd533aff03ed2b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2264193Reviewed-by: David Tseng <dtseng@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: David Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782002}

chrome/browser/chromeos/accessibility/accessibility_manager.cc

@@ -188,78 +188,6 @@ class AccessibilityPanelWidgetObserver : public views::WidgetObserver {
   DISALLOW_COPY_AND_ASSIGN(AccessibilityPanelWidgetObserver);
 };
 
-// Responsible for deferring ChromeVox load until a text-to-speech voice is
-// ready to be used. Plays progress tones while waiting.
-class ChromeVoxDeferredLoader : public content::UtteranceEventDelegate,
-                                public content::VoicesChangedDelegate {
- public:
-  explicit ChromeVoxDeferredLoader(AccessibilityManager* manager)
-      : manager_(manager) {
-    timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(500), this,
-                 &ChromeVoxDeferredLoader::OnTimer);
-
-    if (IsGoogleTtsVoiceAvailable())
-      SendWarmupUtterance();
-    else
-      content::TtsController::GetInstance()->AddVoicesChangedDelegate(this);
-  }
-
-  ~ChromeVoxDeferredLoader() override {
-    content::TtsController::GetInstance()->RemoveVoicesChangedDelegate(this);
-    content::TtsController::GetInstance()->RemoveUtteranceEventDelegate(this);
-    manager_->UnloadChromeVox();
-  }
-
- private:
-  // content::UtteranceEventDelegate:
-  void OnTtsEvent(content::TtsUtterance* utterance,
-                  content::TtsEventType event_type,
-                  int char_index,
-                  int length,
-                  const std::string& error_message) override {
-    utterance->SetEventDelegate(nullptr);
-    timer_.Stop();
-    manager_->LoadChromeVox();
-  }
-
-  // content::VoicesChangedDelegate:
-  void OnVoicesChanged() override {
-    if (IsGoogleTtsVoiceAvailable()) {
-      content::TtsController::GetInstance()->RemoveVoicesChangedDelegate(this);
-      SendWarmupUtterance();
-    }
-  }
-
-  void SendWarmupUtterance() {
-    Profile* profile = manager_->profile();
-    if (profile->HasPrimaryOTRProfile())
-      profile = profile->GetPrimaryOTRProfile();
-    std::unique_ptr<content::TtsUtterance> utterance =
-        content::TtsUtterance::Create(profile);
-    utterance->SetEventDelegate(this);
-    utterance->SetEngineId(extension_misc::kGoogleSpeechSynthesisExtensionId);
-    content::TtsController::GetInstance()->SpeakOrEnqueue(std::move(utterance));
-  }
-
-  void OnTimer() { manager_->PlaySpokenFeedbackToggleCountdown(tick_count_++); }
-
-  bool IsGoogleTtsVoiceAvailable() const {
-    Profile* profile = manager_->profile();
-    if (profile->HasPrimaryOTRProfile())
-      profile = profile->GetPrimaryOTRProfile();
-    std::vector<content::VoiceData> voices;
-    content::TtsController::GetInstance()->GetVoices(profile, &voices);
-    return std::any_of(voices.begin(), voices.end(), [](const auto& voice) {
-      return voice.engine_id ==
-             extension_misc::kGoogleSpeechSynthesisExtensionId;
-    });
-  }
-
-  AccessibilityManager* manager_;
-  int tick_count_ = 0;
-  base::RepeatingTimer timer_;
-};
-
 ///////////////////////////////////////////////////////////////////////////////
 // AccessibilityStatusEventDetails
 
@@ -531,10 +459,11 @@ void AccessibilityManager::OnSpokenFeedbackChanged() {
   NotifyAccessibilityStatusChanged(details);
 
   if (enabled) {
-    chromevox_deferred_loader_ =
-        std::make_unique<ChromeVoxDeferredLoader>(this);
+    chromevox_loader_->Load(
+        profile_, base::BindRepeating(&AccessibilityManager::PostLoadChromeVox,
+                                      weak_ptr_factory_.GetWeakPtr()));
   } else {
-    chromevox_deferred_loader_.reset();
+    chromevox_loader_->Unload();
   }
   UpdateBrailleImeState();
 }
@@ -1378,21 +1307,6 @@ void AccessibilityManager::OnShutdown(extensions::ExtensionRegistry* registry) {
   extension_registry_observer_.Remove(registry);
 }
 
-void AccessibilityManager::LoadChromeVox() {
-  chromevox_loader_->Load(
-      profile_, base::BindRepeating(&AccessibilityManager::PostLoadChromeVox,
-                                    weak_ptr_factory_.GetWeakPtr()));
-}
-
-void AccessibilityManager::UnloadChromeVox() {
-  // In browser_tests unloading the ChromeVox extension can race with shutdown.
-  // http://crbug.com/801700
-  if (app_terminating_)
-    return;
-
-  chromevox_loader_->Unload();
-}
-
 void AccessibilityManager::PostLoadChromeVox() {
   // In browser_tests loading the ChromeVox extension can race with shutdown.
   // http://crbug.com/801700

chrome/browser/chromeos/accessibility/accessibility_manager.h

@@ -90,7 +90,6 @@ typedef AccessibilityStatusCallbackList::Subscription
     AccessibilityStatusSubscription;
 
 class AccessibilityPanelWidgetObserver;
-class ChromeVoxDeferredLoader;
 
 enum class PlaySoundOption {
   // The sound is always played.
@@ -356,8 +355,6 @@ class AccessibilityManager
   ~AccessibilityManager() override;
 
  private:
-  void LoadChromeVox();
-  void UnloadChromeVox();
   void PostLoadChromeVox();
   void PostUnloadChromeVox();
   void PostSwitchChromeVoxProfile();
@@ -494,14 +491,10 @@ class AccessibilityManager
   // Used to set the audio focus enforcement type for ChromeVox.
   mojo::Remote<media_session::mojom::AudioFocusManager> audio_focus_manager_;
 
-  // Handles deferred ChromeVox load.
-  std::unique_ptr<ChromeVoxDeferredLoader> chromevox_deferred_loader_;
-
   base::WeakPtrFactory<AccessibilityManager> weak_ptr_factory_{this};
 
   friend class DictationTest;
   friend class SwitchAccessTest;
-  friend class ChromeVoxDeferredLoader;
   DISALLOW_COPY_AND_ASSIGN(AccessibilityManager);
 };
 

chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc

@@ -147,15 +147,7 @@ void LoggedInSpokenFeedbackTest::EnableChromeVox() {
   ASSERT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
 
   AccessibilityManager::Get()->EnableSpokenFeedback(true);
-
-  // AccessibilityManager sends a warmup utterance prior to actually loading
-  // ChromeVox.
-  sm_.ExpectSpeech("");
-
-  // The next utterance comes from ChromeVox signaling it is ready.
   sm_.ExpectSpeechPattern("*");
-
-  // Injects js to disable earcons.
   sm_.Call([this]() { DisableEarcons(); });
 }
 

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

@@ -169,6 +169,29 @@ Background = class extends ChromeVoxState {
     // Set the darkScreen state to false, since the display will be on whenever
     // ChromeVox starts.
     sessionStorage.setItem('darkScreen', 'false');
+
+      // A self-contained class to start and stop progress sounds before any
+      // speech has been generated on startup. This is important in cases where
+      // speech is severely delayed.
+      /** @implements {TtsCapturingEventListener} */
+      const ProgressPlayer = class {
+        constructor() {
+          ChromeVox.tts.addCapturingEventListener(this);
+          ChromeVox.earcons.playEarcon(Earcon.CHROMEVOX_LOADING);
+        }
+
+        /** @override */
+        onTtsStart() {
+          ChromeVox.earcons.playEarcon(Earcon.CHROMEVOX_LOADED);
+          ChromeVox.tts.removeCapturingEventListener(this);
+        }
+
+        /** @override */
+        onTtsEnd() {}
+        /** @override */
+        onTtsInterrupted() {}
+      };
+      new ProgressPlayer();
   }
 
   /**

chrome/browser/resources/chromeos/accessibility/chromevox/testing/chromevox_e2e_test_base.js

@@ -26,7 +26,6 @@ ChromeVoxE2ETest = class extends testing.Test {
   #include "base/bind.h"
   #include "base/callback.h"
   #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
-  #include "chrome/browser/chromeos/accessibility/speech_monitor.h"
   #include "chrome/common/extensions/extension_constants.h"
   #include "content/public/test/browser_test.h"
   #include "extensions/common/extension_l10n_util.h"
@@ -36,11 +35,6 @@ ChromeVoxE2ETest = class extends testing.Test {
   /** @override */
   testGenPreamble() {
     GEN(`
-
-    // SpeechMonitor swaps in a custom TtsPlatform to mock out events and
-    // voices. Do this for the current call stack to catch deferred load.
-    chromeos::SpeechMonitor speech_monitor;
-
     auto allow = extension_l10n_util::AllowGzippedMessagesAllowedForTest();
     base::Closure load_cb =
         base::Bind(&chromeos::AccessibilityManager::EnableSpokenFeedback,

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

@@ -2521,9 +2521,6 @@ IN_PROC_BROWSER_TEST_F(HotseatShelfAppBrowserTest, EnableChromeVox) {
       chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
   chromeos::AccessibilityManager::Get()->EnableSpokenFeedback(true);
 
-  // AccessibilityManager sends an empty warmup utterance first.
-  speech_monitor.ExpectSpeech("");
-
   // Wait for ChromeVox to start reading anything.
   speech_monitor.ExpectSpeechPattern("*");
   speech_monitor.Call([this]() {