Commit f0e410bf authored by kjellander's avatar kjellander Committed by Commit bot

Add xmllite and xmpp sources to third_party/

Add third_party/xmllite and third_party/xmpp source repos,
which used to be located in third_party/webrtc/libjingle since
the code is no longer used by WebRTC; only Chromium.

Modifications made:
* Include paths in jingle/ and remoting/ are updated to reflect
  the new location of xmllite and xmpp.
* Include paths in third_party/libjingle_xmpp/xmllite and
  third_party/libjingle_xmpp/xmpp are updated to reflect the new
  absolute paths to their own headers.
* Update previous include paths using non-absolute paths referencing
  "webrtc/libjingle/xmpp" to third_party/libjingle_xmpp/xmpp.
* Update includes from webrtc/ to third_party/webrtc
* Update includes of webrtc/base/logging.h to third_party/webrtc_overrides/webrtc/base/logging.h
* Added DEPS file in each folder, to restrict includes.

BUG=webrtc:5539

Review-Url: https://codereview.chromium.org/2443903004
Cr-Commit-Position: refs/heads/master@{#441371}
parent e22df5e2
......@@ -100,8 +100,7 @@ if (enable_webrtc || !is_android) {
public_deps = [
"//third_party/libjingle",
"//third_party/webrtc/libjingle/xmllite",
"//third_party/webrtc/libjingle/xmpp",
"//third_party/libjingle_xmpp",
]
deps = [
":jingle_glue",
......@@ -173,8 +172,7 @@ if (enable_webrtc || !is_android) {
public_deps = [
"//third_party/libjingle",
"//third_party/webrtc/libjingle/xmllite",
"//third_party/webrtc/libjingle/xmpp",
"//third_party/libjingle_xmpp",
]
deps = [
":jingle_glue",
......
include_rules = [
"+net",
"+third_party/libjingle",
"+third_party/webrtc/libjingle",
"+third_party/libjingle_xmpp/xmllite",
"+third_party/libjingle_xmpp/xmpp",
]
......@@ -23,7 +23,7 @@
#include "base/memory/weak_ptr.h"
#include "net/base/completion_callback.h"
#include "net/base/net_errors.h"
#include "third_party/webrtc/libjingle/xmpp/asyncsocket.h"
#include "third_party/libjingle_xmpp/xmpp/asyncsocket.h"
namespace net {
class IOBufferWithSize;
......
include_rules = [
# notifier depends on libjingle.
"+talk/base",
"+talk/xmpp",
"+talk/xmllite",
"+webrtc/libjingle",
"+webrtc/base",
"+third_party/libjingle_xmpp/xmpp",
"+third_party/libjingle_xmpp/xmllite",
]
......@@ -8,7 +8,7 @@
#include "jingle/notifier/base/fake_base_task.h"
#include "jingle/notifier/base/weak_xmpp_client.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "webrtc/libjingle/xmpp/asyncsocket.h"
#include "third_party/libjingle_xmpp/xmpp/asyncsocket.h"
namespace notifier {
......
......@@ -8,9 +8,9 @@
#include "base/logging.h"
#include "base/macros.h"
#include "third_party/libjingle_xmpp/xmpp/constants.h"
#include "third_party/libjingle_xmpp/xmpp/saslcookiemechanism.h"
#include "webrtc/base/socketaddress.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/saslcookiemechanism.h"
namespace notifier {
......
......@@ -9,7 +9,7 @@
#include <vector>
#include "base/compiler_specific.h"
#include "webrtc/libjingle/xmpp/prexmppauth.h"
#include "third_party/libjingle_xmpp/xmpp/prexmppauth.h"
namespace notifier {
......
......@@ -7,8 +7,8 @@
#include "base/logging.h"
#include "jingle/notifier/base/const_communicator.h"
#include "jingle/notifier/base/notifier_options.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/jid.h"
#include "third_party/libjingle_xmpp/xmpp/constants.h"
#include "third_party/libjingle_xmpp/xmpp/jid.h"
namespace notifier {
......
......@@ -11,7 +11,7 @@
#include <vector>
#include "jingle/notifier/base/server_information.h"
#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclientsettings.h"
namespace notifier {
......
......@@ -13,7 +13,7 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "webrtc/libjingle/xmpp/xmppclient.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclient.h"
namespace rtc {
class TaskParent;
......
......@@ -17,7 +17,7 @@
#include "net/socket/client_socket_factory.h"
#include "net/ssl/ssl_config_service.h"
#include "net/url_request/url_request_context.h"
#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclientsettings.h"
namespace notifier {
......
......@@ -15,8 +15,8 @@
#include "base/memory/weak_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "net/url_request/url_request_context_getter.h"
#include "third_party/libjingle_xmpp/xmpp/xmppengine.h"
#include "webrtc/base/sigslot.h"
#include "webrtc/libjingle/xmpp/xmppengine.h"
namespace buzz {
class PreXmppAuth;
......
......@@ -21,8 +21,8 @@
#include "net/url_request/url_request_test_util.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/libjingle/xmpp/prexmppauth.h"
#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
#include "third_party/libjingle_xmpp/xmpp/prexmppauth.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclientsettings.h"
namespace buzz {
class CaptchaChallenge;
......
......@@ -8,10 +8,10 @@
#include "base/logging.h"
#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
// Ideally we shouldn't include anything from talk/p2p, but we need
// the definition of ProtocolType. Don't use any functions from
// port.h, since it won't link.
#include "third_party/libjingle_xmpp/xmpp/xmppclientsettings.h"
#include "webrtc/p2p/base/port.h"
namespace notifier {
......
......@@ -10,17 +10,17 @@
#include "base/rand_util.h"
#include "base/time/time.h"
#include "net/base/host_port_pair.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmpp/asyncsocket.h"
#include "third_party/libjingle_xmpp/xmpp/prexmppauth.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclient.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclientsettings.h"
#include "third_party/libjingle_xmpp/xmpp/xmppengine.h"
#include "webrtc/base/common.h"
#include "webrtc/base/firewallsocketserver.h"
#include "webrtc/base/logging.h"
#include "webrtc/base/physicalsocketserver.h"
#include "webrtc/base/taskrunner.h"
#include "webrtc/libjingle/xmpp/asyncsocket.h"
#include "webrtc/libjingle/xmpp/prexmppauth.h"
#include "webrtc/libjingle/xmpp/xmppclient.h"
#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
#include "webrtc/libjingle/xmpp/xmppengine.h"
namespace notifier {
......
......@@ -18,7 +18,7 @@
#include "jingle/notifier/communicator/login_settings.h"
#include "jingle/notifier/communicator/single_login_attempt.h"
#include "net/base/network_change_notifier.h"
#include "webrtc/libjingle/xmpp/xmppengine.h"
#include "third_party/libjingle_xmpp/xmpp/xmppengine.h"
namespace buzz {
class XmppClientSettings;
......
......@@ -10,7 +10,7 @@
#include "base/time/time.h"
#include "jingle/notifier/base/server_information.h"
#include "net/url_request/url_request_context_getter.h"
#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclientsettings.h"
namespace notifier {
......
......@@ -7,7 +7,7 @@
#include <cstddef>
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclientsettings.h"
namespace notifier {
......
......@@ -16,9 +16,9 @@
#include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
#include "jingle/notifier/listener/xml_element_util.h"
#include "net/base/host_port_pair.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmpp/constants.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclientsettings.h"
namespace notifier {
......
......@@ -12,7 +12,7 @@
#include "jingle/notifier/base/xmpp_connection.h"
#include "jingle/notifier/communicator/connection_settings.h"
#include "jingle/notifier/communicator/login_settings.h"
#include "webrtc/libjingle/xmpp/xmppengine.h"
#include "third_party/libjingle_xmpp/xmpp/xmppengine.h"
namespace buzz {
class XmppTaskParentInterface;
......
......@@ -17,9 +17,9 @@
#include "net/dns/mock_host_resolver.h"
#include "net/url_request/url_request_test_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/xmppengine.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmpp/constants.h"
#include "third_party/libjingle_xmpp/xmpp/xmppengine.h"
namespace buzz {
class XmppTaskParentInterface;
......
......@@ -9,12 +9,12 @@
#include "jingle/notifier/listener/notification_constants.h"
#include "jingle/notifier/listener/notification_defines.h"
#include "jingle/notifier/listener/xml_element_util.h"
#include "third_party/webrtc/libjingle/xmllite/qname.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmllite/qname.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmpp/constants.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclient.h"
#include "third_party/libjingle_xmpp/xmpp/xmppengine.h"
#include "webrtc/base/task.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/xmppclient.h"
#include "webrtc/libjingle/xmpp/xmppengine.h"
namespace notifier {
......
......@@ -15,7 +15,7 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "webrtc/libjingle/xmpp/xmpptask.h"
#include "third_party/libjingle_xmpp/xmpp/xmpptask.h"
namespace buzz {
class XmlElement;
......
......@@ -13,11 +13,11 @@
#include "base/logging.h"
#include "jingle/notifier/listener/notification_constants.h"
#include "jingle/notifier/listener/xml_element_util.h"
#include "third_party/webrtc/libjingle/xmllite/qname.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/jid.h"
#include "webrtc/libjingle/xmpp/xmppclient.h"
#include "third_party/libjingle_xmpp/xmllite/qname.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmpp/constants.h"
#include "third_party/libjingle_xmpp/xmpp/jid.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclient.h"
namespace notifier {
......
......@@ -11,7 +11,7 @@
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "jingle/notifier/listener/notification_defines.h"
#include "webrtc/libjingle/xmpp/xmpptask.h"
#include "third_party/libjingle_xmpp/xmpp/xmpptask.h"
namespace buzz {
class Jid;
......
......@@ -11,7 +11,7 @@
#include "base/strings/stringprintf.h"
#include "jingle/notifier/listener/xml_element_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/libjingle/xmpp/jid.h"
#include "third_party/libjingle_xmpp/xmpp/jid.h"
namespace buzz {
class XmlElement;
......
......@@ -10,12 +10,12 @@
#include "base/logging.h"
#include "jingle/notifier/listener/notification_constants.h"
#include "jingle/notifier/listener/xml_element_util.h"
#include "third_party/webrtc/libjingle/xmllite/qname.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmllite/qname.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmpp/constants.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclient.h"
#include "third_party/libjingle_xmpp/xmpp/xmppengine.h"
#include "webrtc/base/task.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/xmppclient.h"
#include "webrtc/libjingle/xmpp/xmppengine.h"
namespace notifier {
......
......@@ -14,8 +14,8 @@
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "jingle/notifier/listener/notification_defines.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "webrtc/libjingle/xmpp/xmpptask.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmpp/xmpptask.h"
namespace notifier {
class PushNotificationsSubscribeTask : public buzz::XmppTask {
......
......@@ -10,7 +10,7 @@
#include "base/strings/stringprintf.h"
#include "jingle/notifier/listener/xml_element_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/libjingle/xmpp/jid.h"
#include "third_party/libjingle_xmpp/xmpp/jid.h"
namespace buzz {
class XmlElement;
......
......@@ -9,11 +9,11 @@
#include "base/logging.h"
#include "jingle/notifier/listener/xml_element_util.h"
#include "third_party/webrtc/libjingle/xmllite/qname.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "webrtc/libjingle/xmpp/constants.h"
#include "webrtc/libjingle/xmpp/jid.h"
#include "webrtc/libjingle/xmpp/xmppclient.h"
#include "third_party/libjingle_xmpp/xmllite/qname.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmpp/constants.h"
#include "third_party/libjingle_xmpp/xmpp/jid.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclient.h"
namespace notifier {
......
......@@ -10,7 +10,7 @@
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "webrtc/libjingle/xmpp/xmpptask.h"
#include "third_party/libjingle_xmpp/xmpp/xmpptask.h"
namespace buzz {
class XmlElement;
......
......@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "jingle/notifier/listener/xml_element_util.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/libjingle/xmpp/jid.h"
#include "third_party/libjingle_xmpp/xmpp/jid.h"
namespace buzz {
class XmlElement;
......
......@@ -8,10 +8,10 @@
#include <string>
#include "base/strings/string_number_conversions.h"
#include "third_party/webrtc/libjingle/xmllite/qname.h"
#include "third_party/webrtc/libjingle/xmllite/xmlconstants.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/webrtc/libjingle/xmllite/xmlprinter.h"
#include "third_party/libjingle_xmpp/xmllite/qname.h"
#include "third_party/libjingle_xmpp/xmllite/xmlconstants.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmllite/xmlprinter.h"
namespace notifier {
......
......@@ -9,9 +9,9 @@
#include <string>
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/libjingle/xmllite/qname.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/webrtc/libjingle/xmllite/xmlprinter.h"
#include "third_party/libjingle_xmpp/xmllite/qname.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmllite/xmlprinter.h"
namespace buzz {
class XmlElement;
......
......@@ -22,7 +22,7 @@
#include "jingle/notifier/listener/push_notifications_listen_task.h"
#include "jingle/notifier/listener/push_notifications_subscribe_task.h"
#include "jingle/notifier/listener/send_ping_task.h"
#include "webrtc/libjingle/xmpp/xmppclientsettings.h"
#include "third_party/libjingle_xmpp/xmpp/xmppclientsettings.h"
namespace buzz {
class XmppTaskParentInterface;
......
......@@ -11,10 +11,10 @@ include_rules = [
"+third_party/libvpx",
"+third_party/libyuv",
"+third_party/webrtc/base",
"+third_party/webrtc/libjingle",
"+third_party/webrtc/media",
"+third_party/webrtc/p2p",
"+third_party/webrtc/modules/desktop_capture",
"+third_party/libjingle_xmpp/xmllite",
"+ui/base/keycodes",
"+ui/base/l10n",
"+ui/base/resource",
......
......@@ -11,7 +11,7 @@
#include "remoting/signaling/server_log_entry_unittest.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
using buzz::XmlElement;
using buzz::QName;
......
......@@ -12,7 +12,7 @@
#include "remoting/signaling/server_log_entry.h"
#include "remoting/signaling/server_log_entry_unittest.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
using base::SysInfo;
using buzz::XmlAttr;
......
......@@ -471,8 +471,7 @@ static_library("test_support") {
if (enable_webrtc) {
public_deps += [
"//third_party/libjingle/webrtc:libjingle_webrtc",
"//third_party/webrtc/libjingle/xmllite",
"//third_party/webrtc/libjingle/xmpp",
"//third_party/libjingle_xmpp",
"//third_party/webrtc/modules/desktop_capture",
]
}
......@@ -625,8 +624,7 @@ if (enable_remoting_host) {
if (enable_webrtc) {
deps += [
"//third_party/libjingle/webrtc:libjingle_webrtc",
"//third_party/webrtc/libjingle/xmllite",
"//third_party/webrtc/libjingle/xmpp",
"//third_party/libjingle_xmpp",
]
}
}
......@@ -742,8 +740,7 @@ if (enable_me2me_host) {
if (enable_webrtc) {
deps += [
"//third_party/libjingle/webrtc:libjingle_webrtc",
"//third_party/webrtc/libjingle/xmllite",
"//third_party/webrtc/libjingle/xmpp",
"//third_party/libjingle_xmpp",
]
}
......
......@@ -16,6 +16,7 @@ include_rules = [
"+third_party/jsoncpp",
"+third_party/skia",
"+third_party/webrtc",
"+third_party/libjingle_xmpp/xmpp",
"+ui",
]
......
......@@ -22,8 +22,8 @@
#include "remoting/signaling/jid_util.h"
#include "remoting/signaling/server_log_entry.h"
#include "remoting/signaling/signal_strategy.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/webrtc/libjingle/xmpp/constants.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmpp/constants.h"
using buzz::QName;
using buzz::XmlElement;
......
......@@ -17,8 +17,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/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/webrtc/libjingle/xmpp/constants.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmpp/constants.h"
using buzz::QName;
using buzz::XmlElement;
......
......@@ -11,8 +11,8 @@
#include "base/threading/thread_task_runner_handle.h"
#include "remoting/base/constants.h"
#include "remoting/protocol/jingle_messages.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/webrtc/libjingle/xmpp/constants.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmpp/constants.h"
using buzz::QName;
using buzz::XmlElement;
......
......@@ -16,8 +16,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/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/webrtc/libjingle/xmpp/constants.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmpp/constants.h"
using buzz::QName;
using buzz::XmlElement;
......
......@@ -11,7 +11,7 @@
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gmock_mutant.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
using buzz::XmlElement;
using buzz::QName;
......
......@@ -15,7 +15,7 @@
#include "remoting/base/logging.h"
#include "remoting/host/username.h"
#include "remoting/protocol/channel_authenticator.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
namespace remoting {
......
......@@ -17,8 +17,8 @@
#include "remoting/signaling/iq_sender.h"
#include "remoting/signaling/jid_util.h"
#include "remoting/signaling/signal_strategy.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/webrtc/libjingle/xmpp/constants.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmpp/constants.h"
using buzz::QName;
using buzz::XmlElement;
......
......@@ -19,8 +19,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/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/webrtc/libjingle/xmpp/constants.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmpp/constants.h"
using buzz::QName;
using buzz::XmlElement;
......
......@@ -11,7 +11,7 @@
#include "remoting/signaling/server_log_entry.h"
#include "remoting/signaling/server_log_entry_unittest.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
using buzz::XmlAttr;
using buzz::XmlElement;
......
......@@ -243,8 +243,7 @@ static_library("protocol") {
if (enable_webrtc) {
deps += [
"//third_party/libjingle/webrtc:libjingle_webrtc",
"//third_party/webrtc/libjingle/xmllite",
"//third_party/webrtc/libjingle/xmpp",
"//third_party/libjingle_xmpp",
]
} else {
sources -= [
......
......@@ -8,8 +8,8 @@ include_rules = [
"+remoting/codec",
"+remoting/signaling",
"+third_party/boringssl",
"+third_party/libjingle",
"+third_party/webrtc",
"+third_party/libjingle_xmpp/xmpp",
"+third_party/protobuf/src",
"+third_party/webrtc",
"+ui/events/keycodes/dom",
]
......@@ -6,7 +6,7 @@
#include "base/memory/ptr_util.h"
#include "remoting/base/constants.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
namespace remoting {
namespace protocol {
......
......@@ -20,7 +20,7 @@
#include "remoting/protocol/fake_stream_socket.h"
#include "remoting/protocol/p2p_stream_socket.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
using testing::_;
using testing::SaveArg;
......
......@@ -13,7 +13,7 @@
#include "remoting/base/constants.h"
#include "remoting/protocol/authenticator.h"
#include "remoting/protocol/name_value_map.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
using buzz::QName;
using buzz::XmlElement;
......
......@@ -11,7 +11,7 @@
#include "remoting/protocol/authenticator.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
namespace remoting {
namespace protocol {
......
......@@ -17,7 +17,7 @@
#include "remoting/base/constants.h"
#include "remoting/protocol/p2p_stream_socket.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
#include "third_party/libjingle_xmpp/xmllite/xmlelement.h"