Remove dead code related to media device enumerations and monitoring.

content/browser/renderer_host/media/media_stream_dispatcher_host.cc

Index: content/browser/renderer_host/media/media_stream_dispatcher_host.cc
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
index ed0f30059cbc6aa2296a2db91a9c21111154b240..3a2e040afd6b9fa1ba51048567b565ba387971d6 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
@@ -6,30 +6,23 @@
 
 #include <algorithm>
 
-#include "base/command_line.h"
-#include "base/memory/ptr_util.h"
-#include "content/browser/bad_message.h"
 #include "content/browser/browser_main_loop.h"
-#include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/common/media/media_stream_options.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
-#include "url/gurl.h"
+#include "url/origin.h"
 
 namespace content {
 
 MediaStreamDispatcherHost::MediaStreamDispatcherHost(
     int render_process_id,
     const std::string& salt,
-    MediaStreamManager* media_stream_manager,
-    bool use_fake_ui)
+    MediaStreamManager* media_stream_manager)
     : BrowserMessageFilter(MediaStreamMsgStart),
       render_process_id_(render_process_id),
       salt_(salt),
-      media_stream_manager_(media_stream_manager),
-      use_fake_ui_(use_fake_ui),
-      weak_factory_(this) {}
+      media_stream_manager_(media_stream_manager) {}
 
 void MediaStreamDispatcherHost::StreamGenerated(
     int render_frame_id,
@@ -71,19 +64,6 @@ void MediaStreamDispatcherHost::DeviceStopped(int render_frame_id,
   Send(new MediaStreamMsg_DeviceStopped(render_frame_id, label, device));
 }
 
-void MediaStreamDispatcherHost::DevicesEnumerated(
-    int render_frame_id,
-    int page_request_id,
-    const std::string& label,
-    const StreamDeviceInfoArray& devices) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DVLOG(1) << "MediaStreamDispatcherHost::DevicesEnumerated("
-           << ", {page_request_id = " << page_request_id <<  "})";
-
-  Send(new MediaStreamMsg_DevicesEnumerated(render_frame_id, page_request_id,
-                                            devices));
-}
-
 void MediaStreamDispatcherHost::DeviceOpened(
     int render_frame_id,
     int page_request_id,
@@ -97,22 +77,6 @@ void MediaStreamDispatcherHost::DeviceOpened(
       render_frame_id, page_request_id, label, video_device));
 }
 
-void MediaStreamDispatcherHost::DevicesChanged(MediaStreamType type) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DVLOG(1) << "MediaStreamDispatcherHost::DevicesChanged("
-           << "{type = " << type << "})";
-  for (const auto& subscriber : device_change_subscribers_) {
-    std::unique_ptr<MediaStreamUIProxy> ui_proxy = CreateMediaStreamUIProxy();
-    ui_proxy->CheckAccess(
-        subscriber.security_origin, type, render_process_id_,
-        subscriber.render_frame_id,
-        base::Bind(&MediaStreamDispatcherHost::HandleCheckAccessResponse,
-                   weak_factory_.GetWeakPtr(),
-                   base::Passed(std::move(ui_proxy)),
-                   subscriber.render_frame_id));
-  }
-}
-
 bool MediaStreamDispatcherHost::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(MediaStreamDispatcherHost, message)
@@ -121,18 +85,10 @@ bool MediaStreamDispatcherHost::OnMessageReceived(const IPC::Message& message) {
                         OnCancelGenerateStream)
     IPC_MESSAGE_HANDLER(MediaStreamHostMsg_StopStreamDevice,
                         OnStopStreamDevice)
-    IPC_MESSAGE_HANDLER(MediaStreamHostMsg_EnumerateDevices,
-                        OnEnumerateDevices)
-    IPC_MESSAGE_HANDLER(MediaStreamHostMsg_CancelEnumerateDevices,
-                        OnCancelEnumerateDevices)
     IPC_MESSAGE_HANDLER(MediaStreamHostMsg_OpenDevice,
                         OnOpenDevice)
     IPC_MESSAGE_HANDLER(MediaStreamHostMsg_CloseDevice,
                         OnCloseDevice)
-    IPC_MESSAGE_HANDLER(MediaStreamHostMsg_SubscribeToDeviceChangeNotifications,
-                        OnSubscribeToDeviceChangeNotifications)
-    IPC_MESSAGE_HANDLER(MediaStreamHostMsg_CancelDeviceChangeNotifications,
-                        OnCancelDeviceChangeNotifications)
     IPC_MESSAGE_HANDLER(MediaStreamHostMsg_SetCapturingLinkSecured,
                         OnSetCapturingLinkSecured)
     IPC_MESSAGE_UNHANDLED(handled = false)
