Media Related changes for TabCapture API

content/renderer/media/media_stream_dispatcher.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 24 matching lines @@
  public:
   explicit MediaStreamDispatcher(RenderViewImpl* render_view);
   virtual ~MediaStreamDispatcher();
 
   // Request a new media stream to be created.
   // This can be used either by WebKit or a plugin.
   // Note: The event_handler must be valid for as long as the stream exists.
   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.
   virtual void CancelGenerateStream(int request_id);
 
   // Stop a started stream. Label is the label provided in OnStreamGenerated.
   virtual void StopStream(const std::string& label);
 
   // Request to enumerate devices.
   void EnumerateDevices(
@@ skipping 93 matching lines @@
   // Used for DCHECKs so methods calls won't execute in the wrong thread.
   scoped_refptr<base::MessageLoopProxy> main_loop_;
 
   int next_ipc_id_;
   typedef std::map<std::string, Stream> LabelStreamMap;
   LabelStreamMap label_stream_map_;
 
   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_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcher);
 };
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_