Always use arc::InstanceHolder<T>::GetInstanceForMethod

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/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() {
+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()->instance()
+             ? arc::ArcBridgeService::Get()->tts()->GetInstanceForMethod(
+                   method_name_for_logging, min_version)
              : nullptr;
 }
 
 }  // 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 GetArcTts() != nullptr; }
+  bool PlatformImplAvailable() override {
+    return arc::ArcBridgeService::Get() &&
+           arc::ArcBridgeService::Get()->tts()->HasInstance();
+  }
 
   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;
   }
 
   bool Speak(int utterance_id,
              const std::string& utterance,
              const std::string& lang,
              const VoiceData& voice,
              const UtteranceContinuousParameters& params) override {
-    arc::mojom::TtsInstance* tts = GetArcTts();
+    arc::mojom::TtsInstance* tts = GetArcTts("Speak", kDefaultMinVersion);
     if (!tts)
       return false;
 
     arc::mojom::TtsUtterancePtr arc_utterance = arc::mojom::TtsUtterance::New();
     arc_utterance->utteranceId = utterance_id;
     arc_utterance->text = utterance;
     arc_utterance->rate = params.rate;
     arc_utterance->pitch = params.pitch;
     tts->Speak(std::move(arc_utterance));
     return true;
   }
 
   bool StopSpeaking() override {
-    arc::mojom::TtsInstance* tts = GetArcTts();
+    arc::mojom::TtsInstance* tts = GetArcTts("Stop", kDefaultMinVersion);
     if (!tts)
       return false;
 
     tts->Stop();
     return true;
   }
 
   void GetVoices(std::vector<VoiceData>* out_voices) override {
     out_voices->push_back(VoiceData());
     VoiceData& voice = out_voices->back();
@@ skipping 23 matching lines @@
 // static
 TtsPlatformImpl* TtsPlatformImpl::GetInstance() {
   return TtsPlatformImplChromeOs::GetInstance();
 }
 
 // static
 TtsPlatformImplChromeOs*
 TtsPlatformImplChromeOs::GetInstance() {
   return base::Singleton<TtsPlatformImplChromeOs>::get();
 }