@@ -145,8 +101,6 @@ void MediaStreamDispatcherHost::OnChannelClosing() {
 
   // Since the IPC sender is gone, close all requesting/requested streams.
   media_stream_manager_->CancelAllRequests(render_process_id_);
-  if (!device_change_subscribers_.empty())
-    media_stream_manager_->CancelDeviceChangeNotifications(this);
 }
 
 MediaStreamDispatcherHost::~MediaStreamDispatcherHost() {
@@ -191,33 +145,6 @@ void MediaStreamDispatcherHost::OnStopStreamDevice(
                                           device_id);
 }
 
-void MediaStreamDispatcherHost::OnEnumerateDevices(
-    int render_frame_id,
-    int page_request_id,
-    MediaStreamType type,
-    const url::Origin& security_origin) {
-  DVLOG(1) << "MediaStreamDispatcherHost::OnEnumerateDevices("
-           << render_frame_id << ", " << page_request_id << ", " << type << ", "
-           << security_origin << ")";
-
-  if (!MediaStreamManager::IsOriginAllowed(render_process_id_, security_origin))
-    return;
-
-  media_stream_manager_->EnumerateDevices(
-      this, render_process_id_, render_frame_id, salt_, page_request_id, type,
-      security_origin);
-}
-
-void MediaStreamDispatcherHost::OnCancelEnumerateDevices(
-    int render_frame_id,
-    int page_request_id) {
-  DVLOG(1) << "MediaStreamDispatcherHost::OnCancelEnumerateDevices("
-           << render_frame_id << ", "
-           << page_request_id << ")";
-  media_stream_manager_->CancelRequest(render_process_id_, render_frame_id,
-                                       page_request_id);
-}
-
 void MediaStreamDispatcherHost::OnOpenDevice(
     int render_frame_id,
     int page_request_id,
@@ -246,66 +173,6 @@ void MediaStreamDispatcherHost::OnCloseDevice(
   media_stream_manager_->CancelRequest(label);
 }
 
-void MediaStreamDispatcherHost::OnSubscribeToDeviceChangeNotifications(
-    int render_frame_id,
-    const url::Origin& security_origin) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DVLOG(1)
-      << "MediaStreamDispatcherHost::OnSubscribeToDeviceChangeNotifications("
-      << render_frame_id << ", " << security_origin << ")";
-  DCHECK(
-      std::find_if(
-          device_change_subscribers_.begin(), device_change_subscribers_.end(),
-          [render_frame_id](const DeviceChangeSubscriberInfo& subscriber_info) {
-            return subscriber_info.render_frame_id == render_frame_id;
-          }) == device_change_subscribers_.end());
-
-  if (device_change_subscribers_.empty())
-    media_stream_manager_->SubscribeToDeviceChangeNotifications(this);
-
-  device_change_subscribers_.push_back({render_frame_id, security_origin});
-}
-
-void MediaStreamDispatcherHost::OnCancelDeviceChangeNotifications(
-    int render_frame_id) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  DVLOG(1) << "MediaStreamDispatcherHost::CancelDeviceChangeNotifications("
-           << render_frame_id << ")";
-  auto it = std::find_if(
-      device_change_subscribers_.begin(), device_change_subscribers_.end(),
-      [render_frame_id](const DeviceChangeSubscriberInfo& subscriber_info) {
-        return subscriber_info.render_frame_id == render_frame_id;
-      });
-  if (it == device_change_subscribers_.end()) {
-    bad_message::ReceivedBadMessage(this, bad_message::MSDH_INVALID_FRAME_ID);
-    return;
-  }
-  device_change_subscribers_.erase(it);
-  if (device_change_subscribers_.empty())
-    media_stream_manager_->CancelDeviceChangeNotifications(this);
-}
-
-std::unique_ptr<MediaStreamUIProxy>
-MediaStreamDispatcherHost::CreateMediaStreamUIProxy() {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  if (use_fake_ui_ ||
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kUseFakeUIForMediaStream)) {
-    return base::MakeUnique<FakeMediaStreamUIProxy>();
-  }
-
-  return MediaStreamUIProxy::Create();
-}
-
-void MediaStreamDispatcherHost::HandleCheckAccessResponse(
-    std::unique_ptr<MediaStreamUIProxy> ui_proxy,
-    int render_frame_id,
-    bool have_access) {
-  DCHECK_CURRENTLY_ON(BrowserThread::IO);
-  if (have_access)
-    Send(new MediaStreamMsg_DevicesChanged(render_frame_id));
-}
-
 void MediaStreamDispatcherHost::OnSetCapturingLinkSecured(int session_id,
                                                           MediaStreamType type,
                                                           bool is_secure) {