Make content::ResourceContext be a real interface like the rest of the Content API (i.e. don't ha...

chrome/browser/speech/speech_input_extension_manager.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 "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"
@@ skipping 495 matching lines @@
     default:
       NOTREACHED();
   }
 
   extension_id_in_use_ = extension_id;
   VLOG(1) << "State changed to starting";
   state_ = kStarting;
 
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&SpeechInputExtensionManager::StartOnIOThread, this,
-      profile_->GetRequestContext(), &profile_->GetResourceContext(),
+      profile_->GetRequestContext(), profile_->GetResourceContext(),
       language, grammar, filter_profanities));
   return true;
 }
 
 void SpeechInputExtensionManager::StartOnIOThread(
     net::URLRequestContextGetter* context_getter,
-    const content::ResourceContext* resource_context,
+    content::ResourceContext* resource_context,
     const std::string& language,
     const std::string& grammar,
     bool filter_profanities) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   VLOG(1) << "Requesting start (IO thread)";
 
   // Everything put inside the lock to ensure the validity of context_getter,
   // guaranteed while not in the shutdown state. Any ongoing or recognition
   // request will be requested to be aborted when entering the shutdown state.
   base::AutoLock auto_lock(state_lock_);
@@ skipping 14 matching lines @@
         base::Bind(&SpeechInputExtensionManager::DispatchError, this,
         std::string(kErrorRecordingDeviceInUse), false));
     return;
   }
 
   GetSpeechInputExtensionInterface()->StartRecording(this, context_getter,
       resource_context, kSpeechCallerId, language, grammar, filter_profanities);
 }
 
 bool SpeechInputExtensionManager::HasAudioInputDevices(
-    const content::ResourceContext* resource_context) {
+    content::ResourceContext* resource_context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(resource_context);
-  return resource_context->audio_manager()->HasAudioInputDevices();
+  return resource_context->GetAudioManager()->HasAudioInputDevices();
 }
 
 bool SpeechInputExtensionManager::IsRecordingInProcess(
-    const content::ResourceContext* resource_context) {
+    content::ResourceContext* resource_context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(resource_context);
-  return resource_context->audio_manager()->IsRecordingInProcess();
+  return resource_context->GetAudioManager()->IsRecordingInProcess();
 }
 
 void SpeechInputExtensionManager::IsRecording(
     const IsRecordingCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&SpeechInputExtensionManager::IsRecordingOnIOThread,
-      this, callback, &profile_->GetResourceContext()));
+      this, callback, profile_->GetResourceContext()));
 }
 
 void SpeechInputExtensionManager::IsRecordingOnIOThread(
     const IsRecordingCallback& callback,
-    const content::ResourceContext* resource_context) {
+    content::ResourceContext* resource_context) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(resource_context);
 
   bool result = GetSpeechInputExtensionInterface()->IsRecordingInProcess(
       resource_context);
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       base::Bind(&SpeechInputExtensionManager::IsRecordingOnUIThread,
       this, callback, result));
 }
 
 void SpeechInputExtensionManager::IsRecordingOnUIThread(
     const IsRecordingCallback& callback,
     bool result) {
   BrowserThread::CurrentlyOn(BrowserThread::UI);
   callback.Run(result);
 }
 
 void SpeechInputExtensionManager::StartRecording(
     speech_input::SpeechRecognizerDelegate* delegate,
     net::URLRequestContextGetter* context_getter,
-    const content::ResourceContext* resource_context,
+    content::ResourceContext* resource_context,
     int caller_id,
     const std::string& language,
     const std::string& grammar,
     bool filter_profanities) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(resource_context);
   DCHECK(!recognizer_);
   recognizer_ = new SpeechRecognizer(delegate, caller_id, language, grammar,
-      context_getter, resource_context->audio_manager(),
+      context_getter, resource_context->GetAudioManager(),
       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,
@@ skipping 93 matching lines @@
       base::Bind(&SpeechInputExtensionManager::SetInputVolumeOnUIThread,
       this, volume));
 }
 
 void SpeechInputExtensionManager::SetInputVolumeOnUIThread(
     float volume) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(notification_.get());
   notification_->SetVUMeterVolume(volume);
 }