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

Side by Side Diff: media/audio/mock_audio_manager.cc

Issue 88283002: Reland review 34393006: Refactor MediaStreamManager to not output real device id. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « media/audio/mock_audio_manager.h ('k') | media/video/capture/fake_video_capture_device.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "media/audio/mock_audio_manager.h" 5 #include "media/audio/mock_audio_manager.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/message_loop/message_loop_proxy.h" 8 #include "base/message_loop/message_loop_proxy.h"
9 #include "media/audio/audio_parameters.h" 9 #include "media/audio/audio_parameters.h"
10 10
(...skipping 16 matching lines...) Expand all
27 27
28 string16 MockAudioManager::GetAudioInputDeviceModel() { 28 string16 MockAudioManager::GetAudioInputDeviceModel() {
29 return string16(); 29 return string16();
30 } 30 }
31 31
32 void MockAudioManager::ShowAudioInputSettings() { 32 void MockAudioManager::ShowAudioInputSettings() {
33 } 33 }
34 34
35 void MockAudioManager::GetAudioInputDeviceNames( 35 void MockAudioManager::GetAudioInputDeviceNames(
36 AudioDeviceNames* device_names) { 36 AudioDeviceNames* device_names) {
37 DCHECK(device_names->empty());
38 device_names->push_back(media::AudioDeviceName("fake_device_name_1",
39 "fake_device_id_1"));
40 device_names->push_back(media::AudioDeviceName("fake_device_name_2",
41 "fake_device_id_2"));
37 } 42 }
38 43
39 void MockAudioManager::GetAudioOutputDeviceNames( 44 void MockAudioManager::GetAudioOutputDeviceNames(
40 AudioDeviceNames* device_names) { 45 AudioDeviceNames* device_names) {
41 } 46 }
42 47
43 media::AudioOutputStream* MockAudioManager::MakeAudioOutputStream( 48 media::AudioOutputStream* MockAudioManager::MakeAudioOutputStream(
44 const media::AudioParameters& params, 49 const media::AudioParameters& params,
45 const std::string& device_id, 50 const std::string& device_id,
46 const std::string& input_device_id) { 51 const std::string& input_device_id) {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 const std::string& device_id) { 97 const std::string& device_id) {
93 return AudioParameters(); 98 return AudioParameters();
94 } 99 }
95 100
96 std::string MockAudioManager::GetAssociatedOutputDeviceID( 101 std::string MockAudioManager::GetAssociatedOutputDeviceID(
97 const std::string& input_device_id) { 102 const std::string& input_device_id) {
98 return std::string(); 103 return std::string();
99 } 104 }
100 105
101 } // namespace media. 106 } // namespace media.
OLDNEW
« no previous file with comments | « media/audio/mock_audio_manager.h ('k') | media/video/capture/fake_video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698