Roll WebRTC 11523:11548, Libjingle 11522:11545

remoting/host/cast_extension_session.cc

 // Copyright 2014 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/host/cast_extension_session.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/thread_task_runner_handle.h"
 #include "remoting/host/client_session.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/port_allocator_factory.h"
 #include "remoting/protocol/transport_context.h"
 #include "remoting/protocol/webrtc_video_capturer_adapter.h"
-#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.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/test/fakeconstraints.h"
+#include "third_party/webrtc/api/videosourceinterface.h"
 
 namespace remoting {
 
 // Used as the type attribute of all Cast protocol::ExtensionMessages.
 const char kExtensionMessageType[] = "cast_message";
 
 // Top-level keys used in all extension messages between host and client.
 // Must keep synced with webapp.
 const char kTopLevelData[] = "chromoting_data";
 const char kTopLevelSubject[] = "subject";
@@ skipping 596 matching lines @@
   json.SetString(kWebRtcCandidate, candidate_str);
   std::string json_str;
   if (!base::JSONWriter::Write(json, &json_str)) {
     LOG(ERROR) << "Failed to serialize candidate message.";
     return;
   }
   SendMessageToClient(kSubjectNewCandidate, json_str);
 }
 
 }  // namespace remoting