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

Side by Side Diff: content/browser/renderer_host/media/media_stream_manager_unittest.cc

Issue 1806313003: Pass task runners to AudioManager constructor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: speculative hack to fix test timeouts Created 4 years, 8 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 ResourceContext::SaltCallback GetMockSaltCallback() { 65 ResourceContext::SaltCallback GetMockSaltCallback() {
66 return base::Bind(&ReturnMockSalt); 66 return base::Bind(&ReturnMockSalt);
67 } 67 }
68 68
69 // This class mocks the audio manager and overrides some methods to ensure that 69 // This class mocks the audio manager and overrides some methods to ensure that
70 // we can run our tests on the buildbots. 70 // we can run our tests on the buildbots.
71 class MockAudioManager : public AudioManagerPlatform { 71 class MockAudioManager : public AudioManagerPlatform {
72 public: 72 public:
73 MockAudioManager() 73 MockAudioManager()
74 : AudioManagerPlatform(&fake_audio_log_factory_), 74 : AudioManagerPlatform(base::ThreadTaskRunnerHandle::Get(),
75 base::ThreadTaskRunnerHandle::Get(),
76 &fake_audio_log_factory_),
75 num_output_devices_(2) {} 77 num_output_devices_(2) {}
76 ~MockAudioManager() override {} 78 ~MockAudioManager() override {}
77 79
78 void GetAudioInputDeviceNames( 80 void GetAudioInputDeviceNames(
79 media::AudioDeviceNames* device_names) override { 81 media::AudioDeviceNames* device_names) override {
80 DCHECK(device_names->empty()); 82 DCHECK(device_names->empty());
81 if (HasAudioInputDevices()) { 83 if (HasAudioInputDevices()) {
82 AudioManagerBase::GetAudioInputDeviceNames(device_names); 84 AudioManagerBase::GetAudioInputDeviceNames(device_names);
83 } else { 85 } else {
84 device_names->push_back(media::AudioDeviceName("fake_device_name", 86 device_names->push_back(media::AudioDeviceName("fake_device_name",
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 const GURL security_origin; 205 const GURL security_origin;
204 MediaStreamManager::MediaRequestResponseCallback callback = 206 MediaStreamManager::MediaRequestResponseCallback callback =
205 base::Bind(&MediaStreamManagerTest::ResponseCallback, 207 base::Bind(&MediaStreamManagerTest::ResponseCallback,
206 base::Unretained(this), index); 208 base::Unretained(this), index);
207 StreamControls controls(true, true); 209 StreamControls controls(true, true);
208 return media_stream_manager_->MakeMediaAccessRequest( 210 return media_stream_manager_->MakeMediaAccessRequest(
209 render_process_id, render_frame_id, page_request_id, controls, 211 render_process_id, render_frame_id, page_request_id, controls,
210 security_origin, callback); 212 security_origin, callback);
211 } 213 }
212 214
213 scoped_ptr<MockAudioManager> audio_manager_; 215 scoped_ptr<MockAudioManager, media::AudioManagerDeleter> audio_manager_;
214 scoped_ptr<MediaStreamManager> media_stream_manager_; 216 scoped_ptr<MediaStreamManager> media_stream_manager_;
215 content::TestBrowserThreadBundle thread_bundle_; 217 content::TestBrowserThreadBundle thread_bundle_;
216 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 218 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
217 base::RunLoop run_loop_; 219 base::RunLoop run_loop_;
218 220
219 private: 221 private:
220 DISALLOW_COPY_AND_ASSIGN(MediaStreamManagerTest); 222 DISALLOW_COPY_AND_ASSIGN(MediaStreamManagerTest);
221 }; 223 };
222 224
223 TEST_F(MediaStreamManagerTest, MakeMediaAccessRequest) { 225 TEST_F(MediaStreamManagerTest, MakeMediaAccessRequest) {
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 std::string label = media_stream_manager_->EnumerateDevices( 324 std::string label = media_stream_manager_->EnumerateDevices(
323 &requester, render_process_id, render_frame_id, GetMockSaltCallback(), 325 &requester, render_process_id, render_frame_id, GetMockSaltCallback(),
324 page_request_id, MEDIA_DEVICE_AUDIO_OUTPUT, security_origin); 326 page_request_id, MEDIA_DEVICE_AUDIO_OUTPUT, security_origin);
325 run_loop.Run(); 327 run_loop.Run();
326 // CancelRequest is necessary for enumeration requests. 328 // CancelRequest is necessary for enumeration requests.
327 media_stream_manager_->CancelRequest(label); 329 media_stream_manager_->CancelRequest(label);
328 } 330 }
329 } 331 }
330 332
331 } // namespace content 333 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698