Move ChromeAsyncSocket to jingle/glue

ChromeAsyncSocket will be reused by chromoting for XMPP connections,
moving it to jingle/glue.

BUG=137140


Review URL: https://chromiumcodereview.appspot.com/10817013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148028 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 81 insertions, 80 deletions

diff --git a/jingle/notifier/base/chrome_async_socket.cc b/jingle/glue/chrome_async_socket.cc
index ca2fde4..667ec7d 100644
--- a/jingle/notifier/base/chrome_async_socket.cc
+++ b/jingle/glue/chrome_async_socket.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "jingle/notifier/base/chrome_async_socket.h"
+#include "jingle/glue/chrome_async_socket.h"
 
 #include <algorithm>
 #include <cstring>
@@ -13,7 +13,7 @@
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "jingle/notifier/base/resolving_client_socket_factory.h"
+#include "jingle/glue/resolving_client_socket_factory.h"
 #include "net/base/address_list.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/io_buffer.h"
@@ -22,9 +22,9 @@
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/tcp_client_socket.h"
-#include "talk/base/socketaddress.h"
+#include "third_party/libjingle/source/talk/base/socketaddress.h"
 
-namespace notifier {
+namespace jingle_glue {
 
 ChromeAsyncSocket::ChromeAsyncSocket(
     ResolvingClientSocketFactory* resolving_client_socket_factory,
@@ -447,4 +447,4 @@ void ChromeAsyncSocket::ProcessSSLConnectDone(int status) {
   SignalSSLConnected();
 }
 
-}  // namespace notifier
+}  // namespace jingle_glue
diff --git a/jingle/notifier/base/chrome_async_socket.h b/jingle/glue/chrome_async_socket.h
index 8cf8e8d..1037d24 100644
--- a/jingle/notifier/base/chrome_async_socket.h
+++ b/jingle/glue/chrome_async_socket.h
@@ -4,8 +4,8 @@
 //
 // An implementation of buzz::AsyncSocket that uses Chrome sockets.
 
-#ifndef JINGLE_NOTIFIER_BASE_CHROME_ASYNC_SOCKET_H_
-#define JINGLE_NOTIFIER_BASE_CHROME_ASYNC_SOCKET_H_
+#ifndef JINGLE_GLUE_CHROME_ASYNC_SOCKET_H_
+#define JINGLE_GLUE_CHROME_ASYNC_SOCKET_H_
 
 #if !defined(FEATURE_ENABLE_SSL)
 #error ChromeAsyncSocket expects FEATURE_ENABLE_SSL to be defined
@@ -21,14 +21,14 @@
 #include "base/memory/weak_ptr.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
-#include "talk/xmpp/asyncsocket.h"
+#include "third_party/libjingle/source/talk/xmpp/asyncsocket.h"
 
 namespace net {
 class IOBufferWithSize;
 class StreamSocket;
 }  // namespace net
 
-namespace notifier {
+namespace jingle_glue {
 
 class ResolvingClientSocketFactory;
 
@@ -208,6 +208,6 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
   DISALLOW_COPY_AND_ASSIGN(ChromeAsyncSocket);
 };
 
-}  // namespace notifier
+}  // namespace jingle_glue
 
-#endif  // JINGLE_NOTIFIER_BASE_CHROME_ASYNC_SOCKET_H_
+#endif  // JINGLE_GLUE_CHROME_ASYNC_SOCKET_H_
diff --git a/jingle/notifier/base/chrome_async_socket_unittest.cc b/jingle/glue/chrome_async_socket_unittest.cc
index ce97531..0e3274b 100644
--- a/jingle/notifier/base/chrome_async_socket_unittest.cc
+++ b/jingle/glue/chrome_async_socket_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "jingle/notifier/base/chrome_async_socket.h"
+#include "jingle/glue/chrome_async_socket.h"
 
 #include <deque>
 #include <string>
@@ -11,7 +11,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "jingle/notifier/base/resolving_client_socket_factory.h"
+#include "jingle/glue/resolving_client_socket_factory.h"
 #include "net/base/address_list.h"
 #include "net/base/mock_cert_verifier.h"
 #include "net/base/net_errors.h"
@@ -20,12 +20,12 @@
 #include "net/socket/socket_test_util.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "talk/base/sigslot.h"
-#include "talk/base/ipaddress.h"
-#include "talk/base/socketaddress.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/libjingle/source/talk/base/ipaddress.h"
+#include "third_party/libjingle/source/talk/base/sigslot.h"
+#include "third_party/libjingle/source/talk/base/socketaddress.h"
 
