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

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

Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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_recognition_manager_impl.cc
diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc
index beae421953a6adcb27e303cd0b4b7d2a7ea1635f..0b7700369a66f92ec4a08d22b9b667011207b632 100644
--- a/content/browser/speech/speech_recognition_manager_impl.cc
+++ b/content/browser/speech/speech_recognition_manager_impl.cc
@@ -118,10 +118,10 @@ int SpeechRecognitionManagerImpl::CreateSession(
SpeechRecognitionEngine* google_remote_engine;
if (config.is_legacy_api) {
google_remote_engine =
- new GoogleOneShotRemoteEngine(config.url_request_context_getter);
+ new GoogleOneShotRemoteEngine(config.url_request_context_getter.get());
} else {
- google_remote_engine =
- new GoogleStreamingRemoteEngine(config.url_request_context_getter);
+ google_remote_engine = new GoogleStreamingRemoteEngine(
+ config.url_request_context_getter.get());
}
google_remote_engine->SetConfig(remote_engine_config);
@@ -602,7 +602,7 @@ void SpeechRecognitionManagerImpl::ResetCapturingSessionId(
}
void SpeechRecognitionManagerImpl::SessionDelete(const Session& session) {
- DCHECK(session.recognizer == NULL || !session.recognizer->IsActive());
+ DCHECK(session.recognizer.get() == NULL || !session.recognizer->IsActive());
if (primary_session_id_ == session.id)
primary_session_id_ = kSessionIDInvalid;
sessions_.erase(session.id);
« no previous file with comments | « content/browser/speech/speech_recognition_dispatcher_host.cc ('k') | content/browser/speech/speech_recognizer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698