1 files changed, 32 insertions, 23 deletions
diff --git a/chromium/third_party/libjingle/source/talk/app/webrtc/objc/RTCPeerConnectionObserver.mm b/chromium/third_party/libjingle/source/talk/app/webrtc/objc/RTCPeerConnectionObserver.mm
index e102bb974fb..061ccf0a92d 100644
--- a/chromium/third_party/libjingle/source/talk/app/webrtc/objc/RTCPeerConnectionObserver.mm
+++ b/chromium/third_party/libjingle/source/talk/app/webrtc/objc/RTCPeerConnectionObserver.mm
@@ -31,73 +31,82 @@
 
 #import "RTCPeerConnectionObserver.h"
 
-#import "RTCICECandidate+internal.h"
-#import "RTCMediaStream+internal.h"
+#import "RTCDataChannel+Internal.h"
+#import "RTCICECandidate+Internal.h"
+#import "RTCMediaStream+Internal.h"
 #import "RTCEnumConverter.h"
 
 namespace webrtc {
 
 RTCPeerConnectionObserver::RTCPeerConnectionObserver(
-    id<RTCPeerConnectionDelegate> delegate) {
-  _delegate = delegate;
+    RTCPeerConnection* peerConnection) {
+  _peerConnection = peerConnection;
 }
 
-void RTCPeerConnectionObserver::SetPeerConnection(
-    RTCPeerConnection *peerConnection) {
-  _peerConnection = peerConnection;
+RTCPeerConnectionObserver::~RTCPeerConnectionObserver() {
 }
 
 void RTCPeerConnectionObserver::OnError() {
-  [_delegate peerConnectionOnError:_peerConnection];
+  [_peerConnection.delegate peerConnectionOnError:_peerConnection];
 }
 
 void RTCPeerConnectionObserver::OnSignalingChange(
     PeerConnectionInterface::SignalingState new_state) {
-  [_delegate peerConnection:_peerConnection
-      signalingStateChanged:
-          [RTCEnumConverter convertSignalingStateToObjC:new_state]];
+  RTCSignalingState state =
+      [RTCEnumConverter convertSignalingStateToObjC:new_state];
+  [_peerConnection.delegate peerConnection:_peerConnection
+                     signalingStateChanged:state];
 }
 
 void RTCPeerConnectionObserver::OnAddStream(MediaStreamInterface* stream) {
   RTCMediaStream* mediaStream =
       [[RTCMediaStream alloc] initWithMediaStream:stream];
-  [_delegate peerConnection:_peerConnection addedStream:mediaStream];
+  [_peerConnection.delegate peerConnection:_peerConnection
+                               addedStream:mediaStream];
 }
 
 void RTCPeerConnectionObserver::OnRemoveStream(MediaStreamInterface* stream) {
   RTCMediaStream* mediaStream =
       [[RTCMediaStream alloc] initWithMediaStream:stream];
-  [_delegate peerConnection:_peerConnection removedStream:mediaStream];
+  [_peerConnection.delegate peerConnection:_peerConnection
+                             removedStream:mediaStream];
 }
 
 void RTCPeerConnectionObserver::OnDataChannel(
     DataChannelInterface* data_channel) {
-  // TODO(hughv): Implement for future version.
+  RTCDataChannel* dataChannel =
+      [[RTCDataChannel alloc] initWithDataChannel:data_channel];
+  [_peerConnection.delegate peerConnection:_peerConnection
+                        didOpenDataChannel:dataChannel];
 }
 
 void RTCPeerConnectionObserver::OnRenegotiationNeeded() {
-  [_delegate peerConnectionOnRenegotiationNeeded:_peerConnection];
+  id<RTCPeerConnectionDelegate> delegate = _peerConnection.delegate;
+  [delegate peerConnectionOnRenegotiationNeeded:_peerConnection];
 }
 
 void RTCPeerConnectionObserver::OnIceConnectionChange(
     PeerConnectionInterface::IceConnectionState new_state) {
-  [_delegate peerConnection:_peerConnection
-       iceConnectionChanged:
-           [RTCEnumConverter convertIceConnectionStateToObjC:new_state]];
+  RTCICEConnectionState state =
+      [RTCEnumConverter convertIceConnectionStateToObjC:new_state];
+  [_peerConnection.delegate peerConnection:_peerConnection
+                      iceConnectionChanged:state];
 }
 
 void RTCPeerConnectionObserver::OnIceGatheringChange(
     PeerConnectionInterface::IceGatheringState new_state) {
-  [_delegate peerConnection:_peerConnection
-        iceGatheringChanged:
-            [RTCEnumConverter convertIceGatheringStateToObjC:new_state]];
+  RTCICEGatheringState state =
+      [RTCEnumConverter convertIceGatheringStateToObjC:new_state];
+  [_peerConnection.delegate peerConnection:_peerConnection
+                       iceGatheringChanged:state];
 }
 
 void RTCPeerConnectionObserver::OnIceCandidate(
     const IceCandidateInterface* candidate) {
   RTCICECandidate* iceCandidate =
       [[RTCICECandidate alloc] initWithCandidate:candidate];
-  [_delegate peerConnection:_peerConnection gotICECandidate:iceCandidate];
+  [_peerConnection.delegate peerConnection:_peerConnection
+                           gotICECandidate:iceCandidate];
 }
 
-} // namespace webrtc
+}  // namespace webrtc