diff options
| author | kjellander <kjellander@chromium.org> | 2016-02-10 06:51:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-10 14:52:27 +0000 |
| commit | 97705458c34b46dbf3c00fe0cac257e30d94eb4e (patch) | |
| tree | 39ae78dc601be3b6488bce8ae7f8a0819a7ce51a /remoting/protocol | |
| parent | d9a25193e2021ec2cbfd18d5dd348c7380c43ace (diff) | |
| download | chromium_src-97705458c34b46dbf3c00fe0cac257e30d94eb4e.zip chromium_src-97705458c34b46dbf3c00fe0cac257e30d94eb4e.tar.gz chromium_src-97705458c34b46dbf3c00fe0cac257e30d94eb4e.tar.bz2 | |
Roll WebRTC 11523:11548, Libjingle 11522:11545
WebRTC 11523:11548
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/4def420..608b2be
Libjingle 11522:11545
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/01cbe5b..bb467ca
Updated libjingle GYP+GN for talk/app/webrtc move that happened in
https://codereview.webrtc.org/1610243002/
TBR=tommi@chromium.org, sergeyu@chromium.org
BUG=webrtc:5418
Review URL: https://codereview.chromium.org/1615433002
Cr-Commit-Position: refs/heads/master@{#374655}
Diffstat (limited to 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/webrtc_connection_to_client.cc | 8 | ||||
| -rw-r--r-- | remoting/protocol/webrtc_data_stream_adapter.h | 2 | ||||
| -rw-r--r-- | remoting/protocol/webrtc_transport.cc | 2 | ||||
| -rw-r--r-- | remoting/protocol/webrtc_transport.h | 2 | ||||
| -rw-r--r-- | remoting/protocol/webrtc_video_renderer_adapter.h | 2 | ||||
| -rw-r--r-- | remoting/protocol/webrtc_video_stream.cc | 8 |
6 files changed, 12 insertions, 12 deletions
diff --git a/remoting/protocol/webrtc_connection_to_client.cc b/remoting/protocol/webrtc_connection_to_client.cc index 3173dcf..1febc42 100644 --- a/remoting/protocol/webrtc_connection_to_client.cc +++ b/remoting/protocol/webrtc_connection_to_client.cc @@ -23,10 +23,10 @@ #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 { diff --git a/remoting/protocol/webrtc_data_stream_adapter.h b/remoting/protocol/webrtc_data_stream_adapter.h index a05a149..9d6262d 100644 --- a/remoting/protocol/webrtc_data_stream_adapter.h +++ b/remoting/protocol/webrtc_data_stream_adapter.h @@ -12,7 +12,7 @@ #include "base/memory/weak_ptr.h" #include "remoting/protocol/errors.h" #include "remoting/protocol/message_channel_factory.h" -#include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h" +#include "third_party/webrtc/api/peerconnectioninterface.h" #include "third_party/webrtc/base/refcount.h" namespace rtc { diff --git a/remoting/protocol/webrtc_transport.cc b/remoting/protocol/webrtc_transport.cc index eb13567..105330c 100644 --- a/remoting/protocol/webrtc_transport.cc +++ b/remoting/protocol/webrtc_transport.cc @@ -15,7 +15,7 @@ #include "jingle/glue/thread_wrapper.h" #include "remoting/protocol/stream_message_pipe_adapter.h" #include "remoting/protocol/transport_context.h" -#include "third_party/libjingle/source/talk/app/webrtc/test/fakeconstraints.h" +#include "third_party/webrtc/api/test/fakeconstraints.h" #include "third_party/webrtc/libjingle/xmllite/xmlelement.h" #include "third_party/webrtc/modules/audio_device/include/fake_audio_device.h" diff --git a/remoting/protocol/webrtc_transport.h b/remoting/protocol/webrtc_transport.h index 7762691..bf42467 100644 --- a/remoting/protocol/webrtc_transport.h +++ b/remoting/protocol/webrtc_transport.h @@ -16,7 +16,7 @@ #include "remoting/protocol/transport.h" #include "remoting/protocol/webrtc_data_stream_adapter.h" #include "remoting/signaling/signal_strategy.h" -#include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h" +#include "third_party/webrtc/api/peerconnectioninterface.h" namespace webrtc { class FakeAudioDeviceModule; diff --git a/remoting/protocol/webrtc_video_renderer_adapter.h b/remoting/protocol/webrtc_video_renderer_adapter.h index 87efcc9..e9cbb72 100644 --- a/remoting/protocol/webrtc_video_renderer_adapter.h +++ b/remoting/protocol/webrtc_video_renderer_adapter.h @@ -7,7 +7,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" -#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" +#include "third_party/webrtc/api/mediastreaminterface.h" namespace base { class SingleThreadTaskRunner; diff --git a/remoting/protocol/webrtc_video_stream.cc b/remoting/protocol/webrtc_video_stream.cc index 07e215e..f377613 100644 --- a/remoting/protocol/webrtc_video_stream.cc +++ b/remoting/protocol/webrtc_video_stream.cc @@ -6,10 +6,10 @@ #include "base/logging.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/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 { |