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

Side by Side Diff: content/browser/speech/speech_recognizer_impl_unittest.cc

Issue 1159623009: content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test build fix. Created 5 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <vector> 5 #include <vector>
6 6
7 #include "content/browser/browser_thread_impl.h" 7 #include "content/browser/browser_thread_impl.h"
8 #include "content/browser/speech/google_one_shot_remote_engine.h" 8 #include "content/browser/speech/google_one_shot_remote_engine.h"
9 #include "content/browser/speech/speech_recognizer_impl.h" 9 #include "content/browser/speech/speech_recognizer_impl.h"
10 #include "content/public/browser/speech_recognition_event_listener.h" 10 #include "content/public/browser/speech_recognition_event_listener.h"
11 #include "media/audio/audio_manager_base.h" 11 #include "media/audio/audio_manager_base.h"
12 #include "media/audio/fake_audio_input_stream.h" 12 #include "media/audio/fake_audio_input_stream.h"
13 #include "media/audio/fake_audio_output_stream.h" 13 #include "media/audio/fake_audio_output_stream.h"
14 #include "media/audio/mock_audio_manager.h" 14 #include "media/audio/mock_audio_manager.h"
15 #include "media/audio/test_audio_input_controller_factory.h" 15 #include "media/audio/test_audio_input_controller_factory.h"
16 #include "media/base/audio_bus.h" 16 #include "media/base/audio_bus.h"
17 #include "net/base/net_errors.h" 17 #include "net/base/net_errors.h"
18 #include "net/url_request/test_url_fetcher_factory.h" 18 #include "net/url_request/test_url_fetcher_factory.h"
19 #include "net/url_request/url_request_status.h" 19 #include "net/url_request/url_request_status.h"
20 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
21 21
22 using base::MessageLoopProxy;
23 using media::AudioInputController; 22 using media::AudioInputController;
24 using media::AudioInputStream; 23 using media::AudioInputStream;
25 using media::AudioManager; 24 using media::AudioManager;
26 using media::AudioOutputStream; 25 using media::AudioOutputStream;
27 using media::AudioParameters; 26 using media::AudioParameters;
28 using media::TestAudioInputController; 27 using media::TestAudioInputController;
29 using media::TestAudioInputControllerFactory; 28 using media::TestAudioInputControllerFactory;
30 29
31 namespace content { 30 namespace content {
32 31
(...skipping 18 matching lines...) Expand all
51 config.audio_num_bits_per_sample = 50 config.audio_num_bits_per_sample =
52 SpeechRecognizerImpl::kNumBitsPerAudioSample; 51 SpeechRecognizerImpl::kNumBitsPerAudioSample;
53 config.audio_sample_rate = SpeechRecognizerImpl::kAudioSampleRate; 52 config.audio_sample_rate = SpeechRecognizerImpl::kAudioSampleRate;
54 config.filter_profanities = false; 53 config.filter_profanities = false;
55 sr_engine->SetConfig(config); 54 sr_engine->SetConfig(config);
56 55
57 const int kTestingSessionId = 1; 56 const int kTestingSessionId = 1;
58 recognizer_ = new SpeechRecognizerImpl( 57 recognizer_ = new SpeechRecognizerImpl(
59 this, kTestingSessionId, false, false, sr_engine); 58 this, kTestingSessionId, false, false, sr_engine);
60 audio_manager_.reset(new media::MockAudioManager( 59 audio_manager_.reset(new media::MockAudioManager(
61 base::MessageLoop::current()->message_loop_proxy().get())); 60 base::MessageLoop::current()->task_runner().get()));
62 recognizer_->SetAudioManagerForTesting(audio_manager_.get()); 61 recognizer_->SetAudioManagerForTesting(audio_manager_.get());
63 62
64 int audio_packet_length_bytes = 63 int audio_packet_length_bytes =
65 (SpeechRecognizerImpl::kAudioSampleRate * 64 (SpeechRecognizerImpl::kAudioSampleRate *
66 GoogleOneShotRemoteEngine::kAudioPacketIntervalMs * 65 GoogleOneShotRemoteEngine::kAudioPacketIntervalMs *
67 ChannelLayoutToChannelCount(SpeechRecognizerImpl::kChannelLayout) * 66 ChannelLayoutToChannelCount(SpeechRecognizerImpl::kChannelLayout) *
68 SpeechRecognizerImpl::kNumBitsPerAudioSample) / (8 * 1000); 67 SpeechRecognizerImpl::kNumBitsPerAudioSample) / (8 * 1000);
69 audio_packet_.resize(audio_packet_length_bytes); 68 audio_packet_.resize(audio_packet_length_bytes);
70 69
71 const int channels = 70 const int channels =
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 492
494 EXPECT_EQ(SPEECH_RECOGNITION_ERROR_NONE, error_); 493 EXPECT_EQ(SPEECH_RECOGNITION_ERROR_NONE, error_);
495 EXPECT_FALSE(audio_ended_); 494 EXPECT_FALSE(audio_ended_);
496 EXPECT_FALSE(recognition_ended_); 495 EXPECT_FALSE(recognition_ended_);
497 recognizer_->AbortRecognition(); 496 recognizer_->AbortRecognition();
498 base::MessageLoop::current()->RunUntilIdle(); 497 base::MessageLoop::current()->RunUntilIdle();
499 CheckFinalEventsConsistency(); 498 CheckFinalEventsConsistency();
500 } 499 }
501 500
502 } // namespace content 501 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/speech/speech_recognition_manager_impl.cc ('k') | content/browser/storage_partition_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698