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

chrome/browser/speech/speech_input_extension_apitest.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/speech/speech_input_extension_api.h"
@@ skipping 37 matching lines @@
   // Used as delay when the corresponding call should not be dispatched.
   static const int kDontDispatchCall = -1;
 
   // ExtensionApiTest methods.
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
   }
 
   // SpeechInputExtensionInterface methods.
-  virtual bool HasAudioInputDevices(
-      content::ResourceContext* resource_context) OVERRIDE {
+  virtual bool HasAudioInputDevices() OVERRIDE {
     return recording_devices_available_;
   }
 
-  virtual bool IsRecordingInProcess(
-      content::ResourceContext* resource_context) OVERRIDE {
+  virtual bool IsRecordingInProcess() OVERRIDE {
     // Only the mock recognizer is supposed to be recording during testing.
     return HasValidRecognizer();
   }
 
   virtual bool HasValidRecognizer() OVERRIDE {
     return recognizer_is_valid_;
   }
 
   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;
 
   SpeechInputExtensionManager* GetManager() {
     return SpeechInputExtensionManager::GetForProfile(browser()->profile());
   }
@@ skipping 32 matching lines @@
       next_error_(content::SPEECH_INPUT_ERROR_NONE),
       result_delay_ms_(0) {
 }
 
 SpeechInputExtensionApiTest::~SpeechInputExtensionApiTest() {
 }
 
 void SpeechInputExtensionApiTest::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) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   recognizer_is_valid_ = true;
 
   // Notify that recording started.
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
       base::Bind(&SpeechInputExtensionManager::DidStartReceivingAudio,
@@ skipping 53 matching lines @@
   SetRecognitionResult(result);
   ASSERT_TRUE(RunExtensionTest("speech_input/recognition")) << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(SpeechInputExtensionApiTest, RecognitionError) {
   AutoManagerHook hook(this);
 
   SetRecognitionError(content::SPEECH_INPUT_ERROR_NETWORK);
   ASSERT_TRUE(RunExtensionTest("speech_input/recognition_error")) << message_;
 }