Revert r59012 which started using Chrome sockets for sync.

jingle/notifier/communicator/xmpp_socket_adapter.cc

 // Copyright (c) 2009 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.
 
-#include "remoting/jingle_glue/xmpp_socket_adapter.h"
+#include "jingle/notifier/communicator/xmpp_socket_adapter.h"
 
 #include <iomanip>
 #include <string>
 
 #include "base/logging.h"
-#include "remoting/jingle_glue/ssl_adapter.h"
+#include "jingle/notifier/base/ssl_adapter.h"
+#include "jingle/notifier/communicator/product_info.h"
 #include "talk/base/byteorder.h"
 #include "talk/base/common.h"
 #include "talk/base/firewallsocketserver.h"
 #include "talk/base/logging.h"
 #include "talk/base/socketadapters.h"
 #include "talk/base/ssladapter.h"
 #include "talk/base/thread.h"
 #include "talk/xmpp/xmppengine.h"
 
-namespace remoting {
+namespace notifier {
 
 XmppSocketAdapter::XmppSocketAdapter(const buzz::XmppClientSettings& xcs,
                                      bool allow_unverified_certs)
   : state_(STATE_CLOSED),
     error_(ERROR_NONE),
     wsa_error_(0),
     socket_(NULL),
     protocol_(xcs.protocol()),
     firewall_(false),
     write_buffer_(NULL),
@@ skipping 71 matching lines @@
   }
 
   if (proxy_.type) {
     talk_base::AsyncSocket* proxy_socket = 0;
     if (proxy_.type == talk_base::PROXY_SOCKS5) {
       proxy_socket = new talk_base::AsyncSocksProxySocket(
           socket, proxy_.address, proxy_.username, proxy_.password);
     } else {
       // Note: we are trying unknown proxies as HTTPS currently.
       proxy_socket = new talk_base::AsyncHttpsProxySocket(socket,
-          "chromoting", proxy_.address, proxy_.username,
+          GetUserAgentString(), proxy_.address, proxy_.username,
           proxy_.password);
     }
     if (!proxy_socket) {
       SetWSAError(WSA_NOT_ENOUGH_MEMORY);
       delete socket;
       return false;
     }
     socket = proxy_socket;  // For our purposes the proxy is now the socket.
   }
 
   if (protocol_ == cricket::PROTO_SSLTCP) {
     talk_base::AsyncSocket *fake_ssl_socket =
         new talk_base::AsyncSSLSocket(socket);
     if (!fake_ssl_socket) {
       SetWSAError(WSA_NOT_ENOUGH_MEMORY);
       delete socket;
       return false;
     }
     socket = fake_ssl_socket;  // For our purposes the SSL socket is the socket.
   }
 
 #if defined(FEATURE_ENABLE_SSL)
-  talk_base::SSLAdapter* ssl_adapter = remoting::CreateSSLAdapter(socket);
+  talk_base::SSLAdapter* ssl_adapter = notifier::CreateSSLAdapter(socket);
   socket = ssl_adapter;  // For our purposes the SSL adapter is the socket.
 #endif
 
   socket->SignalReadEvent.connect(this, &XmppSocketAdapter::OnReadEvent);
   socket->SignalWriteEvent.connect(this, &XmppSocketAdapter::OnWriteEvent);
   socket->SignalConnectEvent.connect(this, &XmppSocketAdapter::OnConnectEvent);
   socket->SignalCloseEvent.connect(this, &XmppSocketAdapter::OnCloseEvent);
 
   // The linux implementation of socket::Connect returns an error when the
   // connect didn't complete yet.  This can be distinguished from a failure
@@ skipping 271 matching lines @@
   Error error = ERROR_NONE;
   int wsa_error = 0;
   FlushWriteQueue(&error, &wsa_error);
   if (error != ERROR_NONE) {
     Close();
     return false;
   }
   return true;
 }
 
-}  // namespace remoting
+}  // namespace notifier