Make TtsEngineExtensionObserver Chrome OS only

R=dmazzoni@chromium.org

Test: compiles, passes existing tests.
Change-Id: I543899d7cc231df8b1748b1d614e36d482acf789
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2520802Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org>
Reviewed-by: Istiaque Ahmed <lazyboy@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: David Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825031}

chrome/browser/BUILD.gn

@@ -5431,8 +5431,6 @@ static_library("browser") {
       "renderer_host/chrome_extension_message_filter.h",
       "speech/extension_api/tts_engine_extension_api.cc",
       "speech/extension_api/tts_engine_extension_api.h",
-      "speech/extension_api/tts_engine_extension_observer.cc",
-      "speech/extension_api/tts_engine_extension_observer.h",
       "speech/extension_api/tts_extension_api.cc",
       "speech/extension_api/tts_extension_api.h",
       "sync_file_system/conflict_resolution_policy.h",
@@ -5599,6 +5597,10 @@ static_library("browser") {
       "//services/device/public/mojom",
     ]
     if (is_chromeos) {
+      sources += [
+        "speech/extension_api/tts_engine_extension_observer_chromeos.cc",
+        "speech/extension_api/tts_engine_extension_observer_chromeos.h",
+      ]
       deps += [ "//chromeos/services/tts/public/mojom" ]
     }
   }

chrome/browser/extensions/chrome_extensions_browser_interface_binders.cc

@@ -22,7 +22,7 @@
 #include "chrome/browser/chromeos/remote_apps/remote_apps_manager.h"
 #include "chrome/browser/chromeos/remote_apps/remote_apps_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/speech/extension_api/tts_engine_extension_observer.h"
+#include "chrome/browser/speech/extension_api/tts_engine_extension_observer_chromeos.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chromeos/components/camera_app_ui/camera_app_ui.h"
 #include "chromeos/components/chromebox_for_meetings/buildflags/buildflags.h"