-namespace notifier {
+namespace jingle_glue {
 
 namespace {
 
@@ -1076,4 +1076,4 @@ TEST_F(ChromeAsyncSocketTest, SSLAsyncWrite) {
 
 }  // namespace
 
-}  // namespace notifier
+}  // namespace jingle_glue
diff --git a/jingle/notifier/base/fake_ssl_client_socket.cc b/jingle/glue/fake_ssl_client_socket.cc
index 3329e31..19beb1f 100644
--- a/jingle/notifier/base/fake_ssl_client_socket.cc
+++ b/jingle/glue/fake_ssl_client_socket.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "jingle/notifier/base/fake_ssl_client_socket.h"
+#include "jingle/glue/fake_ssl_client_socket.h"
 
 #include <cstdlib>
 
@@ -12,7 +12,7 @@
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 
-namespace notifier {
+namespace jingle_glue {
 
 namespace {
 
@@ -350,4 +350,4 @@ bool FakeSSLClientSocket::GetSSLInfo(net::SSLInfo* ssl_info) {
   return transport_socket_->GetSSLInfo(ssl_info);
 }
 
-}  // namespace notifier
+}  // namespace jingle_glue
diff --git a/jingle/notifier/base/fake_ssl_client_socket.h b/jingle/glue/fake_ssl_client_socket.h
index b9df8a6..edd3267 100644
--- a/jingle/notifier/base/fake_ssl_client_socket.h
+++ b/jingle/glue/fake_ssl_client_socket.h
@@ -13,8 +13,8 @@
 // NOTE: This StreamSocket implementation does *not* do a real SSL
 // handshake nor does it do any encryption!
 
-#ifndef JINGLE_NOTIFIER_BASE_FAKE_SSL_CLIENT_SOCKET_H_
-#define JINGLE_NOTIFIER_BASE_FAKE_SSL_CLIENT_SOCKET_H_
+#ifndef JINGLE_GLUE_FAKE_SSL_CLIENT_SOCKET_H_
+#define JINGLE_GLUE_FAKE_SSL_CLIENT_SOCKET_H_
 
 #include <cstddef>
 
@@ -32,7 +32,7 @@ class DrainableIOBuffer;
 class SSLInfo;
 }  // namespace net
 
-namespace notifier {
+namespace jingle_glue {
 
 class FakeSSLClientSocket : public net::StreamSocket {
  public:
@@ -109,6 +109,6 @@ class FakeSSLClientSocket : public net::StreamSocket {
   scoped_refptr<net::DrainableIOBuffer> read_buf_;
 };
 
-}  // namespace notifier
+}  // namespace jingle_glue
 
-#endif  // JINGLE_NOTIFIER_BASE_FAKE_SSL_CLIENT_SOCKET_H_
+#endif  // JINGLE_GLUE_FAKE_SSL_CLIENT_SOCKET_H_
diff --git a/jingle/notifier/base/fake_ssl_client_socket_unittest.cc b/jingle/glue/fake_ssl_client_socket_unittest.cc
index 617e4d1..a7ae4fa 100644
--- a/jingle/notifier/base/fake_ssl_client_socket_unittest.cc
+++ b/jingle/glue/fake_ssl_client_socket_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "jingle/notifier/base/fake_ssl_client_socket.h"
+#include "jingle/glue/fake_ssl_client_socket.h"
 
 #include <algorithm>
 #include <vector>
@@ -19,7 +19,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace notifier {
+namespace jingle_glue {
 
 namespace {
 
@@ -345,4 +345,4 @@ TEST_F(FakeSSLClientSocketTest, MalformedServerHello) {
 
 }  // namespace
 
-}  // namespace notifier
+}  // namespace jingle_glue
diff --git a/jingle/notifier/base/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc
index eb14d56..479a781 100644
--- a/jingle/notifier/base/proxy_resolving_client_socket.cc
+++ b/jingle/glue/proxy_resolving_client_socket.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "jingle/notifier/base/proxy_resolving_client_socket.h"
+#include "jingle/glue/proxy_resolving_client_socket.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ -18,7 +18,7 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
-namespace notifier {
+namespace jingle_glue {
 
 ProxyResolvingClientSocket::ProxyResolvingClientSocket(
     net::ClientSocketFactory* socket_factory,
@@ -389,4 +389,4 @@ void ProxyResolvingClientSocket::CloseTransportSocket() {
   transport_.reset();
 }
 
-}  // namespace notifier
+}  // namespace jingle_glue
diff --git a/jingle/notifier/base/proxy_resolving_client_socket.h b/jingle/glue/proxy_resolving_client_socket.h
index e2426ec..99f342c 100644
--- a/jingle/notifier/base/proxy_resolving_client_socket.h
+++ b/jingle/glue/proxy_resolving_client_socket.h
@@ -5,8 +5,8 @@
 // This StreamSocket implementation wraps a ClientSocketHandle that is created
 // from the client socket pool after resolving proxies.
 
-#ifndef JINGLE_NOTIFIER_BASE_PROXY_RESOLVING_CLIENT_SOCKET_H_
-#define JINGLE_NOTIFIER_BASE_PROXY_RESOLVING_CLIENT_SOCKET_H_
+#ifndef JINGLE_GLUE_PROXY_RESOLVING_CLIENT_SOCKET_H_
+#define JINGLE_GLUE_PROXY_RESOLVING_CLIENT_SOCKET_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -29,7 +29,7 @@ class URLRequestContextGetter;
 }  // namespace net
 
 // TODO(sanjeevr): Move this to net/
-namespace notifier {
+namespace jingle_glue {
 
 class ProxyResolvingClientSocket : public net::StreamSocket {
  public:
@@ -101,6 +101,6 @@ class ProxyResolvingClientSocket : public net::StreamSocket {
   net::CompletionCallback user_connect_callback_;
 };
 
-}  // namespace notifier
+}  // namespace jingle_glue
 
-#endif  // JINGLE_NOTIFIER_BASE_PROXY_RESOLVING_CLIENT_SOCKET_H_
+#endif  // JINGLE_GLUE_PROXY_RESOLVING_CLIENT_SOCKET_H_
diff --git a/jingle/notifier/base/proxy_resolving_client_socket_unittest.cc b/jingle/glue/proxy_resolving_client_socket_unittest.cc
index f856ac8..49d95f5 100644
--- a/jingle/notifier/base/proxy_resolving_client_socket_unittest.cc
+++ b/jingle/glue/proxy_resolving_client_socket_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "jingle/notifier/base/proxy_resolving_client_socket.h"
+#include "jingle/glue/proxy_resolving_client_socket.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ -30,7 +30,7 @@ class MyTestURLRequestContext : public TestURLRequestContext {
 
 }  // namespace
 
-namespace notifier {
+namespace jingle_glue {
 
 class ProxyResolvingClientSocketTest : public testing::Test {
  protected:
@@ -114,4 +114,4 @@ TEST_F(ProxyResolvingClientSocketTest, ReportsBadProxies) {
 }
 
 // TODO(sanjeevr): Add more unit-tests.
-}  // namespace notifier
+}  // namespace jingle_glue
diff --git a/jingle/notifier/base/resolving_client_socket_factory.h b/jingle/glue/resolving_client_socket_factory.h
index 7f5af1f..5be8bc8 100644
--- a/jingle/notifier/base/resolving_client_socket_factory.h
+++ b/jingle/glue/resolving_client_socket_factory.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef JINGLE_NOTIFIER_BASE_RESOLVING_CLIENT_SOCKET_FACTORY_H_
-#define JINGLE_NOTIFIER_BASE_RESOLVING_CLIENT_SOCKET_FACTORY_H_
+#ifndef JINGLE_GLUE_RESOLVING_CLIENT_SOCKET_FACTORY_H_
+#define JINGLE_GLUE_RESOLVING_CLIENT_SOCKET_FACTORY_H_
 
 
 namespace net {
@@ -11,11 +11,11 @@ class ClientSocketHandle;
 class HostPortPair;
 class SSLClientSocket;
 class StreamSocket;
-}
+}  // namespace net
 
 // TODO(sanjeevr): Move this to net/
 
-namespace notifier {
+namespace jingle_glue {
 
 // Interface for a ClientSocketFactory that creates ClientSockets that can
 // resolve host names and tunnel through proxies.
@@ -31,6 +31,6 @@ class ResolvingClientSocketFactory {
       const net::HostPortPair& host_and_port) = 0;
 };
 
-}  // namespace notifier
+}  // namespace jingle_glue
 
-#endif  // JINGLE_NOTIFIER_BASE_RESOLVING_CLIENT_SOCKET_FACTORY_H_
+#endif  // JINGLE_GLUE_RESOLVING_CLIENT_SOCKET_FACTORY_H_
diff --git a/jingle/notifier/base/xmpp_client_socket_factory.cc b/jingle/glue/xmpp_client_socket_factory.cc
index 2594084..13749e1 100644
--- a/jingle/notifier/base/xmpp_client_socket_factory.cc
+++ b/jingle/glue/xmpp_client_socket_factory.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "jingle/notifier/base/xmpp_client_socket_factory.h"
+#include "jingle/glue/xmpp_client_socket_factory.h"
 
 #include "base/logging.h"
-#include "jingle/notifier/base/fake_ssl_client_socket.h"
-#include "jingle/notifier/base/proxy_resolving_client_socket.h"
+#include "jingle/glue/fake_ssl_client_socket.h"
+#include "jingle/glue/proxy_resolving_client_socket.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
-namespace notifier {
+namespace jingle_glue {
 
 XmppClientSocketFactory::XmppClientSocketFactory(
     net::ClientSocketFactory* client_socket_factory,
@@ -53,4 +53,4 @@ net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket(
 }
 
 
-}  // namespace
+}  // namespace jingle_glue
diff --git a/jingle/notifier/base/xmpp_client_socket_factory.h b/jingle/glue/xmpp_client_socket_factory.h
index 1d22e44..f03a04e 100644
--- a/jingle/notifier/base/xmpp_client_socket_factory.h
+++ b/jingle/glue/xmpp_client_socket_factory.h
@@ -1,15 +1,15 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef JINGLE_NOTIFIER_BASE_XMPP_CLIENT_SOCKET_FACTORY_H_
-#define JINGLE_NOTIFIER_BASE_XMPP_CLIENT_SOCKET_FACTORY_H_
+#ifndef JINGLE_GLUE_XMPP_CLIENT_SOCKET_FACTORY_H_
+#define JINGLE_GLUE_XMPP_CLIENT_SOCKET_FACTORY_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
-#include "jingle/notifier/base/resolving_client_socket_factory.h"
+#include "jingle/glue/resolving_client_socket_factory.h"
 #include "net/base/ssl_config_service.h"
 
 namespace net {
@@ -19,9 +19,9 @@ class HostPortPair;
 class SSLClientSocket;
 class StreamSocket;
 class URLRequestContextGetter;
-}
+}  // namespace net
 
-namespace notifier {
+namespace jingle_glue {
 
 class XmppClientSocketFactory : public ResolvingClientSocketFactory {
  public:
@@ -51,6 +51,6 @@ class XmppClientSocketFactory : public ResolvingClientSocketFactory {
   DISALLOW_COPY_AND_ASSIGN(XmppClientSocketFactory);
 };
 
-}  // namespace notifier
+}  // namespace jingle_glue
 
-#endif  // JINGLE_NOTIFIER_BASE_XMPP_CLIENT_SOCKET_FACTORY_H_
+#endif  // JINGLE_GLUE_XMPP_CLIENT_SOCKET_FACTORY_H_
diff --git a/jingle/jingle.gyp b/jingle/jingle.gyp
index 3d424a0..c245432 100644
--- a/jingle/jingle.gyp
+++ b/jingle/jingle.gyp
@@ -14,12 +14,21 @@
       'sources': [
         'glue/channel_socket_adapter.cc',
         'glue/channel_socket_adapter.h',
+        'glue/chrome_async_socket.cc',
+        'glue/chrome_async_socket.h',
+        'glue/fake_ssl_client_socket.cc',
+        'glue/fake_ssl_client_socket.h',
+        'glue/proxy_resolving_client_socket.cc',
+        'glue/proxy_resolving_client_socket.h',
         'glue/pseudotcp_adapter.cc',
         'glue/pseudotcp_adapter.h',
+        'glue/resolving_client_socket_factory.h',
         'glue/thread_wrapper.cc',
         'glue/thread_wrapper.h',
         'glue/utils.cc',
         'glue/utils.h',
+        'glue/xmpp_client_socket_factory.cc',
+        'glue/xmpp_client_socket_factory.h',
       ],
       'dependencies': [
         '../base/base.gyp:base',
@@ -41,11 +50,7 @@
       'target_name': 'notifier',
       'type': 'static_library',
       'sources': [
-        'notifier/base/chrome_async_socket.cc',
-        'notifier/base/chrome_async_socket.h',
         'notifier/base/const_communicator.h',
-        'notifier/base/fake_ssl_client_socket.cc',
-        'notifier/base/fake_ssl_client_socket.h',
         'notifier/base/gaia_token_pre_xmpp_auth.cc',
         'notifier/base/gaia_token_pre_xmpp_auth.h',
         'notifier/base/notification_method.h',
@@ -54,17 +59,12 @@
         'notifier/base/notifier_options.h',
         'notifier/base/notifier_options_util.cc',
         'notifier/base/notifier_options_util.h',
-        'notifier/base/proxy_resolving_client_socket.cc',
-        'notifier/base/proxy_resolving_client_socket.h',
-        'notifier/base/resolving_client_socket_factory.h',
         'notifier/base/server_information.cc',
         'notifier/base/server_information.h',
         'notifier/base/task_pump.cc',
         'notifier/base/task_pump.h',
         'notifier/base/weak_xmpp_client.cc',
         'notifier/base/weak_xmpp_client.h',
-        'notifier/base/xmpp_client_socket_factory.cc',
-        'notifier/base/xmpp_client_socket_factory.h',
         'notifier/base/xmpp_connection.cc',
         'notifier/base/xmpp_connection.h',
         'notifier/communicator/connection_settings.cc',
@@ -156,17 +156,17 @@
       'type': 'executable',
       'sources': [
         'glue/channel_socket_adapter_unittest.cc',
+        'glue/chrome_async_socket_unittest.cc',
+        'glue/fake_ssl_client_socket_unittest.cc',
         'glue/jingle_glue_mock_objects.cc',
         'glue/jingle_glue_mock_objects.h',
         'glue/logging_unittest.cc',
+        'glue/proxy_resolving_client_socket_unittest.cc',
         'glue/pseudotcp_adapter_unittest.cc',
         'glue/thread_wrapper_unittest.cc',
-        'notifier/base/chrome_async_socket_unittest.cc',
-        'notifier/base/fake_ssl_client_socket_unittest.cc',
-        'notifier/base/proxy_resolving_client_socket_unittest.cc',
         'notifier/base/task_pump_unittest.cc',
-        'notifier/base/xmpp_connection_unittest.cc',
         'notifier/base/weak_xmpp_client_unittest.cc',
+        'notifier/base/xmpp_connection_unittest.cc',
         'notifier/communicator/connection_settings_unittest.cc',
         'notifier/communicator/login_settings_unittest.cc',
         'notifier/communicator/single_login_attempt_unittest.cc',
@@ -184,7 +184,7 @@
             # TODO(jrg):
             # EXPECT_DEBUG_DEATH() uses features not enabled.
             # Should we -std=c++0x or -std=gnu++0x?
-            'notifier/base/chrome_async_socket_unittest.cc',
+            'glue/chrome_async_socket_unittest.cc',
             'notifier/base/xmpp_connection_unittest.cc',
           ],
         }]],
diff --git a/jingle/notifier/base/xmpp_connection.cc b/jingle/notifier/base/xmpp_connection.cc
index 8ecdd9b..f8f83fd 100644
--- a/jingle/notifier/base/xmpp_connection.cc
+++ b/jingle/notifier/base/xmpp_connection.cc
@@ -8,10 +8,10 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_piece.h"
-#include "jingle/notifier/base/chrome_async_socket.h"
+#include "jingle/glue/chrome_async_socket.h"
+#include "jingle/glue/xmpp_client_socket_factory.h"
 #include "jingle/notifier/base/task_pump.h"
 #include "jingle/notifier/base/weak_xmpp_client.h"
-#include "jingle/notifier/base/xmpp_client_socket_factory.h"
 #include "net/base/ssl_config_service.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/url_request/url_request_context.h"
@@ -34,14 +34,14 @@ buzz::AsyncSocket* CreateSocket(
   // XmppSocketAdapter.
   const size_t kReadBufSize = 64U * 1024U;
   const size_t kWriteBufSize = 64U * 1024U;
-  XmppClientSocketFactory* const client_socket_factory =
-      new XmppClientSocketFactory(
+  jingle_glue::XmppClientSocketFactory* const client_socket_factory =
+      new jingle_glue::XmppClientSocketFactory(
           net::ClientSocketFactory::GetDefaultFactory(),
           ssl_config,
           request_context_getter,
           use_fake_ssl_client_socket);
-  return new ChromeAsyncSocket(client_socket_factory,
-                               kReadBufSize, kWriteBufSize);
+  return new jingle_glue::ChromeAsyncSocket(client_socket_factory,
+                                            kReadBufSize, kWriteBufSize);
 }
 
 }  // namespace
diff --git a/sync/sync.gyp b/sync/sync.gyp
index 40f5817..b517825 100644
--- a/sync/sync.gyp
+++ b/sync/sync.gyp
@@ -235,6 +235,7 @@
       ],
       'dependencies': [
         '../base/base.gyp:base',
+        '../jingle/jingle.gyp:jingle_glue',
         '../jingle/jingle.gyp:notifier',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
         # TODO(akalin): Remove this (http://crbug.com/133352).