GN: Update xmpp and p2p to match Chromium build

webrtc/libjingle/xmpp/xmpp.gyp

Index: webrtc/libjingle/xmpp/xmpp.gyp
diff --git a/webrtc/libjingle/xmpp/xmpp.gyp b/webrtc/libjingle/xmpp/xmpp.gyp
index 1bb5e100045da546c876805a27f9191ce9f33f04..56a04c01824d08969c025cf469064041e5a8394a 100644
--- a/webrtc/libjingle/xmpp/xmpp.gyp
+++ b/webrtc/libjingle/xmpp/xmpp.gyp
@@ -21,59 +21,17 @@
       ],
       'sources': [
         'asyncsocket.h',
-        'chatroommodule.h',
-        'chatroommoduleimpl.cc',
         'constants.cc',
         'constants.h',
-        'discoitemsquerytask.cc',
-        'discoitemsquerytask.h',
-        'hangoutpubsubclient.cc',
-        'hangoutpubsubclient.h',
-        'iqtask.cc',
-        'iqtask.h',
         'jid.cc',
         'jid.h',
-        'module.h',
-        'moduleimpl.cc',
-        'moduleimpl.h',
-        'mucroomconfigtask.cc',
-        'mucroomconfigtask.h',
-        'mucroomdiscoverytask.cc',
-        'mucroomdiscoverytask.h',
-        'mucroomlookuptask.cc',
-        'mucroomlookuptask.h',
-        'mucroomuniquehangoutidtask.cc',
-        'mucroomuniquehangoutidtask.h',
-        'pingtask.cc',
-        'pingtask.h',
         'plainsaslhandler.h',
-        'presenceouttask.cc',
-        'presenceouttask.h',
-        'presencereceivetask.cc',
-        'presencereceivetask.h',
-        'presencestatus.cc',
-        'presencestatus.h',
         'prexmppauth.h',
-        'pubsub_task.cc',
-        'pubsub_task.h',
-        'pubsubclient.cc',
-        'pubsubclient.h',
-        'pubsubstateclient.cc',
-        'pubsubstateclient.h',
-        'pubsubtasks.cc',
-        'pubsubtasks.h',
-        'receivetask.cc',
-        'receivetask.h',
-        'rostermodule.h',
-        'rostermoduleimpl.cc',
-        'rostermoduleimpl.h',
         'saslcookiemechanism.h',
         'saslhandler.h',
         'saslmechanism.cc',
         'saslmechanism.h',
         'saslplainmechanism.h',
-        'xmppauth.cc',
-        'xmppauth.h',
         'xmppclient.cc',
         'xmppclient.h',
         'xmppclientsettings.h',
@@ -83,16 +41,10 @@
         'xmppengineimpl_iq.cc',
         'xmpplogintask.cc',
         'xmpplogintask.h',
-        'xmpppump.cc',
-        'xmpppump.h',
-        'xmppsocket.cc',
-        'xmppsocket.h',
         'xmppstanzaparser.cc',
         'xmppstanzaparser.h',
         'xmpptask.cc',
         'xmpptask.h',
-        'xmppthread.cc',
-        'xmppthread.h',
       ],
       'direct_dependent_settings': {
         'defines': [
@@ -114,6 +66,56 @@
             'FEATURE_ENABLE_VOICEMAIL',
             'FEATURE_ENABLE_PSTN',
           ],
+          'sources': [
+            'chatroommodule.h',
+            'chatroommoduleimpl.cc',
+            'discoitemsquerytask.cc',
+            'discoitemsquerytask.h',
+            'hangoutpubsubclient.cc',
+            'hangoutpubsubclient.h',
+            'iqtask.cc',
+            'iqtask.h',
+            'module.h',
+            'moduleimpl.cc',
+            'moduleimpl.h',
+            'mucroomconfigtask.cc',
+            'mucroomconfigtask.h',
+            'mucroomdiscoverytask.cc',
+            'mucroomdiscoverytask.h',
+            'mucroomlookuptask.cc',
+            'mucroomlookuptask.h',
+            'mucroomuniquehangoutidtask.cc',
+            'mucroomuniquehangoutidtask.h',
+            'pingtask.cc',
+            'pingtask.h',
+            'presenceouttask.cc',
+            'presenceouttask.h',
+            'presencereceivetask.cc',
+            'presencereceivetask.h',
+            'presencestatus.cc',
+            'presencestatus.h',
+            'pubsub_task.cc',
+            'pubsub_task.h',
+            'pubsubclient.cc',
+            'pubsubclient.h',
+            'pubsubstateclient.cc',
+            'pubsubstateclient.h',
+            'pubsubtasks.cc',
+            'pubsubtasks.h',
+            'receivetask.cc',
+            'receivetask.h',
+            'rostermodule.h',
+            'rostermoduleimpl.cc',
+            'rostermoduleimpl.h',
+            'xmppauth.cc',
+            'xmppauth.h',
+            'xmpppump.cc',
+            'xmpppump.h',
+            'xmppsocket.cc',
+            'xmppsocket.h',
+            'xmppthread.cc',
+            'xmppthread.h',
+          ]
         }],
         ['os_posix==1', {
           'configurations': {