Remove the AudioManager singleton.

chrome/browser/speech/speech_input_extension_manager.cc

 // 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.
 
 #include "chrome/browser/speech/speech_input_extension_manager.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/profiles/profile_keyed_service_factory.h"
 #include "chrome/browser/speech/speech_input_extension_notification.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
+#include "content/browser/resource_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/speech_input_result.h"
 
 using content::BrowserThread;
-using namespace speech_input;
+using speech_input::SpeechRecognizer;
 
 namespace {
 
 const char kErrorNoRecordingDeviceFound[] = "noRecordingDeviceFound";
 const char kErrorRecordingDeviceInUse[] = "recordingDeviceInUse";
 const char kErrorUnableToStart[] = "unableToStart";
 const char kErrorRequestDenied[] = "requestDenied";
 const char kErrorRequestInProgress[] = "requestInProgress";
 const char kErrorInvalidOperation[] = "invalidOperation";
 
@@ skipping 29 matching lines @@
   SpeechInputExtensionManager* manager() const { return manager_.get(); }
 
  private:
   // Methods from ProfileKeyedService.
   virtual void Shutdown() OVERRIDE {
     manager()->ShutdownOnUIThread();
   }
 
   scoped_refptr<SpeechInputExtensionManager> manager_;
 };
-
 }
 
 // Factory for SpeechInputExtensionManagers as profile keyed services.
 class SpeechInputExtensionManager::Factory : public ProfileKeyedServiceFactory {
  public:
   static void Initialize();
   static Factory* GetInstance();
 
   SpeechInputExtensionManagerWrapper* GetForProfile(Profile* profile);
 
@@ skipping 56 matching lines @@
       speech_interface_(NULL) {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(profile_));
 }
 
 SpeechInputExtensionManager::~SpeechInputExtensionManager() {
 }
 
 SpeechInputExtensionManager* SpeechInputExtensionManager::GetForProfile(
     Profile* profile) {
-  SpeechInputExtensionManagerWrapper *wrapper =
+  SpeechInputExtensionManagerWrapper* wrapper =
       Factory::GetInstance()->GetForProfile(profile);
   if (!wrapper)
     return NULL;
   return wrapper->manager();
 }
 
 void SpeechInputExtensionManager::InitializeFactory() {
   Factory::Initialize();
 }
 
@@ skipping 290 matching lines @@
     ExtensionError details(extension_id, error);
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_EXTENSION_SPEECH_INPUT_FAILED,
         content::Source<Profile>(profile_),
         content::Details<ExtensionError>(&details));
   }
 
   // Used for errors that are also reported via the onError event.
   if (dispatch_event) {
     ListValue args;
-    DictionaryValue *js_error = new DictionaryValue();
+    DictionaryValue* js_error = new DictionaryValue();
     args.Append(js_error);
     js_error->SetString(kErrorCodeKey, error);
     std::string json_args;
     base::JSONWriter::Write(&args, false, &json_args);
     DispatchEventToExtension(extension_id,
         kOnErrorEvent, json_args);
   }
 }
 
 bool SpeechInputExtensionManager::Start(const std::string& extension_id,
@@ skipping 63 matching lines @@
         base::Bind(&SpeechInputExtensionManager::DispatchError, this,
         std::string(kErrorRecordingDeviceInUse), false));
     return;
   }
 
   GetSpeechInputExtensionInterface()->StartRecording(this, context_getter,
       kSpeechCallerId, language, grammar, filter_profanities);
 }
 
 bool SpeechInputExtensionManager::HasAudioInputDevices() {
-  return AudioManager::GetAudioManager()->HasAudioInputDevices();
+  return profile_->GetResourceContext().audio_manager()->HasAudioInputDevices();
 }
 
 bool SpeechInputExtensionManager::IsRecordingInProcess() {
   // Thread-safe query.
-  return AudioManager::GetAudioManager()->IsRecordingInProcess();
+  return profile_->GetResourceContext().audio_manager()->IsRecordingInProcess();
 }
 
 bool SpeechInputExtensionManager::IsRecording() {
   return GetSpeechInputExtensionInterface()->IsRecordingInProcess();
 }
 
 void SpeechInputExtensionManager::StartRecording(
     speech_input::SpeechRecognizerDelegate* delegate,
     net::URLRequestContextGetter* context_getter, int caller_id,
     const std::string& language, const std::string& grammar,
     bool filter_profanities) {
   DCHECK(!recognizer_);
   recognizer_ = new SpeechRecognizer(delegate, caller_id, language, grammar,
-      context_getter, filter_profanities, "", "");
+      context_getter, profile_->GetResourceContext().audio_manager(),
+      filter_profanities, "", "");
   recognizer_->StartRecording();
 }
 
 bool SpeechInputExtensionManager::HasValidRecognizer() {
   // Conditional expression used to avoid a performance warning on windows.
   return recognizer_ ? true : false;
 }
 
 bool SpeechInputExtensionManager::Stop(const std::string& extension_id,
     std::string* error) {
@@ skipping 92 matching lines @@
       base::Bind(&SpeechInputExtensionManager::SetInputVolumeOnUIThread,
       this, volume));
 }
 
 void SpeechInputExtensionManager::SetInputVolumeOnUIThread(
     float volume) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(notification_.get());
   notification_->SetVUMeterVolume(volume);
 }