Revert 274608 "Implement getMediaDevices."

content/renderer/media/mock_media_stream_dispatcher.cc

Index: content/renderer/media/mock_media_stream_dispatcher.cc
===================================================================
--- content/renderer/media/mock_media_stream_dispatcher.cc	(revision 278172)
+++ content/renderer/media/mock_media_stream_dispatcher.cc	(working copy)
@@ -12,8 +12,7 @@
 
 MockMediaStreamDispatcher::MockMediaStreamDispatcher()
     : MediaStreamDispatcher(NULL),
-      audio_request_id_(-1),
-      video_request_id_(-1),
+      request_id_(-1),
       request_stream_counter_(0),
       stop_audio_device_counter_(0),
       stop_video_device_counter_(0),
@@ -27,44 +26,37 @@
     const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
     const StreamOptions& components,
     const GURL& url) {
-  // Audio and video share the same request so we use |audio_request_id_| only.
-  audio_request_id_ = request_id;
+  request_id_ = request_id;
 
   stream_label_ = "local_stream" + base::IntToString(request_id);
   audio_array_.clear();
   video_array_.clear();
 
   if (components.audio_requested) {
-    AddAudioDeviceToArray();
+    StreamDeviceInfo audio;
+    audio.device.id = "audio_device_id" + base::IntToString(session_id_);
+    audio.device.name = "microphone";
+    audio.device.type = MEDIA_DEVICE_AUDIO_CAPTURE;
+    audio.session_id = session_id_;
+    audio_array_.push_back(audio);
   }
   if (components.video_requested) {
-    AddVideoDeviceToArray();
+    StreamDeviceInfo video;
+    video.device.id = "video_device_id" + base::IntToString(session_id_);
+    video.device.name = "usb video camera";
+    video.device.type = MEDIA_DEVICE_VIDEO_CAPTURE;
+    video.session_id = session_id_;
+    video_array_.push_back(video);
   }
   ++request_stream_counter_;
 }
 
 void MockMediaStreamDispatcher::CancelGenerateStream(
-    int request_id,
-    const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler) {
-  EXPECT_EQ(request_id, audio_request_id_);
+  int request_id,
+  const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler) {
+  EXPECT_EQ(request_id, request_id_);
 }
 
-void MockMediaStreamDispatcher::EnumerateDevices(
-    int request_id,
-    const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
-    MediaStreamType type,
-    const GURL& security_origin) {
-  if (type == MEDIA_DEVICE_AUDIO_CAPTURE) {
-    audio_request_id_ = request_id;
-    audio_array_.clear();
-    AddAudioDeviceToArray();
-  } else if (type == MEDIA_DEVICE_VIDEO_CAPTURE) {
-    video_request_id_ = request_id;
-    video_array_.clear();
-    AddVideoDeviceToArray();
-  }
-}
-
 void MockMediaStreamDispatcher::StopStreamDevice(
     const StreamDeviceInfo& device_info) {
   if (IsAudioMediaType(device_info.device.type)) {
@@ -92,22 +84,4 @@
   return -1;
 }
 
-void MockMediaStreamDispatcher::AddAudioDeviceToArray() {
-  StreamDeviceInfo audio;
-  audio.device.id = "audio_device_id" + base::IntToString(session_id_);
-  audio.device.name = "microphone";
-  audio.device.type = MEDIA_DEVICE_AUDIO_CAPTURE;
-  audio.session_id = session_id_;
-  audio_array_.push_back(audio);
-}
-
-void MockMediaStreamDispatcher::AddVideoDeviceToArray() {
-  StreamDeviceInfo video;
-  video.device.id = "video_device_id" + base::IntToString(session_id_);
-  video.device.name = "usb video camera";
-  video.device.type = MEDIA_DEVICE_VIDEO_CAPTURE;
-  video.session_id = session_id_;
-  video_array_.push_back(video);
-}
-
 }  // namespace content