Roll WebRTC 11523:11548, Libjingle 11522:11545

remoting/protocol/webrtc_connection_to_client.cc

 // Copyright 2015 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 "remoting/protocol/webrtc_connection_to_client.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "net/base/io_buffer.h"
 #include "remoting/codec/video_encoder.h"
 #include "remoting/codec/video_encoder_verbatim.h"
 #include "remoting/codec/video_encoder_vpx.h"
 #include "remoting/protocol/audio_writer.h"
 #include "remoting/protocol/clipboard_stub.h"
 #include "remoting/protocol/host_control_dispatcher.h"
 #include "remoting/protocol/host_event_dispatcher.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/input_stub.h"
 #include "remoting/protocol/transport_context.h"
 #include "remoting/protocol/webrtc_transport.h"
 #include "remoting/protocol/webrtc_video_capturer_adapter.h"
 #include "remoting/protocol/webrtc_video_stream.h"
-#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
-#include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h"
-#include "third_party/libjingle/source/talk/app/webrtc/test/fakeconstraints.h"
-#include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"
+#include "third_party/webrtc/api/mediastreaminterface.h"
+#include "third_party/webrtc/api/peerconnectioninterface.h"
+#include "third_party/webrtc/api/test/fakeconstraints.h"
+#include "third_party/webrtc/api/videosourceinterface.h"
 
 namespace remoting {
 namespace protocol {
 
 // Currently the network thread is also used as worker thread for webrtc.
 //
 // TODO(sergeyu): Figure out if we would benefit from using a separate
 // thread as a worker thread.
 WebrtcConnectionToClient::WebrtcConnectionToClient(
     scoped_ptr<protocol::Session> session,
@@ skipping 129 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (control_dispatcher_ && control_dispatcher_->is_connected() &&
       event_dispatcher_ && event_dispatcher_->is_connected()) {
     event_handler_->OnConnectionChannelsConnected(this);
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting