content/browser/renderer_host/media/audio_input_device_manager_unittest.cc - Issue 11339014: Move content\browser\renderer_host\media to content namespace.

Unified Diff: content/browser/renderer_host/media/audio_input_device_manager_unittest.cc

Issue 11339014: Move content\browser\renderer_host\media to content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/media/audio_input_device_manager_event_handler.h ('k') | content/browser/renderer_host/media/audio_input_renderer_host.h » ('j') | content/browser/renderer_host/media/media_stream_dispatcher_host.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/audio_input_device_manager_unittest.cc

===================================================================

--- content/browser/renderer_host/media/audio_input_device_manager_unittest.cc (revision 164646)

+++ content/browser/renderer_host/media/audio_input_device_manager_unittest.cc (working copy)

@@ -16,14 +16,11 @@

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

-using content::BrowserThread;

-using content::BrowserThreadImpl;

-using media_stream::AudioInputDeviceManager;

using testing::_;

using testing::InSequence;

using testing::Return;

-namespace media_stream {

+namespace content {

class MockAudioInputDeviceManagerListener

: public MediaStreamProviderListener {

@@ -38,7 +35,7 @@

virtual void DevicesEnumerated(MediaStreamType service_type,

const StreamDeviceInfoArray& devices) {

- if (service_type != content::MEDIA_DEVICE_AUDIO_CAPTURE)

+ if (service_type != MEDIA_DEVICE_AUDIO_CAPTURE)

return;

devices_ = devices;

@@ -145,10 +142,10 @@

// Expected mock call with expected return value.

EXPECT_CALL(*audio_input_listener_,

- Opened(content::MEDIA_DEVICE_AUDIO_CAPTURE, session_id))

+ Opened(MEDIA_DEVICE_AUDIO_CAPTURE, session_id))

.Times(1);

EXPECT_CALL(*audio_input_listener_,

- Closed(content::MEDIA_DEVICE_AUDIO_CAPTURE, session_id))

+ Closed(MEDIA_DEVICE_AUDIO_CAPTURE, session_id))

.Times(1);

// Waits for the callback.

@@ -178,7 +175,7 @@

// Expected mock call with expected returned value.

EXPECT_CALL(*audio_input_listener_,

- Opened(content::MEDIA_DEVICE_AUDIO_CAPTURE, session_id[index]))

+ Opened(MEDIA_DEVICE_AUDIO_CAPTURE, session_id[index]))

.Times(1);

// Waits for the callback.

@@ -196,7 +193,7 @@

// Closes the devices.

manager_->Close(session_id[i]);

EXPECT_CALL(*audio_input_listener_,

- Closed(content::MEDIA_DEVICE_AUDIO_CAPTURE, session_id[i]))

+ Closed(MEDIA_DEVICE_AUDIO_CAPTURE, session_id[i]))

.Times(1);

// Waits for the callback.

@@ -210,14 +207,14 @@

return;

InSequence s;

- MediaStreamType stream_type = content::MEDIA_DEVICE_AUDIO_CAPTURE;

+ MediaStreamType stream_type = MEDIA_DEVICE_AUDIO_CAPTURE;

std::string device_name("device_doesnt_exist");

std::string device_id("id_doesnt_exist");

StreamDeviceInfo dummy_device(stream_type, device_name, device_id, false);

int session_id = manager_->Open(dummy_device);

EXPECT_CALL(*audio_input_listener_,

- Opened(content::MEDIA_DEVICE_AUDIO_CAPTURE, session_id))

+ Opened(MEDIA_DEVICE_AUDIO_CAPTURE, session_id))

.Times(1);

// Waits for the callback.

@@ -244,16 +241,16 @@

// Expected mock calls with expected returned values.

EXPECT_NE(first_session_id, second_session_id);

EXPECT_CALL(*audio_input_listener_,

- Opened(content::MEDIA_DEVICE_AUDIO_CAPTURE, first_session_id))

+ Opened(MEDIA_DEVICE_AUDIO_CAPTURE, first_session_id))

.Times(1);

EXPECT_CALL(*audio_input_listener_,

- Opened(content::MEDIA_DEVICE_AUDIO_CAPTURE, second_session_id))

+ Opened(MEDIA_DEVICE_AUDIO_CAPTURE, second_session_id))

.Times(1);

EXPECT_CALL(*audio_input_listener_,

- Closed(content::MEDIA_DEVICE_AUDIO_CAPTURE, first_session_id))

+ Closed(MEDIA_DEVICE_AUDIO_CAPTURE, first_session_id))

.Times(1);

EXPECT_CALL(*audio_input_listener_,

- Closed(content::MEDIA_DEVICE_AUDIO_CAPTURE, second_session_id))

+ Closed(MEDIA_DEVICE_AUDIO_CAPTURE, second_session_id))

