GN: Update xmpp and p2p to match Chromium build

webrtc/libjingle/xmpp/BUILD.gn

Index: webrtc/libjingle/xmpp/BUILD.gn
diff --git a/webrtc/libjingle/xmpp/BUILD.gn b/webrtc/libjingle/xmpp/BUILD.gn
index c27c70bfc79088817d30b8c5d8bac7885138abdf..4c29fc083bf57e28be0302ead832c57ab617bf43 100644
--- a/webrtc/libjingle/xmpp/BUILD.gn
+++ b/webrtc/libjingle/xmpp/BUILD.gn
@@ -34,59 +34,17 @@ source_set("rtc_xmpp") {
   cflags = []
   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",
@@ -96,16 +54,10 @@ source_set("rtc_xmpp") {
     "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",
   ]
 
   defines = [ "FEATURE_ENABLE_SSL" ]
@@ -132,7 +84,62 @@ source_set("rtc_xmpp") {
     ":xmpp_inherited_config",
   ]
 
-  if (!build_with_chromium) {
+  if (build_with_chromium) {
+    if (is_nacl) {
+      deps += [ "//native_client_sdk/src/libraries/nacl_io" ]
+    }
+  } else {
+    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",
+    ]
+
     defines += [
       "FEATURE_ENABLE_VOICEMAIL",
       "FEATURE_ENABLE_PSTN",