Remove dead code related to media device enumerations and monitoring.

content/renderer/media/media_stream_dispatcher_unittest.cc

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 56d476ec894f8293e633c7c59d51d6b2432eb8c6..4a608f4124b3c6411173e7a71cf86aca81db3865 100644
--- a/content/renderer/media/media_stream_dispatcher_unittest.cc
+++ b/content/renderer/media/media_stream_dispatcher_unittest.cc
@@ -28,8 +28,6 @@ const int kAudioSessionId = 3;
 const int kVideoSessionId = 5;
 const int kRequestId1 = 10;
 const int kRequestId2 = 20;
-const int kRequestId3 = 30;
-const int kRequestId4 = 40;
 
 const MediaStreamType kAudioType = MEDIA_DEVICE_AUDIO_CAPTURE;
 const MediaStreamType kVideoType = MEDIA_DEVICE_VIDEO_CAPTURE;
@@ -38,8 +36,7 @@ class MockMediaStreamDispatcherEventHandler
     : public MediaStreamDispatcherEventHandler,
       public base::SupportsWeakPtr<MockMediaStreamDispatcherEventHandler> {
  public:
-  MockMediaStreamDispatcherEventHandler()
-      : request_id_(-1), did_receive_devices_changed_(false) {}
+  MockMediaStreamDispatcherEventHandler() : request_id_(-1) {}
 
   void OnStreamGenerated(
       int request_id,
@@ -75,11 +72,6 @@ class MockMediaStreamDispatcherEventHandler
     }
   }
 
-  void OnDevicesEnumerated(int request_id,
-                           const StreamDeviceInfoArray& device_array) override {
-    request_id_ = request_id;
-  }
-
   void OnDeviceOpened(int request_id,
                       const std::string& label,
                       const StreamDeviceInfo& video_device) override {
@@ -89,8 +81,6 @@ class MockMediaStreamDispatcherEventHandler
 
   void OnDeviceOpenFailed(int request_id) override { request_id_ = request_id; }
 
-  void OnDevicesChanged() override { did_receive_devices_changed_ = true; }
-
   void ResetStoredParameters() {
     request_id_ = -1;
     label_ = "";
@@ -104,7 +94,6 @@ class MockMediaStreamDispatcherEventHandler
   std::string device_stopped_label_;
   StreamDeviceInfo audio_device_;
   StreamDeviceInfo video_device_;
-  bool did_receive_devices_changed_;
 };
 
 class MediaStreamDispatcherUnderTest : public MediaStreamDispatcher {
@@ -225,19 +214,6 @@ TEST_F(MediaStreamDispatcherTest, BasicVideoDevice) {
       new MockMediaStreamDispatcherEventHandler);
   url::Origin security_origin;
 
-  int ipc_request_id1 = dispatcher->next_ipc_id_;
-  dispatcher->EnumerateDevices(
-      kRequestId1, handler1.get()->AsWeakPtr(),
-      kVideoType,
-      security_origin);
-  int ipc_request_id2 = dispatcher->next_ipc_id_;
-  EXPECT_NE(ipc_request_id1, ipc_request_id2);
-  dispatcher->EnumerateDevices(
-      kRequestId2, handler2.get()->AsWeakPtr(),
-      kVideoType,
-      security_origin);
-  EXPECT_EQ(dispatcher->requests_.size(), size_t(2));
-
   StreamDeviceInfoArray video_device_array(1);
   StreamDeviceInfo video_device_info;
   video_device_info.device.name = "Camera";
@@ -246,44 +222,33 @@ TEST_F(MediaStreamDispatcherTest, BasicVideoDevice) {
   video_device_info.session_id = kVideoSessionId;
   video_device_array[0] = video_device_info;
 
-  // Complete the first enumeration request.
-  dispatcher->OnMessageReceived(MediaStreamMsg_DevicesEnumerated(
-      kRouteId, ipc_request_id1, video_device_array));
-  EXPECT_EQ(handler1->request_id_, kRequestId1);
-
-  dispatcher->OnMessageReceived(MediaStreamMsg_DevicesEnumerated(
-        kRouteId, ipc_request_id2, video_device_array));
-  EXPECT_EQ(handler2->request_id_, kRequestId2);
-
-  EXPECT_EQ(dispatcher->requests_.size(), size_t(2));
+  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(),
-                         video_device_info.device.id,
-                         kVideoType,
+  int ipc_request_id1 = dispatcher->next_ipc_id_;
+  dispatcher->OpenDevice(kRequestId1, handler1.get()->AsWeakPtr(),
+                         video_device_info.device.id, kVideoType,
                          security_origin);
-  int ipc_request_id4 = dispatcher->next_ipc_id_;
-  EXPECT_NE(ipc_request_id3, ipc_request_id4);
-  dispatcher->OpenDevice(kRequestId4, handler1.get()->AsWeakPtr(),
-                         video_device_info.device.id,
-                         kVideoType,
+  int ipc_request_id2 = dispatcher->next_ipc_id_;
+  EXPECT_NE(ipc_request_id1, ipc_request_id2);
+  dispatcher->OpenDevice(kRequestId2, handler1.get()->AsWeakPtr(),
+                         video_device_info.device.id, kVideoType,
                          security_origin);
-  EXPECT_EQ(dispatcher->requests_.size(), size_t(4));
+  EXPECT_EQ(dispatcher->requests_.size(), size_t(2));
 
   // Complete the OpenDevice of request 1.
   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);
+      kRouteId, ipc_request_id1, stream_label1, video_device_info));
+  EXPECT_EQ(handler1->request_id_, kRequestId1);
 
   // 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);
+      kRouteId, ipc_request_id2, stream_label2, video_device_info));
+  EXPECT_EQ(handler1->request_id_, kRequestId2);
 
