10 files changed, 39 insertions, 16 deletions
diff --git a/chromium/jingle/BUILD.gn b/chromium/jingle/BUILD.gn
index 9d8a56d3851..c6c19e5d833 100644
--- a/chromium/jingle/BUILD.gn
+++ b/chromium/jingle/BUILD.gn
@@ -24,6 +24,14 @@ if (enable_webrtc || !is_android) {
     ]
 
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
+
+    if (is_nacl) {
+      sources -= [
+        "glue/chrome_async_socket.cc",
+        "glue/proxy_resolving_client_socket.cc",
+        "glue/xmpp_client_socket_factory.cc",
+      ]
+    }
   }
 
   # A library for sending and receiving peer-issued notifications.
@@ -103,13 +111,25 @@ if (enable_webrtc || !is_android) {
       "notifier/listener/fake_push_client_observer.cc",
       "notifier/listener/fake_push_client_observer.h",
     ]
-    deps = [
+    public_deps = [
+      ":jingle_glue",
       ":notifier",
+    ]
+    deps = [
       "//base",
       "//testing/gmock",
     ]
   }
 
+  # TODO(GYP): Delete this after we've converted everything to GN.
+  # The _run targets exist only for compatibility w/ GYP.
+  group("jingle_unittests_run") {
+    testonly = true
+    deps = [
+      ":jingle_unittests",
+    ]
+  }
+
   # GYP version: jingle/jingle.gyp:jingle_unittests
   test("jingle_unittests") {
     sources = [
diff --git a/chromium/jingle/glue/DEPS b/chromium/jingle/glue/DEPS
index 790c9b71d0e..44fa57328e9 100644
--- a/chromium/jingle/glue/DEPS
+++ b/chromium/jingle/glue/DEPS
@@ -2,4 +2,5 @@
 include_rules = [
   "+third_party/libjingle/overrides",
   "+third_party/webrtc",
-]
-\ No newline at end of file
+  '+third_party/webrtc_overrides',
+]
diff --git a/chromium/jingle/glue/logging_unittest.cc b/chromium/jingle/glue/logging_unittest.cc
index 96401784b97..a5613f7647e 100644
--- a/chromium/jingle/glue/logging_unittest.cc
+++ b/chromium/jingle/glue/logging_unittest.cc
@@ -17,7 +17,7 @@
 // libjingle style logging is used.
 #define LOGGING_INSIDE_WEBRTC
 
-#include "third_party/webrtc/overrides/webrtc/base/logging.h"
+#include "third_party/webrtc_overrides/webrtc/base/logging.h"
 
 #if defined(OS_WIN)
 static const wchar_t* const log_file_name = L"libjingle_logging.log";
diff --git a/chromium/jingle/glue/proxy_resolving_client_socket.cc b/chromium/jingle/glue/proxy_resolving_client_socket.cc
index 9eb2da36be2..1fdb3ea2cf6 100644
--- a/chromium/jingle/glue/proxy_resolving_client_socket.cc
+++ b/chromium/jingle/glue/proxy_resolving_client_socket.cc
@@ -86,8 +86,8 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket(
     session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy;
     session_params.forced_spdy_exclusions =
         reference_params->forced_spdy_exclusions;
-    session_params.use_alternate_protocols =
-        reference_params->use_alternate_protocols;
+    session_params.use_alternative_services =
+        reference_params->use_alternative_services;
   }
 
   network_session_ = new net::HttpNetworkSession(session_params);
diff --git a/chromium/jingle/jingle_unittests.isolate b/chromium/jingle/jingle_unittests.isolate
index 625ac92bcbc..c05a0ffdeba 100644
--- a/chromium/jingle/jingle_unittests.isolate
+++ b/chromium/jingle/jingle_unittests.isolate
@@ -16,7 +16,6 @@
         ],
         'files': [
           '../testing/test_env.py',
-          '<(PRODUCT_DIR)/jingle_unittests<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
diff --git a/chromium/jingle/notifier/base/xmpp_connection.h b/chromium/jingle/notifier/base/xmpp_connection.h
index bc1ec2a1e48..946a6deb9fe 100644
--- a/chromium/jingle/notifier/base/xmpp_connection.h
+++ b/chromium/jingle/notifier/base/xmpp_connection.h
@@ -22,7 +22,7 @@ class PreXmppAuth;
 class XmlElement;
 class XmppClientSettings;
 class XmppTaskParentInterface;
-}  // namespace
+}  // namespace buzz
 
 namespace jingle_glue {
 class TaskPump;
@@ -80,6 +80,13 @@ class XmppConnection
   ~XmppConnection() override;
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(XmppConnectionTest, RaisedError);
+  FRIEND_TEST_ALL_PREFIXES(XmppConnectionTest, Connect);
+  FRIEND_TEST_ALL_PREFIXES(XmppConnectionTest, MultipleConnect);
+  FRIEND_TEST_ALL_PREFIXES(XmppConnectionTest, ConnectThenError);
+  FRIEND_TEST_ALL_PREFIXES(XmppConnectionTest,
+                           TasksDontRunAfterXmppConnectionDestructor);
+
   void OnStateChange(buzz::XmppEngine::State state);
   void OnInputLog(const char* data, int len);
   void OnOutputLog(const char* data, int len);
@@ -91,12 +98,6 @@ class XmppConnection
   bool on_connect_called_;
   Delegate* delegate_;
 
-  FRIEND_TEST(XmppConnectionTest, RaisedError);
-  FRIEND_TEST(XmppConnectionTest, Connect);
-  FRIEND_TEST(XmppConnectionTest, MultipleConnect);
-  FRIEND_TEST(XmppConnectionTest, ConnectThenError);
-  FRIEND_TEST(XmppConnectionTest, TasksDontRunAfterXmppConnectionDestructor);
-
   DISALLOW_COPY_AND_ASSIGN(XmppConnection);
 };
 
