Moved instantiation of SpeechRecognitionManager inside browser_main_loop, instead of Singleton.

content/browser/browser_main_loop.cc

Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 9e14737002cb3a11e039c194595e1db7fdf70672..c23464c20b8e0335e92e2f4f93016e9bf92736c8 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -23,6 +23,7 @@
 #include "content/browser/net/browser_online_state_observer.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
+#include "content/browser/speech/speech_recognition_manager_impl.h"
 #include "content/browser/trace_controller_impl.h"
 #include "content/common/hi_res_timer_manager.h"
 #include "content/public/browser/browser_main_parts.h"
@@ -480,6 +481,9 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
   if (resource_dispatcher_host_.get())
     resource_dispatcher_host_.get()->Shutdown();
 
+  // Cleanup the speech recognition manager.

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

nit: this comment and the one below are just describing what the code does, so
no need to have them

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

Done.

+  speech_recognition_manager_.reset();
+
 #if defined(USE_AURA)
   ImageTransportFactory::Terminate();
 #endif
@@ -593,6 +597,9 @@ void BrowserMainLoop::BrowserThreadsStarted() {
   // RDH needs the IO thread to be created.
   resource_dispatcher_host_.reset(new ResourceDispatcherHostImpl());
 
+  // Initialize the speech recognition manager.
+  speech_recognition_manager_.reset(new speech::SpeechRecognitionManagerImpl());
+
   // Start the GpuDataManager before we set up the MessageLoops because
   // otherwise we'll trigger the assertion about doing IO on the UI thread.
   content::GpuDataManager::GetInstance();