Index: content/renderer/media/media_stream_dispatcher_unittest.cc |
diff --git a/content/renderer/media/media_stream_dispatcher_unittest.cc b/content/renderer/media/media_stream_dispatcher_unittest.cc |
index 6bf3454beabc6ae2b1a6fd1879eb457666d58347..bc149722a211b15a99b5e8806e577e3e119cda22 100644 |
--- a/content/renderer/media/media_stream_dispatcher_unittest.cc |
+++ b/content/renderer/media/media_stream_dispatcher_unittest.cc |
@@ -23,7 +23,8 @@ const int kRequestId3 = 30; |
const int kRequestId4 = 40; |
class MockMediaStreamDispatcherEventHandler |
- : public MediaStreamDispatcherEventHandler { |
+ : public MediaStreamDispatcherEventHandler, |
+ public base::SupportsWeakPtr<MockMediaStreamDispatcherEventHandler> { |
public: |
MockMediaStreamDispatcherEventHandler() |
: request_id_(-1), |
@@ -94,12 +95,12 @@ TEST(MediaStreamDispatcherTest, BasicStream) { |
std::string security_origin; |
int ipc_request_id1 = dispatcher->next_ipc_id_; |
- dispatcher->GenerateStream(kRequestId1, handler.get(), components, |
- security_origin); |
+ dispatcher->GenerateStream(kRequestId1, handler.get()->AsWeakPtr(), |
+ components, security_origin); |
int ipc_request_id2 = dispatcher->next_ipc_id_; |
EXPECT_NE(ipc_request_id1, ipc_request_id2); |
- dispatcher->GenerateStream(kRequestId2, handler.get(), components, |
- security_origin); |
+ dispatcher->GenerateStream(kRequestId2, handler.get()->AsWeakPtr(), |
+ components, security_origin); |
EXPECT_EQ(dispatcher->requests_.size(), size_t(2)); |
media_stream::StreamDeviceInfoArray audio_device_array(1); |
@@ -168,12 +169,12 @@ TEST(MediaStreamDispatcherTest, BasicVideoDevice) { |
std::string security_origin; |
int ipc_request_id1 = dispatcher->next_ipc_id_; |
- dispatcher->EnumerateDevices(kRequestId1, handler.get(), |
+ dispatcher->EnumerateDevices(kRequestId1, handler.get()->AsWeakPtr(), |
content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE, |
security_origin); |
int ipc_request_id2 = dispatcher->next_ipc_id_; |
EXPECT_NE(ipc_request_id1, ipc_request_id2); |
- dispatcher->EnumerateDevices(kRequestId2, handler.get(), |
+ dispatcher->EnumerateDevices(kRequestId2, handler.get()->AsWeakPtr(), |
content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE, |
security_origin); |
EXPECT_EQ(dispatcher->requests_.size(), size_t(2)); |
@@ -201,13 +202,13 @@ TEST(MediaStreamDispatcherTest, BasicVideoDevice) { |
EXPECT_EQ(dispatcher->label_stream_map_.size(), size_t(0)); |
int ipc_request_id3 = dispatcher->next_ipc_id_; |
- dispatcher->OpenDevice(kRequestId3, handler.get(), |
+ dispatcher->OpenDevice(kRequestId3, handler.get()->AsWeakPtr(), |
video_device_info.device_id, |
content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE, |
security_origin); |
int ipc_request_id4 = dispatcher->next_ipc_id_; |
EXPECT_NE(ipc_request_id3, ipc_request_id4); |
- dispatcher->OpenDevice(kRequestId4, handler.get(), |
+ dispatcher->OpenDevice(kRequestId4, handler.get()->AsWeakPtr(), |
video_device_info.device_id, |
content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE, |
security_origin); |
@@ -258,8 +259,8 @@ TEST(MediaStreamDispatcherTest, TestFailure) { |
// Test failure when creating a stream. |
int ipc_request_id1 = dispatcher->next_ipc_id_; |
- dispatcher->GenerateStream(kRequestId1, handler.get(), components, |
- security_origin); |
+ dispatcher->GenerateStream(kRequestId1, handler.get()->AsWeakPtr(), |
+ components, security_origin); |
dispatcher->OnMessageReceived(MediaStreamMsg_StreamGenerationFailed( |
kRouteId, ipc_request_id1)); |
@@ -269,8 +270,8 @@ TEST(MediaStreamDispatcherTest, TestFailure) { |
// Create a new stream. |
ipc_request_id1 = dispatcher->next_ipc_id_; |
- dispatcher->GenerateStream(kRequestId1, handler.get(), components, |
- security_origin); |
+ dispatcher->GenerateStream(kRequestId1, handler.get()->AsWeakPtr(), |
+ components, security_origin); |
media_stream::StreamDeviceInfoArray audio_device_array(1); |
media_stream::StreamDeviceInfo audio_device_info; |