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

content/browser/speech/speech_input_manager.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
 #define CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "content/common/speech_input_result.h"
 #include "ui/gfx/rect.h"
 
 namespace speech_input {
 
 // This is the gatekeeper for speech recognition in the browser process. It
 // handles requests received from various render views and makes sure only one
 // of them can use speech recognition at a time. It also sends recognition
 // results and status events to the render views when required.
 // This class is a singleton and accessed via the Get method.

[Satish, 2011/08/25 09:08:52]

Need to update this comment since the Get() method was removed below.

[jam, 2011/08/25 16:36:43]

done (moved it to the chrome impl)

 class SpeechInputManager {
  public:
   // Implemented by the dispatcher host to relay events to the render views.
   class Delegate {
    public:
     virtual void SetRecognitionResult(
         int caller_id,
         const SpeechInputResultArray& result) = 0;
     virtual void DidCompleteRecording(int caller_id) = 0;
     virtual void DidCompleteRecognition(int caller_id) = 0;
 
    protected:
     virtual ~Delegate() {}
   };
 
-  SpeechInputManager() : censor_results_(true) {}
+  SpeechInputManager();
 
   // Invokes the platform provided microphone settings UI in a non-blocking way,
   // via the BrowserThread::FILE thread.
   static void ShowAudioInputSettings();
 
-  // Factory method to access the singleton. We have this method here instead of
-  // using Singleton directly in the calling code to aid tests in injection
-  // mocks.
-  static SpeechInputManager* Get();
-  // Factory method definition useful for tests.
-  typedef SpeechInputManager* (AccessorMethod)();
-
-  virtual ~SpeechInputManager() {}
+  virtual ~SpeechInputManager();
 
   // Handlers for requests from render views.
 
   // |delegate| is a weak pointer and should remain valid until
   // its |DidCompleteRecognition| method is called or recognition is cancelled.
   // |render_process_id| is the ID of the renderer process initiating the
   // request.
   // |element_rect| is the display bounds of the html element requesting speech
   // input (in page coordinates).
   virtual void StartRecognition(Delegate* delegate,
                                 int caller_id,
                                 int render_process_id,
                                 int render_view_id,
                                 const gfx::Rect& element_rect,
                                 const std::string& language,
                                 const std::string& grammar,
                                 const std::string& origin_url)  = 0;
   virtual void CancelRecognition(int caller_id) = 0;
   virtual void StopRecording(int caller_id) = 0;
 
   virtual void CancelAllRequestsWithDelegate(Delegate* delegate) = 0;
 
   void set_censor_results(bool censor) { censor_results_ = censor; }
 
   bool censor_results() { return censor_results_; }
+
  private:
   bool censor_results_;
 };
 
 // This typedef is to workaround the issue with certain versions of
 // Visual Studio where it gets confused between multiple Delegate
 // classes and gives a C2500 error. (I saw this error on the try bots -
 // the workaround was not needed for my machine).
 typedef SpeechInputManager::Delegate SpeechInputManagerDelegate;
 
 }  // namespace speech_input
 
 #endif  // CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_