Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / modules / mediastream / UserMediaController.h

diff --git a/src/third_party/WebKit/Source/modules/mediastream/UserMediaController.h b/src/third_party/WebKit/Source/modules/mediastream/UserMediaController.h
index c751f0f..985f037 100644 (file)
--- a/src/third_party/WebKit/Source/modules/mediastream/UserMediaController.h
+++ b/src/third_party/WebKit/Source/modules/mediastream/UserMediaController.h
@@ -29,7 +29,7 @@
 #include "modules/mediastream/UserMediaClient.h"
 #include "wtf/PassOwnPtr.h"
 
-namespace WebCore {
+namespace blink {
 
 class MediaDevicesRequest;
 class UserMediaRequest;
@@ -41,10 +41,10 @@ public:
 
     UserMediaClient* client() const { return m_client; }
 
-    void requestUserMedia(PassRefPtrWillBeRawPtr<UserMediaRequest>);
+    void requestUserMedia(UserMediaRequest*);
     void cancelUserMediaRequest(UserMediaRequest*);
 
-    void requestMediaDevices(PassRefPtrWillBeRawPtr<MediaDevicesRequest>);
+    void requestMediaDevices(MediaDevicesRequest*);
     void cancelMediaDevicesRequest(MediaDevicesRequest*);
 
     static PassOwnPtrWillBeRawPtr<UserMediaController> create(UserMediaClient*);
@@ -60,7 +60,7 @@ private:
     UserMediaClient* m_client;
 };
 
-inline void UserMediaController::requestUserMedia(PassRefPtrWillBeRawPtr<UserMediaRequest> request)
+inline void UserMediaController::requestUserMedia(UserMediaRequest* request)
 {
     m_client->requestUserMedia(request);
 }
@@ -70,7 +70,7 @@ inline void UserMediaController::cancelUserMediaRequest(UserMediaRequest* reques
     m_client->cancelUserMediaRequest(request);
 }
 
-inline void UserMediaController::requestMediaDevices(PassRefPtrWillBeRawPtr<MediaDevicesRequest> request)
+inline void UserMediaController::requestMediaDevices(MediaDevicesRequest* request)
 {
     m_client->requestMediaDevices(request);
 }
@@ -80,6 +80,6 @@ inline void UserMediaController::cancelMediaDevicesRequest(MediaDevicesRequest*
     m_client->cancelMediaDevicesRequest(request);
 }
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // UserMediaController_h