Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

Source/modules/mediastream/UserMediaRequest.h

 /*
  * Copyright (C) 2011 Ericsson AB. 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 23 matching lines @@
 #include "core/dom/ActiveDOMObject.h"
 #include "core/dom/ExceptionBase.h"
 #include "core/platform/mediastream/MediaStreamSource.h"
 #include "core/platform/mediastream/MediaStreamSourcesQueryClient.h"
 #include "modules/mediastream/NavigatorUserMediaErrorCallback.h"
 #include "modules/mediastream/NavigatorUserMediaSuccessCallback.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/text/WTFString.h"
 
-namespace WebKit {
-class WebMediaStream;
-}
-
 namespace WebCore {
 
 class Dictionary;
 class Document;
 class MediaConstraints;
 class MediaConstraintsImpl;
+class MediaStreamDescriptor;
 class UserMediaController;
 
 class UserMediaRequest : public MediaStreamSourcesQueryClient, public ContextDestructionObserver {
 public:
     static PassRefPtr<UserMediaRequest> create(ScriptExecutionContext*, UserMediaController*, const Dictionary& options, PassRefPtr<NavigatorUserMediaSuccessCallback>, PassRefPtr<NavigatorUserMediaErrorCallback>, ExceptionCode&);
     ~UserMediaRequest();
 
     NavigatorUserMediaSuccessCallback* successCallback() const { return m_successCallback.get(); }
     NavigatorUserMediaErrorCallback* errorCallback() const { return m_errorCallback.get(); }
     Document* ownerDocument();
 
     void start();
 
-    void succeed(WebKit::WebMediaStream);
+    void succeed(PassRefPtr<MediaStreamDescriptor>);
     void fail(const String& description);
     void failConstraint(const String& constraintName, const String& description);
 
     MediaConstraints* audioConstraints() const;
     MediaConstraints* videoConstraints() const;
 
     // MediaStreamSourcesQueryClient
     virtual bool audio() const;
     virtual bool video() const;
     virtual void didCompleteQuery(const MediaStreamSourceVector& audioSources, const MediaStreamSourceVector& videoSources);
 
     // ContextDestructionObserver
     virtual void contextDestroyed();
 
 private:
     UserMediaRequest(ScriptExecutionContext*, UserMediaController*, PassRefPtr<MediaConstraintsImpl> audio, PassRefPtr<MediaConstraintsImpl> video, PassRefPtr<NavigatorUserMediaSuccessCallback>, PassRefPtr<NavigatorUserMediaErrorCallback>);
 
     RefPtr<MediaConstraintsImpl> m_audio;
     RefPtr<MediaConstraintsImpl> m_video;
 
     UserMediaController* m_controller;
 
     RefPtr<NavigatorUserMediaSuccessCallback> m_successCallback;
     RefPtr<NavigatorUserMediaErrorCallback> m_errorCallback;
 };
 
 } // namespace WebCore
 
 #endif // UserMediaRequest_h