Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/modules/mediastream/UserMediaRequest.cpp

 /*
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 20 matching lines @@
 
 #include "config.h"
 
 #include "modules/mediastream/UserMediaRequest.h"
 
 #include "bindings/v8/Dictionary.h"
 #include "core/dom/Document.h"
 #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 {
 
 static PassRefPtr<MediaConstraintsImpl> parseOptions(const Dictionary& options, const String& mediaType, ExceptionCode& ec)
 {
     RefPtr<MediaConstraintsImpl> constraints;
 
     Dictionary constraintsDictionary;
     bool ok = options.get(mediaType, constraintsDictionary);
     if (ok && !constraintsDictionary.isUndefinedOrNull())
@@ skipping 71 matching lines @@
 {
     MediaStreamCenter::instance().queryMediaStreamSources(this);
 }
 
 void UserMediaRequest::didCompleteQuery(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources)
 {
     if (m_controller)
         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());
 }
 
 void UserMediaRequest::fail(const String& description)
 {
     if (!m_scriptExecutionContext)
         return;
 
     if (m_errorCallback) {
         RefPtr<NavigatorUserMediaError> error = NavigatorUserMediaError::create(ASCIILiteral("PERMISSION_DENIED"), description, String());
@@ skipping 19 matching lines @@
 
     if (m_controller) {
         m_controller->cancelUserMediaRequest(this);
         m_controller = 0;
     }
 
     ContextDestructionObserver::contextDestroyed();
 }
 
 } // namespace WebCore