Commit 207179a2 authored by fischman@chromium.org's avatar fischman@chromium.org

Dead code elimination: scythe.chrome_functions:segment.path %media% edition, round 2.


Review URL: https://chromiumcodereview.appspot.com/10826174

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150302 0039d316-1c4b-4281-b951-d872f2087c98
parent 80d3f50e
......@@ -16,14 +16,10 @@ MockMediaStreamDispatcher::~MockMediaStreamDispatcher() {}
void MockMediaStreamDispatcher::GenerateStream(
int request_id,
const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
const base::WeakPtr<MediaStreamDispatcherEventHandler>&,
media_stream::StreamOptions components,
const GURL& security_origin) {
const GURL&) {
request_id_ = request_id;
event_handler_ = event_handler;
components_ = media_stream::StreamOptions(components.audio,
components.video);
security_origin_ = security_origin;
stream_label_ = StringPrintf("%s%d","local_stream",request_id);
audio_array_.clear();
......
......@@ -18,20 +18,15 @@ class MockMediaStreamDispatcher : public MediaStreamDispatcher {
virtual void GenerateStream(
int request_id,
const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
const base::WeakPtr<MediaStreamDispatcherEventHandler>&,
media_stream::StreamOptions components,
const GURL& security_origin) OVERRIDE;
const GURL&) OVERRIDE;
virtual void StopStream(const std::string& label) OVERRIDE;
virtual bool IsStream(const std::string& label) OVERRIDE;
virtual int video_session_id(const std::string& label, int index) OVERRIDE;
virtual int audio_session_id(const std::string& label, int index) OVERRIDE;
int request_id() const { return request_id_; }
MediaStreamDispatcherEventHandler* event_handler() const {
return event_handler_;
}
const media_stream::StreamOptions& components() const { return components_; }
const GURL& security_origin() const { return security_origin_; }
int stop_stream_counter() const { return stop_stream_counter_; }
const std::string& stream_label() const { return stream_label_;}
media_stream::StreamDeviceInfoArray audio_array() const {
......@@ -44,8 +39,6 @@ class MockMediaStreamDispatcher : public MediaStreamDispatcher {
private:
int request_id_;
base::WeakPtr<MediaStreamDispatcherEventHandler> event_handler_;
media_stream::StreamOptions components_;
GURL security_origin_;
int stop_stream_counter_;
std::string stream_label_;
......
......@@ -16,8 +16,7 @@ MockWebPeerConnectionHandlerClient::~MockWebPeerConnectionHandlerClient() {}
void MockWebPeerConnectionHandlerClient::didCompleteICEProcessing() {}
void MockWebPeerConnectionHandlerClient::didGenerateSDP(const WebString& sdp) {
sdp_ = UTF16ToUTF8(sdp);
void MockWebPeerConnectionHandlerClient::didGenerateSDP(const WebString&) {
}
void MockWebPeerConnectionHandlerClient::didReceiveDataStreamMessage(
......
......@@ -20,7 +20,7 @@ class MockWebPeerConnectionHandlerClient
// WebPeerConnectionHandlerClient implementation.
virtual void didCompleteICEProcessing();
virtual void didGenerateSDP(const WebString& sdp);
virtual void didGenerateSDP(const WebString&);
virtual void didReceiveDataStreamMessage(const char* data, size_t length);
virtual void didAddRemoteStream(
const WebMediaStreamDescriptor& stream_descriptor);
......@@ -28,11 +28,9 @@ class MockWebPeerConnectionHandlerClient
const WebMediaStreamDescriptor& stream_descriptor);
const std::string& stream_label() { return stream_label_; }
const std::string& sdp() const { return sdp_; }
private:
std::string stream_label_;
std::string sdp_;
DISALLOW_COPY_AND_ASSIGN(MockWebPeerConnectionHandlerClient);
};
......
......@@ -36,14 +36,6 @@ bool AudioManagerAndroid::HasAudioInputDevices() {
return false;
}
void AudioManagerAndroid::MuteAll() {
NOTIMPLEMENTED();
}
void AudioManagerAndroid::UnMuteAll() {
NOTIMPLEMENTED();
}
AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream(
const AudioParameters& params) {
DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
......
......@@ -17,8 +17,6 @@ class AudioManagerAndroid : public AudioManagerBase {
// Implementation of AudioManager.
virtual bool HasAudioOutputDevices() OVERRIDE;
virtual bool HasAudioInputDevices() OVERRIDE;
virtual void MuteAll() OVERRIDE;
virtual void UnMuteAll() OVERRIDE;
// Implementation of AudioManagerBase.
virtual AudioOutputStream* MakeLinearOutputStream(
......
......@@ -106,11 +106,6 @@ class MEDIA_EXPORT AudioManager {
virtual AudioInputStream* MakeAudioInputStream(
const AudioParameters& params, const std::string& device_id) = 0;
// Muting continues playback but effectively the volume is set to zero.
// Un-muting returns the volume to the previous level.
virtual void MuteAll() = 0;
virtual void UnMuteAll() = 0;
// Used to determine if something else is currently making use of audio input.
virtual bool IsRecordingInProcess() = 0;
......
......@@ -54,7 +54,6 @@ class MockAudioManager : public AudioManager {
MockAudioManager() {}
MOCK_METHOD0(Init, void());
MOCK_METHOD0(Cleanup, void());
MOCK_METHOD0(HasAudioOutputDevices, bool());
MOCK_METHOD0(HasAudioInputDevices, bool());
MOCK_METHOD0(GetAudioInputDeviceModel, string16());
......@@ -64,8 +63,6 @@ class MockAudioManager : public AudioManager {
const AudioParameters& params));
MOCK_METHOD2(MakeAudioInputStream, AudioInputStream*(
const AudioParameters& params, const std::string& device_id));
MOCK_METHOD0(MuteAll, void());
MOCK_METHOD0(UnMuteAll, void());
MOCK_METHOD0(CanShowAudioInputSettings, bool());
MOCK_METHOD0(ShowAudioInputSettings, void());
MOCK_METHOD0(GetMessageLoop, scoped_refptr<base::MessageLoopProxy>());
......
......@@ -34,7 +34,6 @@ class MEDIA_EXPORT FakeAudioOutputStream : public AudioOutputStream {
virtual void Close() OVERRIDE;
uint8* buffer() { return buffer_.get(); }
double volume() { return volume_; }
private:
explicit FakeAudioOutputStream(AudioManagerBase* manager,
......
......@@ -78,14 +78,10 @@ class MockAudioManagerLinux : public AudioManagerLinux {
MOCK_METHOD0(Init, void());
MOCK_METHOD0(HasAudioOutputDevices, bool());
MOCK_METHOD0(HasAudioInputDevices, bool());
MOCK_METHOD0(MuteAll, void());
MOCK_METHOD0(UnMuteAll, void());
MOCK_METHOD1(MakeLinearOutputStream, AudioOutputStream*(
const AudioParameters& params));
MOCK_METHOD1(MakeLowLatencyOutputStream, AudioOutputStream*(
const AudioParameters& params));
MOCK_METHOD2(MakeLinearOutputStream, AudioInputStream*(
const AudioParameters& params, const std::string& device_id));
MOCK_METHOD2(MakeLowLatencyInputStream, AudioInputStream*(
const AudioParameters& params, const std::string& device_id));
......
......@@ -62,14 +62,6 @@ void AudioManagerLinux::Init() {
wrapper_.reset(new AlsaWrapper());
}
void AudioManagerLinux::MuteAll() {
NOTIMPLEMENTED();
}
void AudioManagerLinux::UnMuteAll() {
NOTIMPLEMENTED();
}
bool AudioManagerLinux::CanShowAudioInputSettings() {
scoped_ptr<base::Environment> env(base::Environment::Create());
......
......@@ -29,8 +29,6 @@ class MEDIA_EXPORT AudioManagerLinux : public AudioManagerBase {
virtual void ShowAudioInputSettings() OVERRIDE;
virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names)
OVERRIDE;
virtual void MuteAll() OVERRIDE;
virtual void UnMuteAll() OVERRIDE;
// Implementation of AudioManagerBase.
virtual AudioOutputStream* MakeLinearOutputStream(
......
......@@ -29,8 +29,6 @@ class MockAudioManagerLinux : public AudioManagerLinux {
MOCK_METHOD0(Init, void());
MOCK_METHOD0(HasAudioOutputDevices, bool());
MOCK_METHOD0(HasAudioInputDevices, bool());
MOCK_METHOD0(MuteAll, void());
MOCK_METHOD0(UnMuteAll, void());
MOCK_METHOD1(MakeLinearOutputStream, AudioOutputStream*(
const AudioParameters& params));
MOCK_METHOD1(MakeLowLatencyOutputStream, AudioOutputStream*(
......
......@@ -255,14 +255,6 @@ void AudioManagerMac::GetAudioInputDeviceNames(
}
}
void AudioManagerMac::MuteAll() {
// TODO(cpu): implement.
}
void AudioManagerMac::UnMuteAll() {
// TODO(cpu): implement.
}
AudioOutputStream* AudioManagerMac::MakeLinearOutputStream(
const AudioParameters& params) {
DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
......
......@@ -23,8 +23,6 @@ class MEDIA_EXPORT AudioManagerMac : public AudioManagerBase {
virtual bool HasAudioInputDevices() OVERRIDE;
virtual void GetAudioInputDeviceNames(media::AudioDeviceNames* device_names)
OVERRIDE;
virtual void MuteAll() OVERRIDE;
virtual void UnMuteAll() OVERRIDE;
// Implementation of AudioManagerBase.
virtual AudioOutputStream* MakeLinearOutputStream(
......
......@@ -58,12 +58,6 @@ media::AudioInputStream* MockAudioManager::MakeAudioInputStream(
return NULL;
}
void MockAudioManager::MuteAll() {
}
void MockAudioManager::UnMuteAll() {
}
bool MockAudioManager::IsRecordingInProcess() {
return false;
}
......
......@@ -46,10 +46,6 @@ class MockAudioManager : public media::AudioManager {
const media::AudioParameters& params,
const std::string& device_id) OVERRIDE;
virtual void MuteAll() OVERRIDE;
virtual void UnMuteAll() OVERRIDE;
virtual bool IsRecordingInProcess() OVERRIDE;
virtual scoped_refptr<base::MessageLoopProxy> GetMessageLoop() OVERRIDE;
......
......@@ -55,14 +55,6 @@ void AudioManagerOpenBSD::Init() {
AudioManagerBase::Init();
}
void AudioManagerOpenBSD::MuteAll() {
NOTIMPLEMENTED();
}
void AudioManagerOpenBSD::UnMuteAll() {
NOTIMPLEMENTED();
}
AudioOutputStream* AudioManagerOpenBSD::MakeLinearOutputStream(
const AudioParameters& params) {
DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format);
......
......@@ -22,8 +22,6 @@ class MEDIA_EXPORT AudioManagerOpenBSD : public AudioManagerBase {
// Implementation of AudioManager.
virtual bool HasAudioOutputDevices() OVERRIDE;
virtual bool HasAudioInputDevices() OVERRIDE;
virtual void MuteAll() OVERRIDE;
virtual void UnMuteAll() OVERRIDE;
// Implementation of AudioManagerBase.
virtual AudioOutputStream* MakeLinearOutputStream(
......
......@@ -61,10 +61,6 @@ class TestAudioInputController : public AudioInputController {
// Returns the event handler installed on the AudioInputController.
EventHandler* event_handler() const { return event_handler_; }
// Returns the AudioParameters passed by the requester upon creation through
// AudioManager::Create(...).
const AudioParameters& audio_parameters() const { return audio_parameters_; }
// Notifies the TestAudioControllerOpened() event to the delegate (if any).
virtual void Record() OVERRIDE;
......
......@@ -121,12 +121,6 @@ bool AudioManagerWin::HasAudioInputDevices() {
return (::waveInGetNumDevs() != 0);
}
void AudioManagerWin::MuteAll() {
}
void AudioManagerWin::UnMuteAll() {
}
string16 AudioManagerWin::GetAudioInputDeviceModel() {
// Get the default audio capture device and its device interface name.
DWORD device_id = 0;
......
......@@ -24,8 +24,6 @@ class MEDIA_EXPORT AudioManagerWin : public AudioManagerBase {
// Implementation of AudioManager.
virtual bool HasAudioOutputDevices() OVERRIDE;
virtual bool HasAudioInputDevices() OVERRIDE;
virtual void MuteAll() OVERRIDE;
virtual void UnMuteAll() OVERRIDE;
virtual string16 GetAudioInputDeviceModel() OVERRIDE;
virtual bool CanShowAudioInputSettings() OVERRIDE;
virtual void ShowAudioInputSettings() OVERRIDE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment