Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/modules/mediastream/UserMediaRequest.cpp

Index: Source/modules/mediastream/UserMediaRequest.cpp
diff --git a/Source/modules/mediastream/UserMediaRequest.cpp b/Source/modules/mediastream/UserMediaRequest.cpp
index 9876dc5ca8eb5b9ab42d4efb5f20577750107669..c7201e532d26d5fd27d998a5ae6c56df79d95812 100644
--- a/Source/modules/mediastream/UserMediaRequest.cpp
+++ b/Source/modules/mediastream/UserMediaRequest.cpp
@@ -38,10 +38,10 @@
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/SpaceSplitString.h"
 #include "core/platform/mediastream/MediaStreamCenter.h"
+#include "core/platform/mediastream/MediaStreamDescriptor.h"
 #include "modules/mediastream/MediaConstraintsImpl.h"
 #include "modules/mediastream/MediaStream.h"
 #include "modules/mediastream/UserMediaController.h"
-#include "public/platform/WebMediaStream.h"
 
 namespace WebCore {
 
@@ -133,12 +133,12 @@ void UserMediaRequest::didCompleteQuery(const MediaStreamSourceVector& audioSour
         m_controller->requestUserMedia(this, audioSources, videoSources);
 }
 
-void UserMediaRequest::succeed(WebKit::WebMediaStream webStream)
+void UserMediaRequest::succeed(PassRefPtr<MediaStreamDescriptor> streamDescriptor)
 {
     if (!m_scriptExecutionContext)
         return;
 
-    RefPtr<MediaStream> stream = MediaStream::create(m_scriptExecutionContext, webStream);
+    RefPtr<MediaStream> stream = MediaStream::create(m_scriptExecutionContext, streamDescriptor);
     m_successCallback->handleEvent(stream.get());
 }