From fa4535b270d5f0d8575dffb4e60f1225751f77f0 Mon Sep 17 00:00:00 2001 From: "buildbot@webrtc.org" Date: Wed, 3 Sep 2014 16:49:04 +0000 Subject: [PATCH] (Auto)update libjingle 74694022-> 74696326 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7045 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/libjingle.gyp | 1 + talk/p2p/base/constants.cc | 2 +- talk/p2p/base/constants.h | 2 +- talk/p2p/base/p2ptransport.cc | 4 ++-- talk/p2p/base/parsing.h | 2 +- talk/p2p/base/rawtransport.cc | 4 ++-- talk/p2p/base/rawtransportchannel.cc | 4 ++-- talk/p2p/base/session.h | 2 +- talk/p2p/base/sessiondescription.cc | 2 +- talk/p2p/base/sessionmessages.cc | 2 +- talk/p2p/base/sessionmessages.h | 2 +- talk/p2p/base/transport.cc | 2 +- talk/p2p/base/transport_unittest.cc | 2 +- talk/session/media/mediamessages.cc | 2 +- talk/session/media/mediamessages_unittest.cc | 2 +- talk/session/media/mediasessionclient.cc | 4 ++-- talk/session/media/mediasessionclient_unittest.cc | 6 +++--- talk/session/tunnel/securetunnelsessionclient.cc | 2 +- talk/session/tunnel/tunnelsessionclient.cc | 2 +- talk/session/tunnel/tunnelsessionclient.h | 2 +- talk/xmpp/constants.cc | 6 +++--- talk/xmpp/constants.h | 2 +- talk/xmpp/hangoutpubsubclient.cc | 4 ++-- talk/xmpp/hangoutpubsubclient_unittest.cc | 4 ++-- talk/xmpp/jid.h | 2 +- talk/xmpp/mucroomconfigtask_unittest.cc | 2 +- talk/xmpp/mucroomdiscoverytask_unittest.cc | 2 +- talk/xmpp/mucroomlookuptask_unittest.cc | 2 +- talk/xmpp/mucroomuniquehangoutidtask_unittest.cc | 2 +- talk/xmpp/pingtask_unittest.cc | 2 +- talk/xmpp/pubsub_task.h | 2 +- talk/xmpp/pubsubclient_unittest.cc | 4 ++-- talk/xmpp/pubsubstateclient.h | 4 ++-- talk/xmpp/pubsubtasks_unittest.cc | 4 ++-- talk/xmpp/rostermodule_unittest.cc | 2 +- talk/xmpp/saslcookiemechanism.h | 4 ++-- talk/xmpp/saslmechanism.cc | 2 +- talk/xmpp/util_unittest.cc | 2 +- talk/xmpp/xmppengine.h | 4 ++-- talk/xmpp/xmppengine_unittest.cc | 2 +- talk/xmpp/xmppengineimpl.cc | 4 ++-- talk/xmpp/xmpplogintask.cc | 2 +- talk/xmpp/xmpplogintask_unittest.cc | 2 +- talk/xmpp/xmppstanzaparser.cc | 2 +- talk/xmpp/xmppstanzaparser.h | 4 ++-- talk/xmpp/xmppstanzaparser_unittest.cc | 2 +- 46 files changed, 63 insertions(+), 62 deletions(-) diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index 5f75226141..ba63f29d96 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -459,6 +459,7 @@ '<(webrtc_root)/sound/sound.gyp:rtc_sound', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers', '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:field_trial_default', + '<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite', 'libjingle', 'libjingle_sound', ], diff --git a/talk/p2p/base/constants.cc b/talk/p2p/base/constants.cc index 2e57d9d18d..278a615bbe 100644 --- a/talk/p2p/base/constants.cc +++ b/talk/p2p/base/constants.cc @@ -29,7 +29,7 @@ #include -#include "talk/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/qname.h" namespace cricket { diff --git a/talk/p2p/base/constants.h b/talk/p2p/base/constants.h index 61dd815b38..4cd1166301 100644 --- a/talk/p2p/base/constants.h +++ b/talk/p2p/base/constants.h @@ -29,7 +29,7 @@ #define TALK_P2P_BASE_CONSTANTS_H_ #include -#include "talk/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/qname.h" // This file contains constants related to signaling that are used in various // classes in this directory. diff --git a/talk/p2p/base/p2ptransport.cc b/talk/p2p/base/p2ptransport.cc index b992cc0e02..06941ac6cd 100644 --- a/talk/p2p/base/p2ptransport.cc +++ b/talk/p2p/base/p2ptransport.cc @@ -35,8 +35,8 @@ #include "talk/p2p/base/parsing.h" #include "talk/p2p/base/sessionmanager.h" #include "talk/p2p/base/sessionmessages.h" -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "webrtc/base/base64.h" #include "webrtc/base/common.h" diff --git a/talk/p2p/base/parsing.h b/talk/p2p/base/parsing.h index 635b122b39..2aab2f8168 100644 --- a/talk/p2p/base/parsing.h +++ b/talk/p2p/base/parsing.h @@ -30,7 +30,7 @@ #include #include -#include "talk/xmllite/xmlelement.h" // Needed to delete ParseError.extra. +#include "webrtc/libjingle/xmllite/xmlelement.h" // Needed to delete ParseError.extra. #include "webrtc/base/basictypes.h" #include "webrtc/base/stringencode.h" diff --git a/talk/p2p/base/rawtransport.cc b/talk/p2p/base/rawtransport.cc index 59131771a9..2af18644ce 100644 --- a/talk/p2p/base/rawtransport.cc +++ b/talk/p2p/base/rawtransport.cc @@ -32,8 +32,8 @@ #include "talk/p2p/base/rawtransport.h" #include "talk/p2p/base/rawtransportchannel.h" #include "talk/p2p/base/sessionmanager.h" -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "webrtc/base/common.h" diff --git a/talk/p2p/base/rawtransportchannel.cc b/talk/p2p/base/rawtransportchannel.cc index ef0a532202..ae268e35e3 100644 --- a/talk/p2p/base/rawtransportchannel.cc +++ b/talk/p2p/base/rawtransportchannel.cc @@ -36,8 +36,8 @@ #include "talk/p2p/base/relayport.h" #include "talk/p2p/base/sessionmanager.h" #include "talk/p2p/base/stunport.h" -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "webrtc/base/common.h" diff --git a/talk/p2p/base/session.h b/talk/p2p/base/session.h index 756bbe0ad2..e06cf00c1a 100644 --- a/talk/p2p/base/session.h +++ b/talk/p2p/base/session.h @@ -39,7 +39,7 @@ #include "talk/p2p/base/sessionmanager.h" #include "talk/p2p/base/sessionmessages.h" #include "talk/p2p/base/transport.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "webrtc/base/refcount.h" #include "webrtc/base/scoped_ptr.h" diff --git a/talk/p2p/base/sessiondescription.cc b/talk/p2p/base/sessiondescription.cc index 7009aa87ae..7ad3d48908 100644 --- a/talk/p2p/base/sessiondescription.cc +++ b/talk/p2p/base/sessiondescription.cc @@ -27,7 +27,7 @@ #include "talk/p2p/base/sessiondescription.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" namespace cricket { diff --git a/talk/p2p/base/sessionmessages.cc b/talk/p2p/base/sessionmessages.cc index bfba2736fb..b2fd9d60d3 100644 --- a/talk/p2p/base/sessionmessages.cc +++ b/talk/p2p/base/sessionmessages.cc @@ -36,7 +36,7 @@ #include "talk/p2p/base/sessionclient.h" #include "talk/p2p/base/sessiondescription.h" #include "talk/p2p/base/transport.h" -#include "talk/xmllite/xmlconstants.h" +#include "webrtc/libjingle/xmllite/xmlconstants.h" #include "talk/xmpp/constants.h" #include "webrtc/base/logging.h" #include "webrtc/base/scoped_ptr.h" diff --git a/talk/p2p/base/sessionmessages.h b/talk/p2p/base/sessionmessages.h index 38fca98f33..7e1f8ac3ad 100644 --- a/talk/p2p/base/sessionmessages.h +++ b/talk/p2p/base/sessionmessages.h @@ -36,7 +36,7 @@ #include "talk/p2p/base/parsing.h" #include "talk/p2p/base/sessiondescription.h" // Needed to delete contents. #include "talk/p2p/base/transportinfo.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "webrtc/base/basictypes.h" namespace cricket { diff --git a/talk/p2p/base/transport.cc b/talk/p2p/base/transport.cc index 6ee7b2a7ef..d88f5e70b9 100644 --- a/talk/p2p/base/transport.cc +++ b/talk/p2p/base/transport.cc @@ -33,7 +33,7 @@ #include "talk/p2p/base/port.h" #include "talk/p2p/base/sessionmanager.h" #include "talk/p2p/base/transportchannelimpl.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "webrtc/base/bind.h" #include "webrtc/base/common.h" diff --git a/talk/p2p/base/transport_unittest.cc b/talk/p2p/base/transport_unittest.cc index fa2c116627..8f7dae2a18 100644 --- a/talk/p2p/base/transport_unittest.cc +++ b/talk/p2p/base/transport_unittest.cc @@ -31,7 +31,7 @@ #include "talk/p2p/base/parsing.h" #include "talk/p2p/base/rawtransport.h" #include "talk/p2p/base/sessionmessages.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "webrtc/base/fakesslidentity.h" #include "webrtc/base/gunit.h" diff --git a/talk/session/media/mediamessages.cc b/talk/session/media/mediamessages.cc index 1a5094eedb..6c9f681120 100644 --- a/talk/session/media/mediamessages.cc +++ b/talk/session/media/mediamessages.cc @@ -34,7 +34,7 @@ #include "talk/p2p/base/constants.h" #include "talk/p2p/base/parsing.h" #include "talk/session/media/mediasessionclient.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "webrtc/base/logging.h" #include "webrtc/base/stringencode.h" diff --git a/talk/session/media/mediamessages_unittest.cc b/talk/session/media/mediamessages_unittest.cc index c95053d9d5..9ebd38c825 100644 --- a/talk/session/media/mediamessages_unittest.cc +++ b/talk/session/media/mediamessages_unittest.cc @@ -32,7 +32,7 @@ #include "talk/p2p/base/constants.h" #include "talk/session/media/mediasessionclient.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "webrtc/base/gunit.h" #include "webrtc/base/scoped_ptr.h" diff --git a/talk/session/media/mediasessionclient.cc b/talk/session/media/mediasessionclient.cc index a1096b6801..826909aa61 100644 --- a/talk/session/media/mediasessionclient.cc +++ b/talk/session/media/mediasessionclient.cc @@ -36,8 +36,8 @@ #include "talk/p2p/base/parsing.h" #include "talk/session/media/mediamessages.h" #include "talk/session/media/srtpfilter.h" -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlconstants.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlconstants.h" #include "talk/xmpp/constants.h" #include "webrtc/base/helpers.h" #include "webrtc/base/logging.h" diff --git a/talk/session/media/mediasessionclient_unittest.cc b/talk/session/media/mediasessionclient_unittest.cc index 3e36b5a72f..2998228288 100644 --- a/talk/session/media/mediasessionclient_unittest.cc +++ b/talk/session/media/mediasessionclient_unittest.cc @@ -34,9 +34,9 @@ #include "talk/p2p/base/constants.h" #include "talk/p2p/client/basicportallocator.h" #include "talk/session/media/mediasessionclient.h" -#include "talk/xmllite/xmlbuilder.h" -#include "talk/xmllite/xmlelement.h" -#include "talk/xmllite/xmlprinter.h" +#include "webrtc/libjingle/xmllite/xmlbuilder.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlprinter.h" #include "talk/xmpp/constants.h" #include "webrtc/base/gunit.h" #include "webrtc/base/logging.h" diff --git a/talk/session/tunnel/securetunnelsessionclient.cc b/talk/session/tunnel/securetunnelsessionclient.cc index f4a33465bd..cb41c3bafe 100644 --- a/talk/session/tunnel/securetunnelsessionclient.cc +++ b/talk/session/tunnel/securetunnelsessionclient.cc @@ -30,7 +30,7 @@ #include "talk/p2p/base/transportchannel.h" #include "talk/session/tunnel/pseudotcpchannel.h" #include "talk/session/tunnel/securetunnelsessionclient.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "webrtc/base/basicdefs.h" #include "webrtc/base/basictypes.h" #include "webrtc/base/common.h" diff --git a/talk/session/tunnel/tunnelsessionclient.cc b/talk/session/tunnel/tunnelsessionclient.cc index 12275fb0b5..7221db404c 100644 --- a/talk/session/tunnel/tunnelsessionclient.cc +++ b/talk/session/tunnel/tunnelsessionclient.cc @@ -28,7 +28,7 @@ #include "pseudotcpchannel.h" #include "talk/p2p/base/constants.h" #include "talk/p2p/base/transportchannel.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "tunnelsessionclient.h" #include "webrtc/base/basicdefs.h" #include "webrtc/base/basictypes.h" diff --git a/talk/session/tunnel/tunnelsessionclient.h b/talk/session/tunnel/tunnelsessionclient.h index ac12fafd7c..d3fa64aa78 100644 --- a/talk/session/tunnel/tunnelsessionclient.h +++ b/talk/session/tunnel/tunnelsessionclient.h @@ -36,7 +36,7 @@ #include "talk/p2p/base/sessionclient.h" #include "talk/p2p/base/sessiondescription.h" #include "talk/p2p/base/sessionmanager.h" -#include "talk/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/qname.h" #include "talk/xmpp/constants.h" #include "webrtc/base/criticalsection.h" #include "webrtc/base/stream.h" diff --git a/talk/xmpp/constants.cc b/talk/xmpp/constants.cc index a2179cad13..297eafdb30 100644 --- a/talk/xmpp/constants.cc +++ b/talk/xmpp/constants.cc @@ -29,9 +29,9 @@ #include -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlconstants.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlconstants.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/jid.h" #include "webrtc/base/basicdefs.h" diff --git a/talk/xmpp/constants.h b/talk/xmpp/constants.h index 6d940957da..6aa1a54c34 100644 --- a/talk/xmpp/constants.h +++ b/talk/xmpp/constants.h @@ -29,7 +29,7 @@ #define TALK_XMPP_CONSTANTS_H_ #include -#include "talk/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/qname.h" #include "talk/xmpp/jid.h" namespace buzz { diff --git a/talk/xmpp/hangoutpubsubclient.cc b/talk/xmpp/hangoutpubsubclient.cc index 834f844f89..63f5bcfb3c 100644 --- a/talk/xmpp/hangoutpubsubclient.cc +++ b/talk/xmpp/hangoutpubsubclient.cc @@ -27,8 +27,8 @@ #include "talk/xmpp/hangoutpubsubclient.h" -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/jid.h" #include "webrtc/base/logging.h" diff --git a/talk/xmpp/hangoutpubsubclient_unittest.cc b/talk/xmpp/hangoutpubsubclient_unittest.cc index c12b7916a1..555ee5c34a 100644 --- a/talk/xmpp/hangoutpubsubclient_unittest.cc +++ b/talk/xmpp/hangoutpubsubclient_unittest.cc @@ -3,8 +3,8 @@ #include -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/hangoutpubsubclient.h" diff --git a/talk/xmpp/jid.h b/talk/xmpp/jid.h index 7a6370ca24..2bfe0d99d2 100644 --- a/talk/xmpp/jid.h +++ b/talk/xmpp/jid.h @@ -29,7 +29,7 @@ #define TALK_XMPP_JID_H_ #include -#include "talk/xmllite/xmlconstants.h" +#include "webrtc/libjingle/xmllite/xmlconstants.h" #include "webrtc/base/basictypes.h" namespace buzz { diff --git a/talk/xmpp/mucroomconfigtask_unittest.cc b/talk/xmpp/mucroomconfigtask_unittest.cc index 00a9c6edfb..bf5e7b4faf 100644 --- a/talk/xmpp/mucroomconfigtask_unittest.cc +++ b/talk/xmpp/mucroomconfigtask_unittest.cc @@ -28,7 +28,7 @@ #include #include -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/mucroomconfigtask.h" diff --git a/talk/xmpp/mucroomdiscoverytask_unittest.cc b/talk/xmpp/mucroomdiscoverytask_unittest.cc index ef7e477d6c..e1a633efb3 100644 --- a/talk/xmpp/mucroomdiscoverytask_unittest.cc +++ b/talk/xmpp/mucroomdiscoverytask_unittest.cc @@ -28,7 +28,7 @@ #include #include -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/mucroomdiscoverytask.h" diff --git a/talk/xmpp/mucroomlookuptask_unittest.cc b/talk/xmpp/mucroomlookuptask_unittest.cc index 341fd3fed2..03be29245e 100644 --- a/talk/xmpp/mucroomlookuptask_unittest.cc +++ b/talk/xmpp/mucroomlookuptask_unittest.cc @@ -28,7 +28,7 @@ #include #include -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/mucroomlookuptask.h" diff --git a/talk/xmpp/mucroomuniquehangoutidtask_unittest.cc b/talk/xmpp/mucroomuniquehangoutidtask_unittest.cc index 5cabcbe16d..42bed132b7 100644 --- a/talk/xmpp/mucroomuniquehangoutidtask_unittest.cc +++ b/talk/xmpp/mucroomuniquehangoutidtask_unittest.cc @@ -28,7 +28,7 @@ #include #include -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/mucroomuniquehangoutidtask.h" diff --git a/talk/xmpp/pingtask_unittest.cc b/talk/xmpp/pingtask_unittest.cc index ce595a85c0..fe88a5cc9f 100644 --- a/talk/xmpp/pingtask_unittest.cc +++ b/talk/xmpp/pingtask_unittest.cc @@ -28,7 +28,7 @@ #include #include -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/pingtask.h" diff --git a/talk/xmpp/pubsub_task.h b/talk/xmpp/pubsub_task.h index 45a74624af..2787cbc9b8 100644 --- a/talk/xmpp/pubsub_task.h +++ b/talk/xmpp/pubsub_task.h @@ -30,7 +30,7 @@ #include #include -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/xmpptask.h" diff --git a/talk/xmpp/pubsubclient_unittest.cc b/talk/xmpp/pubsubclient_unittest.cc index 135dc37e46..f191a18d10 100644 --- a/talk/xmpp/pubsubclient_unittest.cc +++ b/talk/xmpp/pubsubclient_unittest.cc @@ -3,8 +3,8 @@ #include -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/jid.h" diff --git a/talk/xmpp/pubsubstateclient.h b/talk/xmpp/pubsubstateclient.h index 2acbdaa392..09ef0f454f 100644 --- a/talk/xmpp/pubsubstateclient.h +++ b/talk/xmpp/pubsubstateclient.h @@ -32,8 +32,8 @@ #include #include -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/pubsubclient.h" diff --git a/talk/xmpp/pubsubtasks_unittest.cc b/talk/xmpp/pubsubtasks_unittest.cc index 98cb7c1903..48cd04ab8d 100644 --- a/talk/xmpp/pubsubtasks_unittest.cc +++ b/talk/xmpp/pubsubtasks_unittest.cc @@ -3,8 +3,8 @@ #include -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/fakexmppclient.h" #include "talk/xmpp/iqtask.h" diff --git a/talk/xmpp/rostermodule_unittest.cc b/talk/xmpp/rostermodule_unittest.cc index 0e2b268211..cb7f773b4a 100644 --- a/talk/xmpp/rostermodule_unittest.cc +++ b/talk/xmpp/rostermodule_unittest.cc @@ -29,7 +29,7 @@ #include #include -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/rostermodule.h" #include "talk/xmpp/util_unittest.h" diff --git a/talk/xmpp/saslcookiemechanism.h b/talk/xmpp/saslcookiemechanism.h index 7a19d3e201..eda142c96f 100644 --- a/talk/xmpp/saslcookiemechanism.h +++ b/talk/xmpp/saslcookiemechanism.h @@ -28,8 +28,8 @@ #ifndef TALK_XMPP_SASLCOOKIEMECHANISM_H_ #define TALK_XMPP_SASLCOOKIEMECHANISM_H_ -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/saslmechanism.h" diff --git a/talk/xmpp/saslmechanism.cc b/talk/xmpp/saslmechanism.cc index 488007c2ee..8877084292 100644 --- a/talk/xmpp/saslmechanism.cc +++ b/talk/xmpp/saslmechanism.cc @@ -25,7 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/saslmechanism.h" #include "webrtc/base/base64.h" diff --git a/talk/xmpp/util_unittest.cc b/talk/xmpp/util_unittest.cc index 66fb5ef8d7..3e47d3f664 100644 --- a/talk/xmpp/util_unittest.cc +++ b/talk/xmpp/util_unittest.cc @@ -4,7 +4,7 @@ #include #include #include -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/util_unittest.h" #include "talk/xmpp/xmppengine.h" #include "webrtc/base/gunit.h" diff --git a/talk/xmpp/xmppengine.h b/talk/xmpp/xmppengine.h index 68f10feac4..a092600c30 100644 --- a/talk/xmpp/xmppengine.h +++ b/talk/xmpp/xmppengine.h @@ -29,8 +29,8 @@ #define _xmppengine_h_ // also part of the API -#include "talk/xmllite/qname.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/qname.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/jid.h" diff --git a/talk/xmpp/xmppengine_unittest.cc b/talk/xmpp/xmppengine_unittest.cc index 8d6c858287..b519a65eb6 100644 --- a/talk/xmpp/xmppengine_unittest.cc +++ b/talk/xmpp/xmppengine_unittest.cc @@ -4,7 +4,7 @@ #include #include #include -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/plainsaslhandler.h" #include "talk/xmpp/saslplainmechanism.h" diff --git a/talk/xmpp/xmppengineimpl.cc b/talk/xmpp/xmppengineimpl.cc index bba96a4bbd..5de9de7109 100644 --- a/talk/xmpp/xmppengineimpl.cc +++ b/talk/xmpp/xmppengineimpl.cc @@ -31,8 +31,8 @@ #include #include -#include "talk/xmllite/xmlelement.h" -#include "talk/xmllite/xmlprinter.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlprinter.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/saslhandler.h" #include "talk/xmpp/xmpplogintask.h" diff --git a/talk/xmpp/xmpplogintask.cc b/talk/xmpp/xmpplogintask.cc index 2183c4045c..a48a94c757 100644 --- a/talk/xmpp/xmpplogintask.cc +++ b/talk/xmpp/xmpplogintask.cc @@ -30,7 +30,7 @@ #include #include -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/saslmechanism.h" diff --git a/talk/xmpp/xmpplogintask_unittest.cc b/talk/xmpp/xmpplogintask_unittest.cc index 1cc16cc8fe..ae9a554732 100644 --- a/talk/xmpp/xmpplogintask_unittest.cc +++ b/talk/xmpp/xmpplogintask_unittest.cc @@ -4,7 +4,7 @@ #include #include #include -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "talk/xmpp/plainsaslhandler.h" #include "talk/xmpp/saslplainmechanism.h" diff --git a/talk/xmpp/xmppstanzaparser.cc b/talk/xmpp/xmppstanzaparser.cc index 3e6ad47119..47958397bd 100644 --- a/talk/xmpp/xmppstanzaparser.cc +++ b/talk/xmpp/xmppstanzaparser.cc @@ -27,7 +27,7 @@ #include "talk/xmpp/xmppstanzaparser.h" -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/constants.h" #include "webrtc/base/common.h" #ifdef EXPAT_RELATIVE_PATH diff --git a/talk/xmpp/xmppstanzaparser.h b/talk/xmpp/xmppstanzaparser.h index d9a8933c3f..dfc1f2e23d 100644 --- a/talk/xmpp/xmppstanzaparser.h +++ b/talk/xmpp/xmppstanzaparser.h @@ -28,8 +28,8 @@ #ifndef _xmppstanzaparser_h_ #define _xmppstanzaparser_h_ -#include "talk/xmllite/xmlbuilder.h" -#include "talk/xmllite/xmlparser.h" +#include "webrtc/libjingle/xmllite/xmlbuilder.h" +#include "webrtc/libjingle/xmllite/xmlparser.h" namespace buzz { diff --git a/talk/xmpp/xmppstanzaparser_unittest.cc b/talk/xmpp/xmppstanzaparser_unittest.cc index 4e60d81348..0b114c0d91 100644 --- a/talk/xmpp/xmppstanzaparser_unittest.cc +++ b/talk/xmpp/xmppstanzaparser_unittest.cc @@ -4,7 +4,7 @@ #include #include #include -#include "talk/xmllite/xmlelement.h" +#include "webrtc/libjingle/xmllite/xmlelement.h" #include "talk/xmpp/xmppstanzaparser.h" #include "webrtc/base/common.h" #include "webrtc/base/gunit.h"