.Times(1);

// Waits for the callback.

@@ -287,7 +284,7 @@

// stopped the device before calling close.

session_id[index] = manager_->Open(*iter);

EXPECT_CALL(*audio_input_listener_,

- Opened(content::MEDIA_DEVICE_AUDIO_CAPTURE, session_id[index]))

+ Opened(MEDIA_DEVICE_AUDIO_CAPTURE, session_id[index]))

.Times(1);

message_loop_->RunAllPending();

@@ -300,7 +297,7 @@

manager_->Stop(session_id[index]);

manager_->Close(session_id[index]);

EXPECT_CALL(*audio_input_listener_,

- Closed(content::MEDIA_DEVICE_AUDIO_CAPTURE, session_id[index]))

+ Closed(MEDIA_DEVICE_AUDIO_CAPTURE, session_id[index]))

.Times(1);

message_loop_->RunAllPending();

}

@@ -332,7 +329,7 @@

// Calls Open()/Start()/Close() for each device.

session_id[index] = manager_->Open(*iter);

EXPECT_CALL(*audio_input_listener_,

- Opened(content::MEDIA_DEVICE_AUDIO_CAPTURE, session_id[index]))

+ Opened(MEDIA_DEVICE_AUDIO_CAPTURE, session_id[index]))

.Times(1);

message_loop_->RunAllPending();

@@ -349,7 +346,7 @@

DeviceStopped(session_id[index]))

.Times(1);

EXPECT_CALL(*audio_input_listener_,

- Closed(content::MEDIA_DEVICE_AUDIO_CAPTURE, session_id[index]))

+ Closed(MEDIA_DEVICE_AUDIO_CAPTURE, session_id[index]))

.Times(1);

message_loop_->RunAllPending();

}

@@ -379,10 +376,10 @@

int second_session_id = manager_->Open(*iter);

EXPECT_NE(first_session_id, second_session_id);

EXPECT_CALL(*audio_input_listener_,

- Opened(content::MEDIA_DEVICE_AUDIO_CAPTURE, first_session_id))

+ Opened(MEDIA_DEVICE_AUDIO_CAPTURE, first_session_id))

.Times(1);

EXPECT_CALL(*audio_input_listener_,

- Opened(content::MEDIA_DEVICE_AUDIO_CAPTURE, second_session_id))

+ Opened(MEDIA_DEVICE_AUDIO_CAPTURE, second_session_id))

.Times(1);

message_loop_->RunAllPending();

@@ -404,10 +401,10 @@

manager_->Close(first_session_id);

manager_->Close(second_session_id);

EXPECT_CALL(*audio_input_listener_,

- Closed(content::MEDIA_DEVICE_AUDIO_CAPTURE, first_session_id))

+ Closed(MEDIA_DEVICE_AUDIO_CAPTURE, first_session_id))

.Times(1);

EXPECT_CALL(*audio_input_listener_,

- Closed(content::MEDIA_DEVICE_AUDIO_CAPTURE, second_session_id))

+ Closed(MEDIA_DEVICE_AUDIO_CAPTURE, second_session_id))

.Times(1);

message_loop_->RunAllPending();

}

@@ -428,7 +425,7 @@

audio_input_listener_->devices_.begin();

int session_id = manager_->Open(*iter);

EXPECT_CALL(*audio_input_listener_,

- Opened(content::MEDIA_DEVICE_AUDIO_CAPTURE, session_id))

+ Opened(MEDIA_DEVICE_AUDIO_CAPTURE, session_id))

.Times(1);

message_loop_->RunAllPending();

@@ -443,7 +440,7 @@

manager_->Close(session_id);

EXPECT_CALL(*audio_input_listener_,

- Closed(content::MEDIA_DEVICE_AUDIO_CAPTURE, session_id))

+ Closed(MEDIA_DEVICE_AUDIO_CAPTURE, session_id))

.Times(1);

message_loop_->RunAllPending();

}

@@ -465,7 +462,7 @@

audio_input_listener_->devices_.begin();

int session_id = manager_->Open(*iter);

EXPECT_CALL(*audio_input_listener_,

- Opened(content::MEDIA_DEVICE_AUDIO_CAPTURE, session_id))

+ Opened(MEDIA_DEVICE_AUDIO_CAPTURE, session_id))

.Times(1);

message_loop_->RunAllPending();

@@ -486,9 +483,9 @@

manager_->Stop(session_id);

manager_->Close(session_id);

EXPECT_CALL(*audio_input_listener_,

- Closed(content::MEDIA_DEVICE_AUDIO_CAPTURE, session_id))

+ Closed(MEDIA_DEVICE_AUDIO_CAPTURE, session_id))

.Times(1);

message_loop_->RunAllPending();

}

-} // namespace media_stream

+} // namespace content