Remove explicit singletonness of ArcBridgeService part 3.

chrome/browser/speech/tts_chromeos.cc

 // Copyright (c) 2012 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.
 
 #include "base/macros.h"
 #include "chrome/browser/speech/tts_platform.h"
 #include "components/arc/arc_bridge_service.h"
+#include "components/arc/arc_service_manager.h"
 #include "components/arc/common/tts.mojom.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace {
 
 // For Speak and Stop.
 constexpr uint32_t kDefaultMinVersion = 0;
 
 // Helper returning an ARC tts instance.
 arc::mojom::TtsInstance* GetArcTts(const std::string& method_name_for_logging,
                                    uint32_t min_version) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  return arc::ArcBridgeService::Get()
-             ? arc::ArcBridgeService::Get()->tts()->GetInstanceForMethod(
-                   method_name_for_logging, min_version)
-             : nullptr;
+  auto* const arc_service_manager = arc::ArcServiceManager::Get();
+  if (!arc_service_manager)
+    return nullptr;
+
+  return arc_service_manager->arc_bridge_service()->tts()->GetInstanceForMethod(
+      method_name_for_logging, min_version);
 }
 
 }  // namespace
 
 // This class includes extension-based tts through LoadBuiltInTtsExtension and
 // native tts through ARC.
 class TtsPlatformImplChromeOs : public TtsPlatformImpl {
  public:
   // TtsPlatformImpl overrides:
   bool PlatformImplAvailable() override {
-    return arc::ArcBridgeService::Get() &&
-           arc::ArcBridgeService::Get()->tts()->has_instance();
+    return arc::ArcServiceManager::Get() &&
+           arc::ArcServiceManager::Get()
+               ->arc_bridge_service()
+               ->tts()
+               ->has_instance();
   }
 
   bool LoadBuiltInTtsExtension(
       content::BrowserContext* browser_context) override {
     TtsEngineDelegate* tts_engine_delegate =
         TtsController::GetInstance()->GetTtsEngineDelegate();
     if (tts_engine_delegate)
       return tts_engine_delegate->LoadBuiltInTtsExtension(browser_context);
     return false;
   }
@@ skipping 54 matching lines @@
 // static
 TtsPlatformImpl* TtsPlatformImpl::GetInstance() {
   return TtsPlatformImplChromeOs::GetInstance();
 }
 
 // static
 TtsPlatformImplChromeOs*
 TtsPlatformImplChromeOs::GetInstance() {
   return base::Singleton<TtsPlatformImplChromeOs>::get();
 }