commit 2a99a7e74a7f215066514fe81d2bfa6639d9eddd
author Torne (Richard Coles) <torne@google.com> Thu Mar 28 15:31:22 2013 +0000
committer Torne (Richard Coles) <torne@google.com> Thu Mar 28 15:31:22 2013 +0000
tree 7c2d04841fcd599fd83b0f0bb1100e1c89a35bae
parent 61c449bbbb53310a8c041d8cefdd6b01a126cc7e

Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170

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 3070d9b..1845ca0 100644
--- a/content/renderer/media/media_stream_impl.h
+++ b/content/renderer/media/media_stream_impl.h
@@ -18,10 +18,10 @@
 #include "content/common/content_export.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
-#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamDescriptor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaRequest.h"
+#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
 #include "webkit/media/media_stream_client.h"
 
 namespace webkit_media {
@@ -33,6 +33,7 @@
 class MediaStreamDispatcher;
 class VideoCaptureImplManager;
 class WebRtcAudioRenderer;
+class WebRtcLocalAudioRenderer;
 
 // MediaStreamImpl is a delegate for the Media Stream API messages used by
 // WebKit. It ties together WebKit, native PeerConnection in libjingle and
@@ -76,9 +77,6 @@
       const GURL& url,
       const base::Closure& error_cb,
       const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb) OVERRIDE;
-  virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder(
-      const GURL& url,
-      media::MessageLoopFactory* message_loop_factory) OVERRIDE;
   virtual scoped_refptr<webkit_media::MediaStreamAudioRenderer>
       GetAudioRenderer(const GURL& url) OVERRIDE;
 
@@ -113,20 +111,20 @@
   // UserMediaRequests::description for which the underlying sources have been
   // created.
   void OnCreateNativeSourcesComplete(
-      WebKit::WebMediaStreamDescriptor* description,
+      WebKit::WebMediaStream* description,
       bool request_succeeded);
 
   // This function is virtual for test purposes. A test can override this to
   // test requesting local media streams. The function notifies WebKit that the
   // |request| have completed and generated the MediaStream |stream|.
   virtual void CompleteGetUserMediaRequest(
-      const WebKit::WebMediaStreamDescriptor& stream,
+      const WebKit::WebMediaStream& stream,
       WebKit::WebUserMediaRequest* request_info,
       bool request_succeeded);
 
   // Returns the WebKit representation of a MediaStream given an URL.
   // This is virtual for test purposes.
-  virtual WebKit::WebMediaStreamDescriptor GetMediaStream(const GURL& url);
+  virtual WebKit::WebMediaStream GetMediaStream(const GURL& url);
 
  private:
   // Structure for storing information about a WebKit request to create a
@@ -146,14 +144,14 @@
     // OnStreamGenerated.
     bool generated;
     WebKit::WebFrame* frame;  // WebFrame that requested the MediaStream.
-    WebKit::WebMediaStreamDescriptor descriptor;
+    WebKit::WebMediaStream descriptor;
     WebKit::WebUserMediaRequest request;
   };
   typedef ScopedVector<UserMediaRequestInfo> UserMediaRequests;
 
   UserMediaRequestInfo* FindUserMediaRequestInfo(int request_id);
   UserMediaRequestInfo* FindUserMediaRequestInfo(
-      WebKit::WebMediaStreamDescriptor* descriptor);
+      WebKit::WebMediaStream* descriptor);
   UserMediaRequestInfo* FindUserMediaRequestInfo(
       const WebKit::WebUserMediaRequest& request);
   UserMediaRequestInfo* FindUserMediaRequestInfo(const std::string& label);
@@ -164,11 +162,10 @@
       webrtc::MediaStreamInterface* stream,
       const base::Closure& error_cb,
       const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb);
-  scoped_refptr<media::VideoDecoder> CreateVideoDecoder(
-      webrtc::MediaStreamInterface* stream,
-      media::MessageLoopFactory* message_loop_factory);
   scoped_refptr<WebRtcAudioRenderer> CreateRemoteAudioRenderer(
-        webrtc::MediaStreamInterface* stream);
+      webrtc::MediaStreamInterface* stream);
+  scoped_refptr<WebRtcLocalAudioRenderer> CreateLocalAudioRenderer(
+      webrtc::MediaStreamInterface* stream);
 
   // Weak ref to a MediaStreamDependencyFactory, owned by the RenderThread.
   // It's valid for the lifetime of RenderThread.