| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 #include <string.h> | 7 #include <string.h> |
| 8 | 8 |
| 9 #include <list> | 9 #include <list> |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 | 121 |
| 122 void SetUpOnMainThread() override { | 122 void SetUpOnMainThread() override { |
| 123 ASSERT_TRUE(SpeechRecognitionManagerImpl::GetInstance()); | 123 ASSERT_TRUE(SpeechRecognitionManagerImpl::GetInstance()); |
| 124 media::AudioManager::StartHangMonitorIfNeeded( | 124 media::AudioManager::StartHangMonitorIfNeeded( |
| 125 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 125 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
| 126 audio_manager_.reset(new media::MockAudioManager( | 126 audio_manager_.reset(new media::MockAudioManager( |
| 127 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO))); | 127 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO))); |
| 128 audio_manager_->SetInputStreamParameters( | 128 audio_manager_->SetInputStreamParameters( |
| 129 media::AudioParameters::UnavailableDeviceParams()); | 129 media::AudioParameters::UnavailableDeviceParams()); |
| 130 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); | 130 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); |
| 131 SpeechRecognizerImpl::SetAudioSystemForTesting(audio_system_.get()); | 131 SpeechRecognizerImpl::SetAudioEnvironmentForTesting(audio_system_.get(), |
| 132 audio_manager_.get()); |
| 132 } | 133 } |
| 133 | 134 |
| 134 void TearDownOnMainThread() override { | 135 void TearDownOnMainThread() override { |
| 135 SpeechRecognizerImpl::SetAudioSystemForTesting(nullptr); | 136 SpeechRecognizerImpl::SetAudioEnvironmentForTesting(nullptr, nullptr); |
| 136 | 137 |
| 137 // Deleting AudioManager on audio thread, | 138 // Deleting AudioManager on audio thread, |
| 138 audio_system_.reset(); | 139 audio_system_.reset(); |
| 139 audio_manager_.reset(); | 140 audio_manager_.reset(); |
| 140 } | 141 } |
| 141 | 142 |
| 142 void TearDownInProcessBrowserTestFixture() override { | 143 void TearDownInProcessBrowserTestFixture() override { |
| 143 test_audio_input_controller_factory_.set_delegate(nullptr); | 144 test_audio_input_controller_factory_.set_delegate(nullptr); |
| 144 mock_streaming_server_.reset(); | 145 mock_streaming_server_.reset(); |
| 145 } | 146 } |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 | 219 |
| 219 IN_PROC_BROWSER_TEST_F(SpeechRecognitionBrowserTest, OneShotRecognition) { | 220 IN_PROC_BROWSER_TEST_F(SpeechRecognitionBrowserTest, OneShotRecognition) { |
| 220 NavigateToURLBlockUntilNavigationsComplete( | 221 NavigateToURLBlockUntilNavigationsComplete( |
| 221 shell(), GetTestUrlFromFragment("oneshot"), 2); | 222 shell(), GetTestUrlFromFragment("oneshot"), 2); |
| 222 | 223 |
| 223 EXPECT_EQ(kClientDisconnected, streaming_server_state()); | 224 EXPECT_EQ(kClientDisconnected, streaming_server_state()); |
| 224 EXPECT_EQ("goodresult1", GetPageFragment()); | 225 EXPECT_EQ("goodresult1", GetPageFragment()); |
| 225 } | 226 } |
| 226 | 227 |
| 227 } // namespace content | 228 } // namespace content |
| OLD | NEW |