Upstream version 10.39.225.0

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

diff --git a/src/third_party/WebKit/Source/modules/mediastream/NavigatorMediaStream.cpp b/src/third_party/WebKit/Source/modules/mediastream/NavigatorMediaStream.cpp
index 7cebbc6..3429c95 100644 (file)
--- a/src/third_party/WebKit/Source/modules/mediastream/NavigatorMediaStream.cpp
+++ b/src/third_party/WebKit/Source/modules/mediastream/NavigatorMediaStream.cpp
@@ -47,7 +47,7 @@ NavigatorMediaStream::~NavigatorMediaStream()
 {
 }
 
-void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const Dictionary& options, PassOwnPtr<NavigatorUserMediaSuccessCallback> successCallback, PassOwnPtr<NavigatorUserMediaErrorCallback> errorCallback, ExceptionState& exceptionState)
+void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const Dictionary& options, NavigatorUserMediaSuccessCallback* successCallback, NavigatorUserMediaErrorCallback* errorCallback, ExceptionState& exceptionState)
 {
     if (!successCallback)
         return;
@@ -67,7 +67,7 @@ void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const Dictio
     request->start();
 }
 
-void NavigatorMediaStream::getMediaDevices(Navigator& navigator, PassOwnPtr<MediaDeviceInfoCallback> callback, ExceptionState& exceptionState)
+void NavigatorMediaStream::getMediaDevices(Navigator& navigator, MediaDeviceInfoCallback* callback, ExceptionState& exceptionState)
 {
     UserMediaController* userMedia = UserMediaController::from(navigator.frame());
     if (!userMedia) {