Revert r59012 which started using Chrome sockets for sync.

jingle/notifier/communicator/login.cc

 // Copyright (c) 2010 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 <string>
 
 #include "jingle/notifier/communicator/login.h"
 
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/time.h"
 #include "jingle/notifier/communicator/connection_options.h"
 #include "jingle/notifier/communicator/login_settings.h"
+#include "jingle/notifier/communicator/product_info.h"
 #include "jingle/notifier/communicator/single_login_attempt.h"
 #include "net/base/host_port_pair.h"
 #include "talk/base/common.h"
 #include "talk/base/firewallsocketserver.h"
 #include "talk/base/logging.h"
 #include "talk/base/physicalsocketserver.h"
 #include "talk/base/taskrunner.h"
 #include "talk/xmllite/xmlelement.h"
 #include "talk/xmpp/asyncsocket.h"
 #include "talk/xmpp/prexmppauth.h"
 #include "talk/xmpp/xmppclient.h"
 #include "talk/xmpp/xmppclientsettings.h"
 #include "talk/xmpp/xmppengine.h"
 
 namespace notifier {
 
 // Redirect valid for 5 minutes.
 static const int kRedirectTimeoutMinutes = 5;
 
 Login::Login(talk_base::TaskParent* parent,
+             bool use_chrome_async_socket,
              const buzz::XmppClientSettings& user_settings,
              const ConnectionOptions& options,
              std::string lang,
              net::HostResolver* host_resolver,
              ServerInformation* server_list,
              int server_count,
              talk_base::FirewallManager* firewall,
              bool try_ssltcp_first,
              bool proxy_only)
     : parent_(parent),
+      use_chrome_async_socket_(use_chrome_async_socket),
       login_settings_(new LoginSettings(user_settings,
                                         options,
                                         lang,
                                         host_resolver,
                                         server_list,
                                         server_count,
                                         firewall,
                                         try_ssltcp_first,
                                         proxy_only)),
       state_(STATE_DISCONNECTED),
@@ skipping 19 matching lines @@
     login_settings_->set_server_override(server_override);
   } else {
     login_settings_->clear_server_override();
   }
 
   Disconnect();
 
   LOG(INFO) << "Starting connection...";
 
   single_attempt_ = new SingleLoginAttempt(parent_,
-                                           login_settings_.get());
+                                           login_settings_.get(),
+                                           use_chrome_async_socket_,
+                                           true);
 
   // Do the signaling hook-ups.
   single_attempt_->SignalUnexpectedDisconnect.connect(
       this,
       &Login::TryReconnect);
   single_attempt_->SignalNeedAutoReconnect.connect(
       this,
       &Login::TryReconnect);
   single_attempt_->SignalLoginFailure.connect(this, &Login::OnLoginFailure);
   single_attempt_->SignalLogoff.connect(
@@ skipping 87 matching lines @@
       base::TimeDelta::FromMinutes(30);
   reconnect_interval_ *= 2;
   if (reconnect_interval_ > kMaxReconnectInterval) {
     reconnect_interval_ = kMaxReconnectInterval;
   }
   LOG(INFO) << "Reconnecting...";
   StartConnection();
 }
 
 }  // namespace notifier