Media Related changes for TabCapture API

content/renderer/media/media_stream_dispatcher.h

Index: content/renderer/media/media_stream_dispatcher.h
diff --git a/content/renderer/media/media_stream_dispatcher.h b/content/renderer/media/media_stream_dispatcher.h
index 28dc12d6b1d2246b77912af2126a906f39878742..6677e56a3bcaff5302afd5d54dd6dff9ae8df5b9 100644
--- a/content/renderer/media/media_stream_dispatcher.h
+++ b/content/renderer/media/media_stream_dispatcher.h
@@ -42,16 +42,7 @@ class CONTENT_EXPORT MediaStreamDispatcher
   virtual void GenerateStream(
       int request_id,
       const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
-      media_stream::StreamOptions components,
-      const GURL& security_origin);
-
-  // Like GenerateStream above, except use the device specified by |device_id|
-  // rather than allow the user to choose one.
-  virtual void GenerateStreamForDevice(
-      int request_id,
-      const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
-      media_stream::StreamOptions components,
-      const std::string& device_id,
+      const media_stream::StreamOptions& components,
       const GURL& security_origin);
 
   // Cancel the request for a new media stream to be created.
@@ -165,8 +156,7 @@ class CONTENT_EXPORT MediaStreamDispatcher
   EnumerationState audio_enumeration_state_;
   EnumerationState video_enumeration_state_;
 
-  // List of calls made to GenerateStream/GenerateStreamForDevice that has not
-  // yet completed.
+  // List of calls made to GenerateStream that have not yet completed.
   typedef std::list<Request> RequestList;
   RequestList requests_;