Revert 150491 - refactor EnumerateDevices to make it a persistent request.

content/renderer/media/media_stream_dispatcher_unittest.cc

Index: content/renderer/media/media_stream_dispatcher_unittest.cc
===================================================================
--- content/renderer/media/media_stream_dispatcher_unittest.cc	(revision 150592)
+++ content/renderer/media/media_stream_dispatcher_unittest.cc	(working copy)
@@ -22,7 +22,6 @@
 const int kRequestId2 = 20;
 const int kRequestId3 = 30;
 const int kRequestId4 = 40;
-static const char kLabel[] = "test";
 
 class MockMediaStreamDispatcherEventHandler
     : public MediaStreamDispatcherEventHandler,
@@ -89,7 +88,6 @@
 }  // namespace
 
 TEST(MediaStreamDispatcherTest, BasicStream) {
-  scoped_ptr<MessageLoop> message_loop(new MessageLoop());
   scoped_ptr<MediaStreamDispatcher> dispatcher(new MediaStreamDispatcher(NULL));
   scoped_ptr<MockMediaStreamDispatcherEventHandler>
       handler(new MockMediaStreamDispatcherEventHandler);
@@ -165,24 +163,21 @@
 }
 
 TEST(MediaStreamDispatcherTest, BasicVideoDevice) {
-  scoped_ptr<MessageLoop> message_loop(new MessageLoop());
   scoped_ptr<MediaStreamDispatcher> dispatcher(new MediaStreamDispatcher(NULL));
   scoped_ptr<MockMediaStreamDispatcherEventHandler>
-      handler1(new MockMediaStreamDispatcherEventHandler);
-  scoped_ptr<MockMediaStreamDispatcherEventHandler>
-      handler2(new MockMediaStreamDispatcherEventHandler);
+      handler(new MockMediaStreamDispatcherEventHandler);
   GURL security_origin;
 
   int ipc_request_id1 = dispatcher->next_ipc_id_;
-  dispatcher->EnumerateDevices(kRequestId1, handler1.get()->AsWeakPtr(),
+  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, handler2.get()->AsWeakPtr(),
+  dispatcher->EnumerateDevices(kRequestId2, handler.get()->AsWeakPtr(),
                                content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE,
                                security_origin);
-  EXPECT_EQ(dispatcher->video_enumeration_state_.requests.size(), size_t(2));
+  EXPECT_EQ(dispatcher->requests_.size(), size_t(2));
 
   media_stream::StreamDeviceInfoArray video_device_array(1);
   media_stream::StreamDeviceInfo video_device_info;
@@ -193,23 +188,27 @@
   video_device_info.session_id = kVideoSessionId;
   video_device_array[0] = video_device_info;
 
-  // Complete the enumeration request and all requesters should receive reply.
+  // Complete the enumeration of request 1.
   dispatcher->OnMessageReceived(MediaStreamMsg_DevicesEnumerated(
-      kRouteId, ipc_request_id1, kLabel, video_device_array));
-  EXPECT_EQ(handler1->request_id_, kRequestId1);
-  EXPECT_EQ(handler2->request_id_, kRequestId2);
+      kRouteId, ipc_request_id1, video_device_array));
+  EXPECT_EQ(handler->request_id_, kRequestId1);
 
-  EXPECT_EQ(dispatcher->video_enumeration_state_.requests.size(), size_t(2));
+  // Complete the enumeration of request 2.
+  dispatcher->OnMessageReceived(MediaStreamMsg_DevicesEnumerated(
+      kRouteId, ipc_request_id2, video_device_array));
+  EXPECT_EQ(handler->request_id_, kRequestId2);
+
+  EXPECT_EQ(dispatcher->requests_.size(), size_t(0));
   EXPECT_EQ(dispatcher->label_stream_map_.size(), size_t(0));
 
   int ipc_request_id3 = dispatcher->next_ipc_id_;
-  dispatcher->OpenDevice(kRequestId3, handler1.get()->AsWeakPtr(),
+  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, handler1.get()->AsWeakPtr(),
+  dispatcher->OpenDevice(kRequestId4, handler.get()->AsWeakPtr(),
                          video_device_info.device_id,
                          content::MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE,
                          security_origin);
@@ -219,13 +218,13 @@
   std::string stream_label1 = std::string("stream1");
   dispatcher->OnMessageReceived(MediaStreamMsg_DeviceOpened(
       kRouteId, ipc_request_id3, stream_label1, video_device_info));
-  EXPECT_EQ(handler1->request_id_, kRequestId3);
+  EXPECT_EQ(handler->request_id_, kRequestId3);
 
   // Complete the OpenDevice of request 2.
   std::string stream_label2 = std::string("stream2");
   dispatcher->OnMessageReceived(MediaStreamMsg_DeviceOpened(
       kRouteId, ipc_request_id4, stream_label2, video_device_info));
-  EXPECT_EQ(handler1->request_id_, kRequestId4);
+  EXPECT_EQ(handler->request_id_, kRequestId4);
 
   EXPECT_EQ(dispatcher->requests_.size(), size_t(0));
   EXPECT_EQ(dispatcher->label_stream_map_.size(), size_t(2));
@@ -251,7 +250,6 @@
 }
 
 TEST(MediaStreamDispatcherTest, TestFailure) {
-  scoped_ptr<MessageLoop> message_loop(new MessageLoop());
   scoped_ptr<MediaStreamDispatcher> dispatcher(new MediaStreamDispatcher(NULL));
   scoped_ptr<MockMediaStreamDispatcherEventHandler>
       handler(new MockMediaStreamDispatcherEventHandler);
@@ -318,7 +316,6 @@
 }
 
 TEST(MediaStreamDispatcherTest, CancelGenerateStream) {
-  scoped_ptr<MessageLoop> message_loop(new MessageLoop());
   scoped_ptr<MediaStreamDispatcher> dispatcher(new MediaStreamDispatcher(NULL));
   scoped_ptr<MockMediaStreamDispatcherEventHandler>
       handler(new MockMediaStreamDispatcherEventHandler);