Moved instantiation of SpeechRecognitionManager inside browser_main_loop, instead of Singleton.

content/browser/speech/input_tag_speech_dispatcher_host.h

Index: content/browser/speech/input_tag_speech_dispatcher_host.h
diff --git a/content/browser/speech/input_tag_speech_dispatcher_host.h b/content/browser/speech/input_tag_speech_dispatcher_host.h
index b98d9e5f580158f7918d82838579372d41931af4..5e73a6336a74274350bbdfe0effc910fbac43c90 100644
--- a/content/browser/speech/input_tag_speech_dispatcher_host.h
+++ b/content/browser/speech/input_tag_speech_dispatcher_host.h
@@ -15,14 +15,13 @@
 struct InputTagSpeechHostMsg_StartRecognition_Params;
 
 namespace content {
+class SpeechRecognitionManager;
 class SpeechRecognitionPreferences;
 struct SpeechRecognitionResult;
 }
 
 namespace speech {
 
-class SpeechRecognitionManagerImpl;
-
 // InputTagSpeechDispatcherHost is a delegate for Speech API messages used by
 // RenderMessageFilter. Basically it acts as a proxy, relaying the events coming
 // from the SpeechRecognitionManager to IPC messages (and vice versa).
@@ -56,7 +55,7 @@ class CONTENT_EXPORT InputTagSpeechDispatcherHost
                                  bool* message_was_ok) OVERRIDE;
 
   // Singleton manager setter useful for tests.
-  static void set_manager(SpeechRecognitionManagerImpl* manager);
+  static void set_manager_for_tests(content::SpeechRecognitionManager* manager);

[jam, 2012/05/15 16:38:31]

nit: per style guide this should be SetManagerForTests

[Primiano Tucci (use gerrit), 2012/05/15 17:17:12]

Changed it. However, can I just ask where I can find that rule, in order to
avoid that nit in future?

I named it so according to:
- From Google C++ style guide: "...For example if a function were so cheap you
would not cache ... lowercase naming would 
be acceptable"
- From chromium style guide: "Google style strongly encourages (but does not
mandate) unix_hacker style on member functions that do so little work they're
effectively free, such as simple, non-virtual getters and setters. This is also
the team position."

[jam, 2012/05/15 17:20:47]

we only allow these unix_hacker naming when the functions are inlined. if the
definition is in a separate file, we always use CamelCase. i would assume that
this is in a style guide somewhere, if not, that should be fixed. afaik this
isn't personal style but a rule that we follow.

[jam, 2012/05/15 17:26:56]

btw looking at the google style guide:
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Function_Names

it says that unix_hacker is for inline functions and accessors/mutators. it also
says "The definitions of accessors are usually inlined in the header file."

 
  private:
   virtual ~InputTagSpeechDispatcherHost();
@@ -68,7 +67,7 @@ class CONTENT_EXPORT InputTagSpeechDispatcherHost
 
   // Returns the speech recognition manager to forward events to, creating one
   // if needed.
-  SpeechRecognitionManagerImpl* manager();
+  content::SpeechRecognitionManager* manager();
 
   int render_process_id_;
   bool may_have_pending_requests_;  // Set if we received any speech IPC request
@@ -76,7 +75,7 @@ class CONTENT_EXPORT InputTagSpeechDispatcherHost
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
   scoped_refptr<content::SpeechRecognitionPreferences> recognition_preferences_;
 
-  static SpeechRecognitionManagerImpl* manager_;
+  static content::SpeechRecognitionManager* manager_for_tests_;
 
   DISALLOW_COPY_AND_ASSIGN(InputTagSpeechDispatcherHost);
 };