Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/WebKit/chromium/src/WebUserMediaRequest.cpp

Index: Source/WebKit/chromium/src/WebUserMediaRequest.cpp
diff --git a/Source/WebKit/chromium/src/WebUserMediaRequest.cpp b/Source/WebKit/chromium/src/WebUserMediaRequest.cpp
index a7ade2ef12fb348af72d24386a2a8b6373219b3f..7c8fda780eb0c5805f7ef43f254cea193769c12a 100644
--- a/Source/WebKit/chromium/src/WebUserMediaRequest.cpp
+++ b/Source/WebKit/chromium/src/WebUserMediaRequest.cpp
@@ -42,6 +42,7 @@
 #include "WebSecurityOrigin.h"
 #include "core/dom/Document.h"
 #include "core/platform/mediastream/MediaConstraints.h"
+#include "core/platform/mediastream/MediaStreamDescriptor.h"
 #include "core/platform/mediastream/MediaStreamSource.h"
 #include "modules/mediastream/UserMediaRequest.h"
 #include "weborigin/SecurityOrigin.h"
@@ -96,10 +97,10 @@ WebDocument WebUserMediaRequest::ownerDocument() const
     return WebDocument(m_private->ownerDocument());
 }
 
-void WebUserMediaRequest::requestSucceeded(const WebMediaStream& webStream)
+void WebUserMediaRequest::requestSucceeded(const WebMediaStream& streamDescriptor)
 {
-    ASSERT(!isNull() && !webStream.isNull());
-    m_private->succeed(webStream);
+    ASSERT(!isNull() && !streamDescriptor.isNull());
+    m_private->succeed(streamDescriptor);
 }
 
 void WebUserMediaRequest::requestFailed(const WebString& description)