-  EXPECT_EQ(dispatcher->requests_.size(), size_t(2));
+  EXPECT_EQ(dispatcher->requests_.size(), size_t(0));
   EXPECT_EQ(dispatcher->label_stream_map_.size(), size_t(2));
 
   // Check the video_session_id.
@@ -303,7 +268,7 @@ TEST_F(MediaStreamDispatcherTest, BasicVideoDevice) {
 
   // Verify that the request have been completed.
   EXPECT_EQ(dispatcher->label_stream_map_.size(), size_t(0));
-  EXPECT_EQ(dispatcher->requests_.size(), size_t(2));
+  EXPECT_EQ(dispatcher->requests_.size(), size_t(0));
 }
 
 TEST_F(MediaStreamDispatcherTest, TestFailure) {
@@ -413,23 +378,4 @@ TEST_F(MediaStreamDispatcherTest, DeviceClosed) {
             StreamDeviceInfo::kNoId);
 }
 
-// Test that the MediaStreamDispatcherEventHandler is notified when the message
-// MediaStreamMsg_DevicesChanged is received.
-TEST_F(MediaStreamDispatcherTest, DevicesChanged) {
-  std::unique_ptr<MockMediaStreamDispatcherEventHandler> handler1(
-      new MockMediaStreamDispatcherEventHandler);
-  std::unique_ptr<MockMediaStreamDispatcherEventHandler> handler2(
-      new MockMediaStreamDispatcherEventHandler);
-  dispatcher_->SubscribeToDeviceChangeNotifications(handler1->AsWeakPtr(),
-                                                    security_origin_);
-  dispatcher_->SubscribeToDeviceChangeNotifications(handler2->AsWeakPtr(),
-                                                    security_origin_);
-  dispatcher_->OnMessageReceived(MediaStreamMsg_DevicesChanged(kRouteId));
-  dispatcher_->CancelDeviceChangeNotifications(handler1->AsWeakPtr());
-  dispatcher_->CancelDeviceChangeNotifications(handler2->AsWeakPtr());
-
-  EXPECT_TRUE(handler1->did_receive_devices_changed_);
-  EXPECT_TRUE(handler2->did_receive_devices_changed_);
-}
-
 }  // namespace content