Get rid of link dependency from content to chrome. Make it get the SpeechInputManager through the...

content/browser/speech/speech_input_dispatcher_host.cc

 // Copyright (c) 2010 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 "content/browser/speech/speech_input_dispatcher_host.h"
 
 #include "base/lazy_instance.h"
+#include "content/browser/content_browser_client.h"
 #include "content/common/speech_input_messages.h"
 
 namespace speech_input {
 
 //----------------------------- SpeechInputCallers -----------------------------
 
 // A singleton class to map the tuple
 // (render-process-id, render-view-id, requestid) to a single ID which is passed
 // through rest of the speech code.
 class SpeechInputDispatcherHost::SpeechInputCallers {
@@ skipping 76 matching lines @@
 int SpeechInputDispatcherHost::SpeechInputCallers::render_view_id(int id) {
   return callers_[id].render_view_id;
 }
 
 int SpeechInputDispatcherHost::SpeechInputCallers::request_id(int id) {
   return callers_[id].request_id;
 }
 
 //-------------------------- SpeechInputDispatcherHost -------------------------
 
-SpeechInputManager::AccessorMethod*
-    SpeechInputDispatcherHost::manager_accessor_ = &SpeechInputManager::Get;
+SpeechInputManager* SpeechInputDispatcherHost::manager_;
 
 SpeechInputDispatcherHost::SpeechInputDispatcherHost(int render_process_id)
     : render_process_id_(render_process_id),
       may_have_pending_requests_(false) {
   // This is initialized by Browser. Do not add any non-trivial
   // initialization here, instead do it lazily when required (e.g. see the
   // method |manager()|) or add an Init() method.
 }
 
 SpeechInputDispatcherHost::~SpeechInputDispatcherHost() {
   // If the renderer crashed for some reason or if we didn't receive a proper
   // Cancel/Stop call for an existing session, cancel such active sessions now.
   // We first check if this dispatcher received any speech IPC requst so that
   // we don't end up creating the speech input manager for web pages which don't
   // use speech input.
   if (may_have_pending_requests_)
     manager()->CancelAllRequestsWithDelegate(this);
 }
 
 SpeechInputManager* SpeechInputDispatcherHost::manager() {
-  return (*manager_accessor_)();
+  if (manager_)
+    return manager_;
+  return content::GetContentClient()->browser()->GetSpeechInputManager();
 }
 
 bool SpeechInputDispatcherHost::OnMessageReceived(
     const IPC::Message& message, bool* message_was_ok) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(SpeechInputDispatcherHost, message,
                            *message_was_ok)
     IPC_MESSAGE_HANDLER(SpeechInputHostMsg_StartRecognition,
                         OnStartRecognition)
@@ skipping 69 matching lines @@
     g_speech_input_callers.Get().render_view_id(caller_id);
   int caller_request_id = g_speech_input_callers.Get().request_id(caller_id);
   Send(new SpeechInputMsg_RecognitionComplete(caller_render_view_id,
                                               caller_request_id));
   // Request sequence ended, so remove mapping.
   g_speech_input_callers.Get().RemoveId(caller_id);
   VLOG(1) << "SpeechInputDispatcherHost::DidCompleteRecognition exit";
 }
 
 }  // namespace speech_input