(Auto)update libjingle 74694022-> 74696326

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7045 4adac7df-926f-26a2-2b94-8c16560cd09d

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',
       ],

talk/p2p/base/constants.cc

@@ -29,7 +29,7 @@
 
 #include <string>
 
-#include "talk/xmllite/qname.h"
+#include "webrtc/libjingle/xmllite/qname.h"
 
 namespace cricket {
 

talk/p2p/base/constants.h

@@ -29,7 +29,7 @@
 #define TALK_P2P_BASE_CONSTANTS_H_
 
 #include <string>
-#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.

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"

talk/p2p/base/parsing.h

@@ -30,7 +30,7 @@
 
 #include <string>
 #include <vector>
-#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"
 

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"
 

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"
 

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"

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 {
 

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"

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 {

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"

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"

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"
 

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"
 

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"

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"

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"

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"

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"

talk/xmpp/constants.cc

@@ -29,9 +29,9 @@
 
 #include <string>
 
-#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"
 

talk/xmpp/constants.h

@@ -29,7 +29,7 @@
 #define TALK_XMPP_CONSTANTS_H_
 
 #include <string>
-#include "talk/xmllite/qname.h"
+#include "webrtc/libjingle/xmllite/qname.h"
 #include "talk/xmpp/jid.h"
 
 namespace buzz {

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"

talk/xmpp/hangoutpubsubclient_unittest.cc

@@ -3,8 +3,8 @@
 
 #include <string>
 
-#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"

talk/xmpp/jid.h

@@ -29,7 +29,7 @@
 #define TALK_XMPP_JID_H_
 
 #include <string>
-#include "talk/xmllite/xmlconstants.h"
+#include "webrtc/libjingle/xmllite/xmlconstants.h"
 #include "webrtc/base/basictypes.h"
 
 namespace buzz {

talk/xmpp/mucroomconfigtask_unittest.cc

@@ -28,7 +28,7 @@
 #include <string>
 #include <vector>
 
-#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"

talk/xmpp/mucroomdiscoverytask_unittest.cc

@@ -28,7 +28,7 @@
 #include <string>
 #include <vector>
 
-#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"

talk/xmpp/mucroomlookuptask_unittest.cc

@@ -28,7 +28,7 @@
 #include <string>
 #include <vector>
 
-#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"

talk/xmpp/mucroomuniquehangoutidtask_unittest.cc

@@ -28,7 +28,7 @@
 #include <string>
 #include <vector>
 
-#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"

talk/xmpp/pingtask_unittest.cc

@@ -28,7 +28,7 @@
 #include <string>
 #include <vector>
 
-#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"

talk/xmpp/pubsub_task.h

@@ -30,7 +30,7 @@
 
 #include <map>
 #include <string>
-#include "talk/xmllite/xmlelement.h"
+#include "webrtc/libjingle/xmllite/xmlelement.h"
 #include "talk/xmpp/jid.h"
 #include "talk/xmpp/xmpptask.h"
 

talk/xmpp/pubsubclient_unittest.cc

@@ -3,8 +3,8 @@
 
 #include <string>
 
-#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"

talk/xmpp/pubsubstateclient.h

@@ -32,8 +32,8 @@
 #include <string>
 #include <vector>
 
-#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"

talk/xmpp/pubsubtasks_unittest.cc

@@ -3,8 +3,8 @@
 
 #include <string>
 
-#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"

talk/xmpp/rostermodule_unittest.cc

@@ -29,7 +29,7 @@
 #include <sstream>
 #include <string>
 
-#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"

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"
 

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"

talk/xmpp/util_unittest.cc

@@ -4,7 +4,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#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"

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"
 
 

talk/xmpp/xmppengine_unittest.cc

@@ -4,7 +4,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#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"

talk/xmpp/xmppengineimpl.cc

@@ -31,8 +31,8 @@
 #include <sstream>
 #include <vector>
 
-#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"

talk/xmpp/xmpplogintask.cc

@@ -30,7 +30,7 @@
 #include <string>
 #include <vector>
 
-#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"

talk/xmpp/xmpplogintask_unittest.cc

@@ -4,7 +4,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#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"

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

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 {

talk/xmpp/xmppstanzaparser_unittest.cc

@@ -4,7 +4,7 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#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"