diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:13:46 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 21:13:46 +0000 |
| commit | fc72bb18b111ff63e57135d97de6d59291f3b7b8 (patch) | |
| tree | f7fedf0a0577e38a0486e8bdc88a47a508bf122d /content/browser/speech/speech_recognition_manager_impl.cc | |
| parent | 7cd76fded67d66fb8ea4f5abce5241ad71d749a9 (diff) | |
| download | chromium_src-fc72bb18b111ff63e57135d97de6d59291f3b7b8.zip chromium_src-fc72bb18b111ff63e57135d97de6d59291f3b7b8.tar.gz chromium_src-fc72bb18b111ff63e57135d97de6d59291f3b7b8.tar.bz2 | |
Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/16294003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/speech/speech_recognition_manager_impl.cc')
| -rw-r--r-- | content/browser/speech/speech_recognition_manager_impl.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc index beae421..0b77003 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); |