Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1077)

Unified Diff: content/browser/speech/speech_recognizer.cc

Issue 7989001: Remove use of default request context and fix use of speech censor flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/speech/speech_recognizer.cc
diff --git a/content/browser/speech/speech_recognizer.cc b/content/browser/speech/speech_recognizer.cc
index f6019f6647bee81866e6423e7d732a2dd08b6c0b..884542fc3b5e64acdb2132ece6938d84f291483e 100644
--- a/content/browser/speech/speech_recognizer.cc
+++ b/content/browser/speech/speech_recognizer.cc
@@ -6,8 +6,6 @@
#include "base/time.h"
#include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
-#include "content/common/content_client.h"
#include "net/url_request/url_request_context_getter.h"
using media::AudioInputController;
@@ -60,6 +58,7 @@ SpeechRecognizer::SpeechRecognizer(Delegate* delegate,
const std::string& language,
const std::string& grammar,
bool censor_results,
+ net::URLRequestContextGetter* context_getter,
const std::string& hardware_info,
const std::string& origin_url)
: delegate_(delegate),
@@ -69,6 +68,7 @@ SpeechRecognizer::SpeechRecognizer(Delegate* delegate,
censor_results_(censor_results),
hardware_info_(hardware_info),
origin_url_(origin_url),
+ context_getter_(context_getter),
codec_(AudioEncoder::CODEC_FLAC),
encoder_(NULL),
endpointer_(kAudioSampleRate),
@@ -224,11 +224,7 @@ void SpeechRecognizer::HandleOnData(string* data) {
// This was the first audio packet recorded, so start a request to the
// server to send the data and inform the delegate.
delegate_->DidStartReceivingAudio(caller_id_);
- // Deprecated; see http://crbug.com/92366
- net::URLRequestContextGetter* context_getter =
- content::GetContentClient()->browser()->
- GetDefaultRequestContextDeprecatedCrBug64339();
- request_.reset(new SpeechRecognitionRequest(context_getter, this));
+ request_.reset(new SpeechRecognitionRequest(context_getter_.get(), this));
request_->Start(language_, grammar_, censor_results_, hardware_info_,
origin_url_, encoder_->mime_type());
}

Powered by Google App Engine
This is Rietveld 408576698