diff options
| author | skyostil <skyostil@chromium.org> | 2015-06-05 10:48:59 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-05 17:49:39 +0000 |
| commit | d4104aab631ebbf2b13ad881b3ccc00a4c4b797c (patch) | |
| tree | e7ae9d8767f554877496c3527ad833a5b8018b66 /content/browser/speech | |
| parent | a73bdd5538ce40dd9e3a664ed5c42b2618f04d01 (diff) | |
| download | chromium_src-d4104aab631ebbf2b13ad881b3ccc00a4c4b797c.zip chromium_src-d4104aab631ebbf2b13ad881b3ccc00a4c4b797c.tar.gz chromium_src-d4104aab631ebbf2b13ad881b3ccc00a4c4b797c.tar.bz2 | |
Revert "content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs"
This reverts commit 422456f9d53f0bf936a64f21a1463fd0abd3df84.
TBR=zea@chromium.org
BUG=465354
NOTRY=true
NOTREECHECKS=true
Review URL: https://codereview.chromium.org/1170623003
Cr-Commit-Position: refs/heads/master@{#333086}
Diffstat (limited to 'content/browser/speech')
3 files changed, 33 insertions, 26 deletions
diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc index ee5e28e..8bc0749 100644 --- a/content/browser/speech/speech_recognition_browsertest.cc +++ b/content/browser/speech/speech_recognition_browsertest.cc @@ -5,12 +5,9 @@ #include <list> #include "base/bind.h" -#include "base/location.h" #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" -#include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" -#include "base/thread_task_runner_handle.h" #include "content/browser/speech/google_streaming_remote_engine.h" #include "content/browser/speech/speech_recognition_manager_impl.h" #include "content/browser/speech/speech_recognizer_impl.h" @@ -169,11 +166,11 @@ class SpeechRecognitionBrowserTest : const int n_buffers = duration_ms / ms_per_buffer; for (int i = 0; i < n_buffers; ++i) { - base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, - base::Bind(&FeedSingleBufferToAudioController, - scoped_refptr<media::TestAudioInputController>(controller), - buffer_size, feed_with_noise)); + base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind( + &FeedSingleBufferToAudioController, + scoped_refptr<media::TestAudioInputController>(controller), + buffer_size, + feed_with_noise)); } } diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc index 019abe1..f02c29f 100644 --- a/content/browser/speech/speech_recognition_manager_impl.cc +++ b/content/browser/speech/speech_recognition_manager_impl.cc @@ -5,9 +5,6 @@ #include "content/browser/speech/speech_recognition_manager_impl.h" #include "base/bind.h" -#include "base/location.h" -#include "base/single_thread_task_runner.h" -#include "base/thread_task_runner_handle.h" #include "content/browser/browser_main_loop.h" #include "content/browser/renderer_host/media/media_stream_manager.h" #include "content/browser/renderer_host/media/media_stream_ui_proxy.h" @@ -213,17 +210,21 @@ void SpeechRecognitionManagerImpl::RecognitionAllowedCallback(int session_id, } if (is_allowed) { - base::ThreadTaskRunnerHandle::Get()->PostTask( + base::MessageLoop::current()->PostTask( FROM_HERE, base::Bind(&SpeechRecognitionManagerImpl::DispatchEvent, - weak_factory_.GetWeakPtr(), session_id, EVENT_START)); + weak_factory_.GetWeakPtr(), + session_id, + EVENT_START)); } else { OnRecognitionError(session_id, SpeechRecognitionError( SPEECH_RECOGNITION_ERROR_NOT_ALLOWED)); - base::ThreadTaskRunnerHandle::Get()->PostTask( + base::MessageLoop::current()->PostTask( FROM_HERE, base::Bind(&SpeechRecognitionManagerImpl::DispatchEvent, - weak_factory_.GetWeakPtr(), session_id, EVENT_ABORT)); + weak_factory_.GetWeakPtr(), + session_id, + EVENT_ABORT)); } } @@ -266,10 +267,12 @@ void SpeechRecognitionManagerImpl::AbortSession(int session_id) { iter->second->abort_requested = true; - base::ThreadTaskRunnerHandle::Get()->PostTask( + base::MessageLoop::current()->PostTask( FROM_HERE, base::Bind(&SpeechRecognitionManagerImpl::DispatchEvent, - weak_factory_.GetWeakPtr(), session_id, EVENT_ABORT)); + weak_factory_.GetWeakPtr(), + session_id, + EVENT_ABORT)); } void SpeechRecognitionManagerImpl::StopAudioCaptureForSession(int session_id) { @@ -280,10 +283,12 @@ void SpeechRecognitionManagerImpl::StopAudioCaptureForSession(int session_id) { SessionsTable::iterator iter = sessions_.find(session_id); iter->second->ui.reset(); - base::ThreadTaskRunnerHandle::Get()->PostTask( + base::MessageLoop::current()->PostTask( FROM_HERE, base::Bind(&SpeechRecognitionManagerImpl::DispatchEvent, - weak_factory_.GetWeakPtr(), session_id, EVENT_STOP_CAPTURE)); + weak_factory_.GetWeakPtr(), + session_id, + EVENT_STOP_CAPTURE)); } // Here begins the SpeechRecognitionEventListener interface implementation, @@ -367,10 +372,12 @@ void SpeechRecognitionManagerImpl::OnAudioEnd(int session_id) { delegate_listener->OnAudioEnd(session_id); if (SpeechRecognitionEventListener* listener = GetListener(session_id)) listener->OnAudioEnd(session_id); - base::ThreadTaskRunnerHandle::Get()->PostTask( + base::MessageLoop::current()->PostTask( FROM_HERE, base::Bind(&SpeechRecognitionManagerImpl::DispatchEvent, - weak_factory_.GetWeakPtr(), session_id, EVENT_AUDIO_ENDED)); + weak_factory_.GetWeakPtr(), + session_id, + EVENT_AUDIO_ENDED)); } void SpeechRecognitionManagerImpl::OnRecognitionResults( @@ -418,10 +425,12 @@ void SpeechRecognitionManagerImpl::OnRecognitionEnd(int session_id) { delegate_listener->OnRecognitionEnd(session_id); if (SpeechRecognitionEventListener* listener = GetListener(session_id)) listener->OnRecognitionEnd(session_id); - base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, base::Bind(&SpeechRecognitionManagerImpl::DispatchEvent, - weak_factory_.GetWeakPtr(), session_id, - EVENT_RECOGNITION_ENDED)); + base::MessageLoop::current()->PostTask( + FROM_HERE, + base::Bind(&SpeechRecognitionManagerImpl::DispatchEvent, + weak_factory_.GetWeakPtr(), + session_id, + EVENT_RECOGNITION_ENDED)); } int SpeechRecognitionManagerImpl::GetSession( diff --git a/content/browser/speech/speech_recognizer_impl_unittest.cc b/content/browser/speech/speech_recognizer_impl_unittest.cc index 320ca81..ba6b06a 100644 --- a/content/browser/speech/speech_recognizer_impl_unittest.cc +++ b/content/browser/speech/speech_recognizer_impl_unittest.cc @@ -19,6 +19,7 @@ #include "net/url_request/url_request_status.h" #include "testing/gtest/include/gtest/gtest.h" +using base::MessageLoopProxy; using media::AudioInputController; using media::AudioInputStream; using media::AudioManager; @@ -57,7 +58,7 @@ class SpeechRecognizerImplTest : public SpeechRecognitionEventListener, recognizer_ = new SpeechRecognizerImpl( this, kTestingSessionId, false, false, sr_engine); audio_manager_.reset(new media::MockAudioManager( - base::MessageLoop::current()->task_runner().get())); + base::MessageLoop::current()->message_loop_proxy().get())); recognizer_->SetAudioManagerForTesting(audio_manager_.get()); int audio_packet_length_bytes = |