Media Related changes for TabCapture API

content/renderer/media/media_stream_impl.h

Index: content/renderer/media/media_stream_impl.h
diff --git a/content/renderer/media/media_stream_impl.h b/content/renderer/media/media_stream_impl.h
index 1ffca32621c29a6743442d306f579045d8f2d5ed..319d85da3c845d251bd408add1d71bfec0794c60 100644
--- a/content/renderer/media/media_stream_impl.h
+++ b/content/renderer/media/media_stream_impl.h
@@ -19,6 +19,7 @@
 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediastream.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDeviceMediaRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaRequest.h"
 #include "webkit/media/media_stream_client.h"
 
@@ -57,6 +58,8 @@ class CONTENT_EXPORT MediaStreamImpl
       const WebKit::WebVector<WebKit::WebMediaStreamSource>& audio_sources,
       const WebKit::WebVector<WebKit::WebMediaStreamSource>& video_sources)
       OVERRIDE;
+  virtual void requestDeviceMedia(
+      const WebKit::WebDeviceMediaRequest& user_media_request) OVERRIDE;
   virtual void cancelUserMediaRequest(
       const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE;
 
@@ -145,6 +148,12 @@ class CONTENT_EXPORT MediaStreamImpl
       webrtc::MediaStreamInterface* stream,
       media::MessageLoopFactory* message_loop_factory);
 
+  void GenerateStreamForMedia(
+      const WebKit::WebUserMediaRequest& user_media_request,
+      const content::MediaStreamDeviceType audio,
+      const content::MediaStreamDeviceType video,
+      const std::string* device_id);
+
   // Weak ref to a MediaStreamDependencyFactory, owned by the RenderThread.
   // It's valid for the lifetime of RenderThread.
   MediaStreamDependencyFactory* dependency_factory_;