Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / app / webrtc / objc / RTCMediaStreamTrack.mm

diff --git a/src/third_party/libjingle/source/talk/app/webrtc/objc/RTCMediaStreamTrack.mm b/src/third_party/libjingle/source/talk/app/webrtc/objc/RTCMediaStreamTrack.mm
index 5931312..57a9fde 100644 (file)
--- a/src/third_party/libjingle/source/talk/app/webrtc/objc/RTCMediaStreamTrack.mm
+++ b/src/third_party/libjingle/source/talk/app/webrtc/objc/RTCMediaStreamTrack.mm
@@ -29,8 +29,8 @@
 #error "This file requires ARC support."
 #endif
 
-#import "RTCMediaStreamTrack+Internal.h"
 #import "RTCEnumConverter.h"
+#import "RTCMediaStreamTrack+Internal.h"
 
 namespace webrtc {
 
@@ -48,8 +48,8 @@ class RTCMediaStreamTrackObserver : public ObserverInterface {
 }
 
 @implementation RTCMediaStreamTrack {
-  talk_base::scoped_refptr<webrtc::MediaStreamTrackInterface> _mediaTrack;
-  talk_base::scoped_ptr<webrtc::RTCMediaStreamTrackObserver> _observer;
+  rtc::scoped_refptr<webrtc::MediaStreamTrackInterface> _mediaTrack;
+  rtc::scoped_ptr<webrtc::RTCMediaStreamTrackObserver> _observer;
 }
 
 @synthesize label;
@@ -100,7 +100,7 @@ class RTCMediaStreamTrackObserver : public ObserverInterface {
 @implementation RTCMediaStreamTrack (Internal)
 
 - (id)initWithMediaTrack:
-          (talk_base::scoped_refptr<webrtc::MediaStreamTrackInterface>)
+          (rtc::scoped_refptr<webrtc::MediaStreamTrackInterface>)
       mediaTrack {
   if (!mediaTrack) {
     NSAssert(NO, @"nil arguments not allowed");
@@ -120,7 +120,7 @@ class RTCMediaStreamTrackObserver : public ObserverInterface {
   _mediaTrack->UnregisterObserver(_observer.get());
 }
 
-- (talk_base::scoped_refptr<webrtc::MediaStreamTrackInterface>)mediaTrack {
+- (rtc::scoped_refptr<webrtc::MediaStreamTrackInterface>)mediaTrack {
   return _mediaTrack;
 }