diff options
author | hellner <hellner@chromium.org> | 2014-10-29 11:23:14 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-29 18:23:39 +0000 |
commit | 4e40bbe50a102784984852ca318dbcd2b03fc9fc (patch) | |
tree | 76f3afa944d2dda1c7f76a29f43e66bade3ab667 /remoting/signaling | |
parent | 9bc50696509edce28d25653b19eef51b099a3781 (diff) | |
download | chromium_src-4e40bbe50a102784984852ca318dbcd2b03fc9fc.zip chromium_src-4e40bbe50a102784984852ca318dbcd2b03fc9fc.tar.gz chromium_src-4e40bbe50a102784984852ca318dbcd2b03fc9fc.tar.bz2 |
Roll WebRTC 7546:7549.
TBR=hellner@chromium.org
NOTRY=true
BUG=N/A
Review URL: https://codereview.chromium.org/653203005
Cr-Commit-Position: refs/heads/master@{#301879}
Diffstat (limited to 'remoting/signaling')
-rw-r--r-- | remoting/signaling/fake_signal_strategy.cc | 2 | ||||
-rw-r--r-- | remoting/signaling/iq_sender.cc | 2 | ||||
-rw-r--r-- | remoting/signaling/iq_sender_unittest.cc | 2 | ||||
-rw-r--r-- | remoting/signaling/jingle_info_request.cc | 2 | ||||
-rw-r--r-- | remoting/signaling/log_to_server.cc | 2 | ||||
-rw-r--r-- | remoting/signaling/xmpp_signal_strategy.cc | 4 | ||||
-rw-r--r-- | remoting/signaling/xmpp_signal_strategy.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/remoting/signaling/fake_signal_strategy.cc b/remoting/signaling/fake_signal_strategy.cc index 4815ef5..62c4ead 100644 --- a/remoting/signaling/fake_signal_strategy.cc +++ b/remoting/signaling/fake_signal_strategy.cc @@ -11,8 +11,8 @@ #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/thread_task_runner_handle.h" -#include "third_party/libjingle/source/talk/xmpp/constants.h" #include "third_party/webrtc/libjingle/xmllite/xmlelement.h" +#include "third_party/webrtc/libjingle/xmpp/constants.h" namespace remoting { diff --git a/remoting/signaling/iq_sender.cc b/remoting/signaling/iq_sender.cc index c7af213..f277936 100644 --- a/remoting/signaling/iq_sender.cc +++ b/remoting/signaling/iq_sender.cc @@ -13,8 +13,8 @@ #include "base/thread_task_runner_handle.h" #include "base/time/time.h" #include "remoting/signaling/signal_strategy.h" -#include "third_party/libjingle/source/talk/xmpp/constants.h" #include "third_party/webrtc/libjingle/xmllite/xmlelement.h" +#include "third_party/webrtc/libjingle/xmpp/constants.h" namespace remoting { diff --git a/remoting/signaling/iq_sender_unittest.cc b/remoting/signaling/iq_sender_unittest.cc index 5c84816..be305cc 100644 --- a/remoting/signaling/iq_sender_unittest.cc +++ b/remoting/signaling/iq_sender_unittest.cc @@ -11,8 +11,8 @@ #include "remoting/signaling/mock_signal_strategy.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/libjingle/source/talk/xmpp/constants.h" #include "third_party/webrtc/libjingle/xmllite/xmlelement.h" +#include "third_party/webrtc/libjingle/xmpp/constants.h" using ::testing::_; using ::testing::DeleteArg; diff --git a/remoting/signaling/jingle_info_request.cc b/remoting/signaling/jingle_info_request.cc index b935eed..2795821 100644 --- a/remoting/signaling/jingle_info_request.cc +++ b/remoting/signaling/jingle_info_request.cc @@ -11,9 +11,9 @@ #include "base/time/time.h" #include "net/base/net_util.h" #include "remoting/signaling/iq_sender.h" -#include "third_party/libjingle/source/talk/xmpp/constants.h" #include "third_party/webrtc/base/socketaddress.h" #include "third_party/webrtc/libjingle/xmllite/xmlelement.h" +#include "third_party/webrtc/libjingle/xmpp/constants.h" namespace remoting { diff --git a/remoting/signaling/log_to_server.cc b/remoting/signaling/log_to_server.cc index 51856b9..dd6d93d 100644 --- a/remoting/signaling/log_to_server.cc +++ b/remoting/signaling/log_to_server.cc @@ -7,8 +7,8 @@ #include "remoting/base/constants.h" #include "remoting/signaling/iq_sender.h" #include "remoting/signaling/signal_strategy.h" -#include "third_party/libjingle/source/talk/xmpp/constants.h" #include "third_party/webrtc/libjingle/xmllite/xmlelement.h" +#include "third_party/webrtc/libjingle/xmpp/constants.h" using buzz::QName; using buzz::XmlElement; diff --git a/remoting/signaling/xmpp_signal_strategy.cc b/remoting/signaling/xmpp_signal_strategy.cc index 9b32a63..864ddb7 100644 --- a/remoting/signaling/xmpp_signal_strategy.cc +++ b/remoting/signaling/xmpp_signal_strategy.cc @@ -17,9 +17,9 @@ #include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h" #include "net/socket/client_socket_factory.h" #include "net/url_request/url_request_context_getter.h" -#include "third_party/libjingle/source/talk/xmpp/prexmppauth.h" -#include "third_party/libjingle/source/talk/xmpp/saslcookiemechanism.h" #include "third_party/webrtc/base/thread.h" +#include "third_party/webrtc/libjingle/xmpp/prexmppauth.h" +#include "third_party/webrtc/libjingle/xmpp/saslcookiemechanism.h" const char kDefaultResourceName[] = "chromoting"; diff --git a/remoting/signaling/xmpp_signal_strategy.h b/remoting/signaling/xmpp_signal_strategy.h index 2f378bf..5216d77 100644 --- a/remoting/signaling/xmpp_signal_strategy.h +++ b/remoting/signaling/xmpp_signal_strategy.h @@ -18,8 +18,8 @@ #include "base/observer_list.h" #include "base/threading/non_thread_safe.h" #include "base/timer/timer.h" -#include "third_party/libjingle/source/talk/xmpp/xmppclient.h" #include "third_party/webrtc/base/sigslot.h" +#include "third_party/webrtc/libjingle/xmpp/xmppclient.h" namespace net { class ClientSocketFactory; |