Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / mediastream / MediaDevicesRequest.cpp

diff --git a/src/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.cpp b/src/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.cpp
index 0649125..da76e85 100644 (file)
--- a/src/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.cpp
+++ b/src/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.cpp
@@ -27,17 +27,17 @@
 
 #include "modules/mediastream/MediaDevicesRequest.h"
 
-#include "bindings/v8/ExceptionState.h"
+#include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "modules/mediastream/UserMediaController.h"
 
-namespace WebCore {
+namespace blink {
 
-PassRefPtrWillBeRawPtr<MediaDevicesRequest> MediaDevicesRequest::create(ExecutionContext* context, UserMediaController* controller, PassOwnPtr<MediaDeviceInfoCallback> callback, ExceptionState& exceptionState)
+MediaDevicesRequest* MediaDevicesRequest::create(ExecutionContext* context, UserMediaController* controller, PassOwnPtr<MediaDeviceInfoCallback> callback, ExceptionState& exceptionState)
 {
-    RefPtrWillBeRawPtr<MediaDevicesRequest> request = adoptRefWillBeRefCountedGarbageCollected(new MediaDevicesRequest(context, controller, callback));
+    MediaDevicesRequest* request = new MediaDevicesRequest(context, controller, callback);
     request->suspendIfNeeded();
-    return request.release();
+    return request;
 }
 
 MediaDevicesRequest::MediaDevicesRequest(ExecutionContext* context, UserMediaController* controller, PassOwnPtr<MediaDeviceInfoCallback> callback)
@@ -80,4 +80,4 @@ void MediaDevicesRequest::stop()
     m_controller = 0;
 }
 
-} // namespace WebCore
+} // namespace blink