Upstream version 9.38.198.0

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

diff --git a/src/third_party/WebKit/Source/modules/mediastream/MediaDeviceInfo.cpp b/src/third_party/WebKit/Source/modules/mediastream/MediaDeviceInfo.cpp
index 1782692..4dabb31 100644 (file)
--- a/src/third_party/WebKit/Source/modules/mediastream/MediaDeviceInfo.cpp
+++ b/src/third_party/WebKit/Source/modules/mediastream/MediaDeviceInfo.cpp
@@ -28,17 +28,18 @@
 
 #include "wtf/text/WTFString.h"
 
-namespace WebCore {
+namespace blink {
 
-PassRefPtrWillBeRawPtr<MediaDeviceInfo> MediaDeviceInfo::create(const blink::WebMediaDeviceInfo& webMediaDeviceInfo)
+MediaDeviceInfo* MediaDeviceInfo::create(const WebMediaDeviceInfo& webMediaDeviceInfo)
 {
     ASSERT(!webMediaDeviceInfo.isNull());
-    return adoptRefWillBeNoop(new MediaDeviceInfo(webMediaDeviceInfo));
+    return new MediaDeviceInfo(webMediaDeviceInfo);
 }
 
-MediaDeviceInfo::MediaDeviceInfo(const blink::WebMediaDeviceInfo& webMediaDeviceInfo)
+MediaDeviceInfo::MediaDeviceInfo(const WebMediaDeviceInfo& webMediaDeviceInfo)
     : m_webMediaDeviceInfo(webMediaDeviceInfo)
 {
+    ScriptWrappable::init(this);
 }
 
 String MediaDeviceInfo::deviceId() const
@@ -49,11 +50,11 @@ String MediaDeviceInfo::deviceId() const
 String MediaDeviceInfo::kind() const
 {
     switch (m_webMediaDeviceInfo.kind()) {
-    case blink::WebMediaDeviceInfo::MediaDeviceKindAudioInput:
+    case WebMediaDeviceInfo::MediaDeviceKindAudioInput:
         return "audioinput";
-    case blink::WebMediaDeviceInfo::MediaDeviceKindAudioOutput:
+    case WebMediaDeviceInfo::MediaDeviceKindAudioOutput:
         return "audiooutput";
-    case blink::WebMediaDeviceInfo::MediaDeviceKindVideoInput:
+    case WebMediaDeviceInfo::MediaDeviceKindVideoInput:
         return "videoinput";
     }
 
@@ -71,4 +72,4 @@ String MediaDeviceInfo::groupId() const
     return m_webMediaDeviceInfo.groupId();
 }
 
-} // namespace WebCore
+} // namespace blink