Remove GetAudioManager and GetMediaStreamManager from ResourceContext. The reason is the content mo…

chrome/browser/speech/speech_input_extension_manager.h

 // Copyright (c) 2012 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 CHROME_BROWSER_SPEECH_SPEECH_INPUT_EXTENSION_MANAGER_H_
 #define CHROME_BROWSER_SPEECH_SPEECH_INPUT_EXTENSION_MANAGER_H_
 #pragma once
 
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/speech_recognizer_delegate.h"
 
 class Extension;
 class Profile;
 class SpeechInputExtensionNotification;
 
 namespace content {
 class NotificationRegistrar;
-class ResourceContext;
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace speech_input {
 class SpeechRecognizer;
 }
 
 // Used for API tests.
 class SpeechInputExtensionInterface {
  public:
   SpeechInputExtensionInterface();
   virtual ~SpeechInputExtensionInterface();
 
   // Called from the IO thread.
   virtual void StartRecording(
       content::SpeechRecognizerDelegate* delegate,
       net::URLRequestContextGetter* context_getter,
-      content::ResourceContext* resource_context,
       int caller_id,
       const std::string& language,
       const std::string& grammar,
       bool filter_profanities) = 0;
 
   virtual void StopRecording(bool recognition_failed) = 0;
-  virtual bool HasAudioInputDevices(
-      content::ResourceContext* resource_context) = 0;
-  virtual bool IsRecordingInProcess(
-      content::ResourceContext* resource_context) = 0;
+  virtual bool HasAudioInputDevices() = 0;
+  virtual bool IsRecordingInProcess() = 0;
 
   // Called from the UI thread.
   virtual bool HasValidRecognizer() = 0;
 
  protected:
   scoped_refptr<speech_input::SpeechRecognizer> recognizer_;
 };
 
 // Manages the speech input requests and responses from the extensions
 // associated to the given profile.
@@ skipping 75 matching lines @@
   virtual void SetInputVolume(int caller_id, float volume,
                               float noise_volume) OVERRIDE;
 
   // Methods for API testing.
   void SetSpeechInputExtensionInterface(
       SpeechInputExtensionInterface* interface);
   SpeechInputExtensionInterface* GetSpeechInputExtensionInterface();
 
  private:
   // SpeechInputExtensionInterface methods:
-  virtual bool IsRecordingInProcess(
-      content::ResourceContext* resource_context) OVERRIDE;
-  virtual bool HasAudioInputDevices(
-      content::ResourceContext* resource_context) OVERRIDE;
+  virtual bool IsRecordingInProcess() OVERRIDE;
+  virtual bool HasAudioInputDevices() OVERRIDE;
   virtual bool HasValidRecognizer() OVERRIDE;
-
   virtual void StartRecording(
       content::SpeechRecognizerDelegate* delegate,
       net::URLRequestContextGetter* context_getter,
-      content::ResourceContext* resource_context,
       int caller_id,
       const std::string& language,
       const std::string& grammar,
       bool filter_profanities) OVERRIDE;
 
   virtual void StopRecording(bool recognition_failed) OVERRIDE;
 
   // Internal methods.
   void StartOnIOThread(
       net::URLRequestContextGetter* context_getter,
-      content::ResourceContext* resource_context,
       const std::string& language,
       const std::string& grammar,
       bool filter_profanities);
   void ForceStopOnIOThread();
-  void IsRecordingOnIOThread(const IsRecordingCallback& callback,
-                             content::ResourceContext* resource_context);
+  void IsRecordingOnIOThread(const IsRecordingCallback& callback);
 
   void SetRecognitionResultOnUIThread(
       const content::SpeechInputResult& result,
       const std::string& extension_id);
   void DidStartReceivingAudioOnUIThread();
   void StopSucceededOnUIThread();
   void IsRecordingOnUIThread(const IsRecordingCallback& callback, bool result);
 
   void DispatchError(const std::string& error, bool dispatch_event);
   void DispatchEventToExtension(const std::string& extension_id,
@@ skipping 22 matching lines @@
   State state_;
   std::string extension_id_in_use_;
 
   // Used in the UI thread.
   scoped_ptr<content::NotificationRegistrar> registrar_;
   SpeechInputExtensionInterface* speech_interface_;
   scoped_ptr<SpeechInputExtensionNotification> notification_;
 };
 
 #endif  // CHROME_BROWSER_SPEECH_SPEECH_INPUT_EXTENSION_MANAGER_H_