@@ -79,7 +79,7 @@ void BindHandwritingRecognizerRequestor(
 void BindTtsStream(
     content::RenderFrameHost* render_frame_host,
     mojo::PendingReceiver<chromeos::tts::mojom::TtsStream> receiver) {
-  TtsEngineExtensionObserver::GetInstance(
+  TtsEngineExtensionObserverChromeOS::GetInstance(
       Profile::FromBrowserContext(render_frame_host->GetBrowserContext()))
       ->BindTtsStream(std::move(receiver));
 }

chrome/browser/speech/extension_api/tts_engine_extension_api.cc

@@ -15,7 +15,6 @@
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/speech/extension_api/tts_engine_extension_observer.h"
 #include "chrome/browser/speech/extension_api/tts_extension_api.h"
 #include "chrome/browser/speech/extension_api/tts_extension_api_constants.h"
 #include "chrome/common/extensions/api/speech/tts_engine_manifest_handler.h"

chrome/browser/speech/extension_api/tts_engine_extension_observer.cc → chrome/browser/speech/extension_api/tts_engine_extension_observer_chromeos.cc

@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/speech/extension_api/tts_engine_extension_observer.h"
+#include "chrome/browser/speech/extension_api/tts_engine_extension_observer_chromeos.h"
 
 #include "base/check.h"
 #include "base/memory/singleton.h"
+#include "chrome/browser/chromeos/service_sandbox_type.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
@@ -21,9 +22,6 @@
 #include "extensions/browser/event_router_factory.h"
 #include "extensions/common/permissions/permissions_data.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/service_sandbox_type.h"
-
 namespace {
 
 void UpdateGoogleSpeechSynthesisKeepAliveCountHelper(
@@ -77,32 +75,32 @@ void UpdateGoogleSpeechSynthesisKeepAliveCountOnReload(
 }
 
 }  // namespace
-#endif  // defined(OS_CHROMEOS)
 
 // Factory to load one instance of TtsExtensionLoaderChromeOs per profile.
-class TtsEngineExtensionObserverFactory
+class TtsEngineExtensionObserverChromeOSFactory
     : public BrowserContextKeyedServiceFactory {
  public:
-  static TtsEngineExtensionObserver* GetForProfile(Profile* profile) {
-    return static_cast<TtsEngineExtensionObserver*>(
+  static TtsEngineExtensionObserverChromeOS* GetForProfile(Profile* profile) {
+    return static_cast<TtsEngineExtensionObserverChromeOS*>(
         GetInstance()->GetServiceForBrowserContext(profile, true));
   }
 
-  static TtsEngineExtensionObserverFactory* GetInstance() {
-    return base::Singleton<TtsEngineExtensionObserverFactory>::get();
+  static TtsEngineExtensionObserverChromeOSFactory* GetInstance() {
+    return base::Singleton<TtsEngineExtensionObserverChromeOSFactory>::get();
   }
 
  private:
-  friend struct base::DefaultSingletonTraits<TtsEngineExtensionObserverFactory>;
+  friend struct base::DefaultSingletonTraits<
+      TtsEngineExtensionObserverChromeOSFactory>;
 
-  TtsEngineExtensionObserverFactory()
+  TtsEngineExtensionObserverChromeOSFactory()
       : BrowserContextKeyedServiceFactory(
-            "TtsEngineExtensionObserver",
+            "TtsEngineExtensionObserverChromeOS",
             BrowserContextDependencyManager::GetInstance()) {
     DependsOn(extensions::EventRouterFactory::GetInstance());
   }
 
-  ~TtsEngineExtensionObserverFactory() override {}
+  ~TtsEngineExtensionObserverChromeOSFactory() override {}
 
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override {
@@ -113,17 +111,19 @@ class TtsEngineExtensionObserverFactory
 
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* profile) const override {
-    return new TtsEngineExtensionObserver(static_cast<Profile*>(profile));
+    return new TtsEngineExtensionObserverChromeOS(
+        static_cast<Profile*>(profile));
   }
 };
 
-TtsEngineExtensionObserver* TtsEngineExtensionObserver::GetInstance(
-    Profile* profile) {
-  return TtsEngineExtensionObserverFactory::GetInstance()->GetForProfile(
-      profile);
+TtsEngineExtensionObserverChromeOS*
+TtsEngineExtensionObserverChromeOS::GetInstance(Profile* profile) {
+  return TtsEngineExtensionObserverChromeOSFactory::GetInstance()
+      ->GetForProfile(profile);
 }
 
-TtsEngineExtensionObserver::TtsEngineExtensionObserver(Profile* profile)
+TtsEngineExtensionObserverChromeOS::TtsEngineExtensionObserverChromeOS(
+    Profile* profile)
     : extension_registry_observer_(this), profile_(profile) {
   extension_registry_observer_.Add(
       extensions::ExtensionRegistry::Get(profile_));
@@ -134,23 +134,17 @@ TtsEngineExtensionObserver::TtsEngineExtensionObserver(Profile* profile)
   event_router->RegisterObserver(this, tts_engine_events::kOnSpeak);
   event_router->RegisterObserver(this, tts_engine_events::kOnStop);
 
-#if defined(OS_CHROMEOS)
   accessibility_status_subscription_ =
       chromeos::AccessibilityManager::Get()->RegisterCallback(
           base::BindRepeating(
-              &TtsEngineExtensionObserver::OnAccessibilityStatusChanged,
+              &TtsEngineExtensionObserverChromeOS::OnAccessibilityStatusChanged,
               base::Unretained(this)));
-#endif
 }
 
-TtsEngineExtensionObserver::~TtsEngineExtensionObserver() = default;
-
-const std::set<std::string> TtsEngineExtensionObserver::GetTtsExtensions() {
-  return engine_extension_ids_;
-}
+TtsEngineExtensionObserverChromeOS::~TtsEngineExtensionObserverChromeOS() =
+    default;
 
-#if defined(OS_CHROMEOS)
-void TtsEngineExtensionObserver::BindTtsStream(
+void TtsEngineExtensionObserverChromeOS::BindTtsStream(
     mojo::PendingReceiver<chromeos::tts::mojom::TtsStream> receiver) {
   // At this point, the component extension has loaded, and the js has requested
   // a TtsStream be bound. It's safe now to update the keep alive count for
@@ -172,13 +166,12 @@ void TtsEngineExtensionObserver::BindTtsStream(
   content::GetAudioService().BindStreamFactory(std::move(factory_receiver));
   tts_service_->BindTtsStream(std::move(receiver), std::move(factory_remote));
 }
-#endif  // defined(OS_CHROMEOS)
 
-void TtsEngineExtensionObserver::Shutdown() {
+void TtsEngineExtensionObserverChromeOS::Shutdown() {
   extensions::EventRouter::Get(profile_)->UnregisterObserver(this);
 }
 
-bool TtsEngineExtensionObserver::IsLoadedTtsEngine(
+bool TtsEngineExtensionObserverChromeOS::IsLoadedTtsEngine(
     const std::string& extension_id) {
   extensions::EventRouter* event_router =
       extensions::EventRouter::Get(profile_);
@@ -193,7 +186,7 @@ bool TtsEngineExtensionObserver::IsLoadedTtsEngine(
   return false;
 }
 
-void TtsEngineExtensionObserver::OnListenerAdded(
+void TtsEngineExtensionObserverChromeOS::OnListenerAdded(
     const extensions::EventListenerInfo& details) {
   if (!IsLoadedTtsEngine(details.extension_id))
     return;
@@ -201,7 +194,7 @@ void TtsEngineExtensionObserver::OnListenerAdded(
   content::TtsController::GetInstance()->VoicesChanged();
 }
 
-void TtsEngineExtensionObserver::OnExtensionLoaded(
+void TtsEngineExtensionObserverChromeOS::OnExtensionLoaded(
     content::BrowserContext* browser_context,
     const extensions::Extension* extension) {
   if (extension->permissions_data()->HasAPIPermission(
@@ -210,7 +203,7 @@ void TtsEngineExtensionObserver::OnExtensionLoaded(
   }
 }
 
-void TtsEngineExtensionObserver::OnExtensionUnloaded(
+void TtsEngineExtensionObserverChromeOS::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const extensions::Extension* extension,
     extensions::UnloadedExtensionReason reason) {
@@ -219,15 +212,12 @@ void TtsEngineExtensionObserver::OnExtensionUnloaded(
   if (erase_count > 0)
     content::TtsController::GetInstance()->VoicesChanged();
 
-#if defined(OS_CHROMEOS)
   if (tts_service_ &&
       extension->id() == extension_misc::kGoogleSpeechSynthesisExtensionId)
     tts_service_.reset();
-#endif  // defined(OS_CHROMEOS)
 }
 
-#if defined(OS_CHROMEOS)
-void TtsEngineExtensionObserver::OnAccessibilityStatusChanged(
+void TtsEngineExtensionObserverChromeOS::OnAccessibilityStatusChanged(
     const chromeos::AccessibilityStatusEventDetails& details) {
   if (details.notification_type != chromeos::AccessibilityNotificationType::
                                        ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK &&
@@ -240,4 +230,3 @@ void TtsEngineExtensionObserver::OnAccessibilityStatusChanged(
   // increment. Decrements only occur when toggling off here.
   UpdateGoogleSpeechSynthesisKeepAliveCount(profile(), details.enabled);
 }
-#endif

chrome/browser/speech/extension_api/tts_engine_extension_observer.h → chrome/browser/speech/extension_api/tts_engine_extension_observer_chromeos.h

@@ -2,42 +2,39 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SPEECH_EXTENSION_API_TTS_ENGINE_EXTENSION_OBSERVER_H_
-#define CHROME_BROWSER_SPEECH_EXTENSION_API_TTS_ENGINE_EXTENSION_OBSERVER_H_
+#ifndef CHROME_BROWSER_SPEECH_EXTENSION_API_TTS_ENGINE_EXTENSION_OBSERVER_CHROMEOS_H_
+#define CHROME_BROWSER_SPEECH_EXTENSION_API_TTS_ENGINE_EXTENSION_OBSERVER_CHROMEOS_H_
 
 #include "base/macros.h"
 #include "base/scoped_observer.h"
+#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
+#include "chromeos/services/tts/public/mojom/tts_service.mojom.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/audio_service.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_registry_observer.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
-#include "chromeos/services/tts/public/mojom/tts_service.mojom.h"
-#endif
-
 class Profile;
 
 // Profile-keyed class that observes the extension registry to determine load of
 // extension-based tts engines.
-class TtsEngineExtensionObserver
+class TtsEngineExtensionObserverChromeOS
     : public KeyedService,
       public extensions::EventRouter::Observer,
       public extensions::ExtensionRegistryObserver {
  public:
-  static TtsEngineExtensionObserver* GetInstance(Profile* profile);
+  static TtsEngineExtensionObserverChromeOS* GetInstance(Profile* profile);
 
   // Gets the currently loaded TTS extension ids.
-  const std::set<std::string> GetTtsExtensions();
+  const std::set<std::string>& engine_extension_ids() {
+    return engine_extension_ids_;
+  }
 
   Profile* profile() { return profile_; }
 
-#if defined(OS_CHROMEOS)
   void BindTtsStream(
       mojo::PendingReceiver<chromeos::tts::mojom::TtsStream> receiver);
-#endif  // defined(OS_CHROMEOS)
 
   // Implementation of KeyedService.
   void Shutdown() override;
@@ -53,15 +50,13 @@ class TtsEngineExtensionObserver
                            extensions::UnloadedExtensionReason reason) override;
 
  private:
-  explicit TtsEngineExtensionObserver(Profile* profile);
-  ~TtsEngineExtensionObserver() override;
+  explicit TtsEngineExtensionObserverChromeOS(Profile* profile);
+  ~TtsEngineExtensionObserverChromeOS() override;
 
   bool IsLoadedTtsEngine(const std::string& extension_id);
 
-#if defined(OS_CHROMEOS)
   void OnAccessibilityStatusChanged(
       const chromeos::AccessibilityStatusEventDetails& details);
-#endif
 
   ScopedObserver<extensions::ExtensionRegistry,
                  extensions::ExtensionRegistryObserver>
@@ -71,16 +66,14 @@ class TtsEngineExtensionObserver
 
   std::set<std::string> engine_extension_ids_;
 
-#if defined(OS_CHROMEOS)
   std::unique_ptr<chromeos::AccessibilityStatusSubscription>
       accessibility_status_subscription_;
 
   mojo::Remote<chromeos::tts::mojom::TtsService> tts_service_;
-#endif
 
-  friend class TtsEngineExtensionObserverFactory;
+  friend class TtsEngineExtensionObserverChromeOSFactory;
 
-  DISALLOW_COPY_AND_ASSIGN(TtsEngineExtensionObserver);
+  DISALLOW_COPY_AND_ASSIGN(TtsEngineExtensionObserverChromeOS);
 };
 
-#endif  // CHROME_BROWSER_SPEECH_EXTENSION_API_TTS_ENGINE_EXTENSION_OBSERVER_H_
+#endif  // CHROME_BROWSER_SPEECH_EXTENSION_API_TTS_ENGINE_EXTENSION_OBSERVER_CHROMEOS_H_

chrome/browser/speech/extension_api/tts_extension_api.cc

@@ -16,7 +16,6 @@
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
-#include "chrome/browser/speech/extension_api/tts_engine_extension_observer.h"
 #include "chrome/browser/speech/extension_api/tts_extension_api_constants.h"
 #include "content/public/browser/tts_controller.h"
 #include "extensions/browser/event_router.h"
@@ -24,6 +23,10 @@
 #include "third_party/blink/public/mojom/speech/speech_synthesis.mojom.h"
 #include "ui/base/l10n/l10n_util.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/speech/extension_api/tts_engine_extension_observer_chromeos.h"
+#endif  // defined(OS_CHROMEOS)
+
 namespace constants = tts_extension_api_constants;
 
 namespace events {
@@ -349,8 +352,11 @@ TtsAPI::TtsAPI(content::BrowserContext* context) {
   registry.RegisterFunction<TtsPauseFunction>();
   registry.RegisterFunction<TtsResumeFunction>();
 
+#if defined(OS_CHROMEOS)
   // Ensure we're observing newly added engines for the given context.
-  TtsEngineExtensionObserver::GetInstance(Profile::FromBrowserContext(context));
+  TtsEngineExtensionObserverChromeOS::GetInstance(
+      Profile::FromBrowserContext(context));
+#endif  // defined(OS_CHROMEOS)
 }
 
 TtsAPI::~TtsAPI() {

chrome/browser/ui/BUILD.gn

@@ -2541,10 +2541,10 @@ static_library("ui") {
       "webui/settings/chromeos/settings_user_action_tracker.h",
       "webui/settings/chromeos/switch_access_handler.cc",
       "webui/settings/chromeos/switch_access_handler.h",
+      "webui/settings/chromeos/tts_handler.cc",
+      "webui/settings/chromeos/tts_handler.h",
       "webui/settings/chromeos/wallpaper_handler.cc",
       "webui/settings/chromeos/wallpaper_handler.h",
-      "webui/settings/tts_handler.cc",
-      "webui/settings/tts_handler.h",
       "webui/signin/inline_login_dialog_chromeos.cc",
       "webui/signin/inline_login_dialog_chromeos.h",
       "webui/signin/inline_login_dialog_chromeos_onboarding.cc",

chrome/browser/ui/webui/settings/chromeos/accessibility_section.cc

@@ -13,15 +13,15 @@
 #include "base/no_destructor.h"
 #include "chrome/browser/accessibility/accessibility_state_utils.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/speech/extension_api/tts_engine_extension_observer.h"
+#include "chrome/browser/speech/extension_api/tts_engine_extension_observer_chromeos.h"
 #include "chrome/browser/ui/webui/settings/accessibility_main_handler.h"
 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h"
 #include "chrome/browser/ui/webui/settings/chromeos/captions_handler.h"
 #include "chrome/browser/ui/webui/settings/chromeos/search/search_tag_registry.h"
 #include "chrome/browser/ui/webui/settings/chromeos/switch_access_handler.h"
+#include "chrome/browser/ui/webui/settings/chromeos/tts_handler.h"
 #include "chrome/browser/ui/webui/settings/font_handler.h"
 #include "chrome/browser/ui/webui/settings/shared_settings_localized_strings_provider.h"
-#include "chrome/browser/ui/webui/settings/tts_handler.h"
 #include "chrome/browser/ui/webui/webui_util.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
@@ -756,8 +756,9 @@ void AccessibilitySection::UpdateTextToSpeechEnginesSearchTags() {
   SearchTagRegistry::ScopedTagUpdater updater = registry()->StartUpdate();
   updater.RemoveSearchTags(GetTextToSpeechEnginesSearchConcepts());
 
-  const std::set<std::string> extensions =
-      TtsEngineExtensionObserver::GetInstance(profile())->GetTtsExtensions();
+  const std::set<std::string>& extensions =
+      TtsEngineExtensionObserverChromeOS::GetInstance(profile())
+          ->engine_extension_ids();
   if (!extensions.empty()) {
     updater.AddSearchTags(GetTextToSpeechEnginesSearchConcepts());
   }

chrome/browser/ui/webui/settings/tts_handler.cc → chrome/browser/ui/webui/settings/chromeos/tts_handler.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/webui/settings/tts_handler.h"
+#include "chrome/browser/ui/webui/settings/chromeos/tts_handler.h"
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
@@ -10,7 +10,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/speech/extension_api/tts_engine_extension_api.h"
-#include "chrome/browser/speech/extension_api/tts_engine_extension_observer.h"
+#include "chrome/browser/speech/extension_api/tts_engine_extension_observer_chromeos.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/grit/generated_resources.h"
@@ -45,7 +45,8 @@ void TtsHandler::HandleGetTtsExtensions(const base::ListValue* args) {
       extensions::ExtensionRegistry::Get(profile);
 
   const std::set<std::string> extensions =
-      TtsEngineExtensionObserver::GetInstance(profile)->GetTtsExtensions();
+      TtsEngineExtensionObserverChromeOS::GetInstance(profile)
+          ->engine_extension_ids();
   std::set<std::string>::const_iterator iter;
   for (iter = extensions.begin(); iter != extensions.end(); ++iter) {
     const std::string extension_id = *iter;

chrome/browser/ui/webui/settings/tts_handler.h → chrome/browser/ui/webui/settings/chromeos/tts_handler.h

@@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_TTS_HANDLER_H_
-#define CHROME_BROWSER_UI_WEBUI_SETTINGS_TTS_HANDLER_H_
+#ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_TTS_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_TTS_HANDLER_H_
 
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
 #include "content/public/browser/tts_controller.h"
 
-class Profile;
-
 namespace settings {
 
 // Chrome "/manageAccessibility/tts/*" settings page UI handler.
@@ -54,4 +52,4 @@ class TtsHandler : public SettingsPageUIHandler,
 
 }  // namespace settings
 
-#endif  // CHROME_BROWSER_UI_WEBUI_SETTINGS_TTS_HANDLER_H_
+#endif  // CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_TTS_HANDLER_H_