media/audio/audio_output_proxy_unittest.cc - Issue 16286010: Removed the IsRecordingInProcess check for speech since it is not needed

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

Issue 16286010: Removed the IsRecordingInProcess check for speech since it is not needed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: removed unused error code and relevant resource, cleaned up include Created 7 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 | Annotate | Revision Log

« no previous file with comments | « media/audio/audio_manager_base.cc ('k') | media/audio/cras/cras_input.cc » ('j') | no next file with comments »

OLD	NEW
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 <string>	5 #include <string>

6	6

7 #include "base/message_loop.h"	7 #include "base/message_loop.h"

8 #include "base/message_loop_proxy.h"	8 #include "base/message_loop_proxy.h"

9 #include "media/audio/audio_output_dispatcher_impl.h"	9 #include "media/audio/audio_output_dispatcher_impl.h"

10 #include "media/audio/audio_output_proxy.h"	10 #include "media/audio/audio_output_proxy.h"

(...skipping 87 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
98 MOCK_METHOD2(MakeAudioOutputStream, AudioOutputStream*(	98 MOCK_METHOD2(MakeAudioOutputStream, AudioOutputStream*(

99 const AudioParameters& params, const std::string& input_device_id));	99 const AudioParameters& params, const std::string& input_device_id));

100 MOCK_METHOD2(MakeAudioOutputStreamProxy, AudioOutputStream*(	100 MOCK_METHOD2(MakeAudioOutputStreamProxy, AudioOutputStream*(

101 const AudioParameters& params, const std::string& input_device_id));	101 const AudioParameters& params, const std::string& input_device_id));

102 MOCK_METHOD2(MakeAudioInputStream, AudioInputStream*(	102 MOCK_METHOD2(MakeAudioInputStream, AudioInputStream*(

103 const AudioParameters& params, const std::string& device_id));	103 const AudioParameters& params, const std::string& device_id));

104 MOCK_METHOD0(ShowAudioInputSettings, void());	104 MOCK_METHOD0(ShowAudioInputSettings, void());

105 MOCK_METHOD0(GetMessageLoop, scoped_refptr<base::MessageLoopProxy>());	105 MOCK_METHOD0(GetMessageLoop, scoped_refptr<base::MessageLoopProxy>());

106 MOCK_METHOD1(GetAudioInputDeviceNames, void(	106 MOCK_METHOD1(GetAudioInputDeviceNames, void(

107 media::AudioDeviceNames* device_name));	107 media::AudioDeviceNames* device_name));

108 MOCK_METHOD0(IsRecordingInProcess, bool());

109	108

110 MOCK_METHOD1(MakeLinearOutputStream, AudioOutputStream*(	109 MOCK_METHOD1(MakeLinearOutputStream, AudioOutputStream*(

111 const AudioParameters& params));	110 const AudioParameters& params));

112 MOCK_METHOD2(MakeLowLatencyOutputStream, AudioOutputStream*(	111 MOCK_METHOD2(MakeLowLatencyOutputStream, AudioOutputStream*(

113 const AudioParameters& params, const std::string& input_device_id));	112 const AudioParameters& params, const std::string& input_device_id));

114 MOCK_METHOD2(MakeLinearInputStream, AudioInputStream*(	113 MOCK_METHOD2(MakeLinearInputStream, AudioInputStream*(

115 const AudioParameters& params, const std::string& device_id));	114 const AudioParameters& params, const std::string& device_id));

116 MOCK_METHOD2(MakeLowLatencyInputStream, AudioInputStream*(	115 MOCK_METHOD2(MakeLowLatencyInputStream, AudioInputStream*(

117 const AudioParameters& params, const std::string& device_id));	116 const AudioParameters& params, const std::string& device_id));

118 MOCK_METHOD1(GetPreferredOutputStreamParameters, AudioParameters(	117 MOCK_METHOD1(GetPreferredOutputStreamParameters, AudioParameters(

(...skipping 614 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
733 WaitForCloseTimer(kTestCloseDelayMs);	732 WaitForCloseTimer(kTestCloseDelayMs);

734 EXPECT_TRUE(stream1.stop_called());	733 EXPECT_TRUE(stream1.stop_called());

735 EXPECT_TRUE(stream1.start_called());	734 EXPECT_TRUE(stream1.start_called());

736 EXPECT_TRUE(stream2.stop_called());	735 EXPECT_TRUE(stream2.stop_called());

737 EXPECT_TRUE(stream2.start_called());	736 EXPECT_TRUE(stream2.start_called());

738 EXPECT_FALSE(stream3.stop_called());	737 EXPECT_FALSE(stream3.stop_called());

739 EXPECT_FALSE(stream3.start_called());	738 EXPECT_FALSE(stream3.start_called());

740 }	739 }

741	740

742 } // namespace media	741 } // namespace media

OLD	NEW