Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/WebKit/chromium/src/WebUserMediaRequest.cpp

 /*
  * Copyright (C) 2011 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 24 matching lines @@
 #include "public/platform/WebMediaConstraints.h"
 #include "public/platform/WebMediaStream.h"
 #include "public/platform/WebMediaStreamSource.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebVector.h"
 #include <wtf/Vector.h>
 #include "WebDocument.h"
 #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"
 
 using namespace WebCore;
 
 namespace WebKit {
 
 WebUserMediaRequest::WebUserMediaRequest(const PassRefPtr<UserMediaRequest>& request)
     : m_private(request)
@@ skipping 34 matching lines @@
     ASSERT(!isNull() && m_private->scriptExecutionContext());
     return WebSecurityOrigin(m_private->scriptExecutionContext()->securityOrigin());
 }
 
 WebDocument WebUserMediaRequest::ownerDocument() const
 {
     ASSERT(!isNull());
     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)
 {
     ASSERT(!isNull());
     m_private->fail(description);
 }
 
 void WebUserMediaRequest::requestFailedConstraint(const WebString& constraintName, const WebString& description)
 {
@@ skipping 12 matching lines @@
 {
     m_private = other.m_private;
 }
 
 WebUserMediaRequest::operator UserMediaRequest*() const
 {
     return m_private.get();
 }
 
 } // namespace WebKit