libjingle roll 117:119

content/renderer/media/peer_connection_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/peer_connection_handler.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 33 matching lines @@
       video_track->SetRenderer(renderer);
       return;
     }
   }
   DVLOG(1) << "No enabled video track.";
 }
 
 void PeerConnectionHandler::initialize(
     const WebKit::WebString& server_configuration,
     const WebKit::WebSecurityOrigin& security_origin) {
-  native_peer_connection_ = dependency_factory_->CreatePeerConnection(
+  native_peer_connection_ = dependency_factory_->CreateRoapPeerConnection(
       UTF16ToUTF8(server_configuration),
       this);
   CHECK(native_peer_connection_);
 }
 
 void PeerConnectionHandler::produceInitialOffer(
     const WebKit::WebVector<WebKit::WebMediaStreamDescriptor>&
         pending_add_streams) {
   AddStreams(pending_add_streams);
   native_peer_connection_->CommitStreamChanges();
@@ skipping 80 matching lines @@
   if (!message_loop_proxy_->BelongsToCurrentThread()) {
     message_loop_proxy_->PostTask(FROM_HERE, base::Bind(
         &PeerConnectionHandler::OnRemoveStreamCallback,
         base::Unretained(this),
         stream));
   } else {
     OnRemoveStreamCallback(stream);
   }
 }
 
+void PeerConnectionHandler::OnIceCandidate(
+    const webrtc::IceCandidateInterface* candidate) {
+  // TODO(grunell): Implement.
+  NOTIMPLEMENTED();
+}
+
+void PeerConnectionHandler::OnIceComplete() {
+  // TODO(grunell): Implement.
+  NOTIMPLEMENTED();
+}
+
 void PeerConnectionHandler::AddStreams(
     const WebKit::WebVector<WebKit::WebMediaStreamDescriptor>& streams) {
   for (size_t i = 0; i < streams.size(); ++i) {
     talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> stream =
         dependency_factory_->CreateLocalMediaStream(
             UTF16ToUTF8(streams[i].label()));
     WebKit::WebVector<WebKit::WebMediaStreamSource> source_vector;
     streams[i].sources(source_vector);
 
     // Get and add all tracks.
@@ skipping 77 matching lines @@
           UTF8ToUTF16(video_track->label()),
           WebKit::WebMediaStreamSource::TypeVideo,
           UTF8ToUTF16(video_track->label()));
   }
 
   WebKit::WebMediaStreamDescriptor descriptor;
   descriptor.initialize(UTF8ToUTF16(stream->label()), source_vector);
 
   return descriptor;
 }