1 files changed, 15 insertions, 13 deletions
diff --git a/chromium/third_party/WebKit/Source/modules/mediastream/UserMediaRequest.h b/chromium/third_party/WebKit/Source/modules/mediastream/UserMediaRequest.h
index 8ad62dd4744..b5bf69f33bc 100644
--- a/chromium/third_party/WebKit/Source/modules/mediastream/UserMediaRequest.h
+++ b/chromium/third_party/WebKit/Source/modules/mediastream/UserMediaRequest.h
@@ -35,6 +35,7 @@
 #include "modules/mediastream/NavigatorUserMediaErrorCallback.h"
 #include "modules/mediastream/NavigatorUserMediaSuccessCallback.h"
 #include "platform/mediastream/MediaStreamSource.h"
+#include "public/platform/WebMediaConstraints.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/text/WTFString.h"
@@ -44,15 +45,13 @@ namespace WebCore {
 class Dictionary;
 class Document;
 class ExceptionState;
-class MediaConstraints;
-class MediaConstraintsImpl;
 class MediaStreamDescriptor;
 class UserMediaController;
 
-class UserMediaRequest : public RefCounted<UserMediaRequest>, public ContextLifecycleObserver {
+class UserMediaRequest FINAL : public RefCountedWillBeGarbageCollectedFinalized<UserMediaRequest>, public ContextLifecycleObserver {
 public:
-    static PassRefPtr<UserMediaRequest> create(ExecutionContext*, UserMediaController*, const Dictionary& options, PassOwnPtr<NavigatorUserMediaSuccessCallback>, PassOwnPtr<NavigatorUserMediaErrorCallback>, ExceptionState&);
-    ~UserMediaRequest();
+    static PassRefPtrWillBeRawPtr<UserMediaRequest> create(ExecutionContext*, UserMediaController*, const Dictionary& options, PassOwnPtr<NavigatorUserMediaSuccessCallback>, PassOwnPtr<NavigatorUserMediaErrorCallback>, ExceptionState&);
+    virtual ~UserMediaRequest();
 
     NavigatorUserMediaSuccessCallback* successCallback() const { return m_successCallback.get(); }
     NavigatorUserMediaErrorCallback* errorCallback() const { return m_errorCallback.get(); }
@@ -61,22 +60,25 @@ public:
     void start();
 
     void succeed(PassRefPtr<MediaStreamDescriptor>);
-    void fail(const String& description);
-    void failConstraint(const String& constraintName, const String& description);
+    void failPermissionDenied(const String& message);
+    void failConstraint(const String& constraintName, const String& message);
+    void failUASpecific(const String& name, const String& message, const String& constraintName);
 
     bool audio() const;
     bool video() const;
-    MediaConstraints* audioConstraints() const;
-    MediaConstraints* videoConstraints() const;
+    blink::WebMediaConstraints audioConstraints() const;
+    blink::WebMediaConstraints videoConstraints() const;
 
     // ContextLifecycleObserver
-    virtual void contextDestroyed();
+    virtual void contextDestroyed() OVERRIDE;
+
+    void trace(Visitor*) { }
 
 private:
-    UserMediaRequest(ExecutionContext*, UserMediaController*, PassRefPtr<MediaConstraintsImpl> audio, PassRefPtr<MediaConstraintsImpl> video, PassOwnPtr<NavigatorUserMediaSuccessCallback>, PassOwnPtr<NavigatorUserMediaErrorCallback>);
+    UserMediaRequest(ExecutionContext*, UserMediaController*, blink::WebMediaConstraints audio, blink::WebMediaConstraints video, PassOwnPtr<NavigatorUserMediaSuccessCallback>, PassOwnPtr<NavigatorUserMediaErrorCallback>);
 
-    RefPtr<MediaConstraintsImpl> m_audio;
-    RefPtr<MediaConstraintsImpl> m_video;
+    blink::WebMediaConstraints m_audio;
+    blink::WebMediaConstraints m_video;
 
     UserMediaController* m_controller;