diff --git a/chromium/jingle/notifier/communicator/login.h b/chromium/jingle/notifier/communicator/login.h
index cfc4267e1ca..e49915081e8 100644
--- a/chromium/jingle/notifier/communicator/login.h
+++ b/chromium/jingle/notifier/communicator/login.h
@@ -121,7 +121,7 @@ class Login : public net::NetworkChangeNotifier::IPAddressObserver,
 
   // reconnection state.
   base::TimeDelta reconnect_interval_;
-  base::OneShotTimer<Login> reconnect_timer_;
+  base::OneShotTimer reconnect_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(Login);
 };
diff --git a/chromium/jingle/notifier/communicator/single_login_attempt.cc b/chromium/jingle/notifier/communicator/single_login_attempt.cc
index a7309ba2542..04c074fbd59 100644
--- a/chromium/jingle/notifier/communicator/single_login_attempt.cc
+++ b/chromium/jingle/notifier/communicator/single_login_attempt.cc
@@ -57,8 +57,8 @@ namespace {
 // unparseable, it assumes the default XMPP port.  The hostname may be
 // empty.
 net::HostPortPair ParseRedirectText(const std::string& redirect_text) {
-  std::vector<std::string> parts;
-  base::SplitString(redirect_text, ':', &parts);
+  std::vector<std::string> parts = base::SplitString(
+      redirect_text, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   net::HostPortPair redirect_server;
   redirect_server.set_port(kDefaultXmppPort);
   if (parts.empty()) {
diff --git a/chromium/jingle/notifier/listener/push_notifications_listen_task.h b/chromium/jingle/notifier/listener/push_notifications_listen_task.h
index d5bdf068b0a..033827a12fd 100644
--- a/chromium/jingle/notifier/listener/push_notifications_listen_task.h
+++ b/chromium/jingle/notifier/listener/push_notifications_listen_task.h
@@ -14,6 +14,7 @@
 #define JINGLE_NOTIFIER_PUSH_NOTIFICATIONS_LISTENER_LISTEN_TASK_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "webrtc/libjingle/xmpp/xmpptask.h"
 
 namespace buzz {
diff --git a/chromium/jingle/notifier/listener/push_notifications_subscribe_task.h b/chromium/jingle/notifier/listener/push_notifications_subscribe_task.h
index a26c5e531a7..3a90f705e2b 100644
--- a/chromium/jingle/notifier/listener/push_notifications_subscribe_task.h
+++ b/chromium/jingle/notifier/listener/push_notifications_subscribe_task.h
@@ -12,6 +12,7 @@
 
 #include "base/compiler_specific.h"
 #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"