Revert 48798 - New libjingle integrated to chrome.

BUG=none
TEST=Chrome Sync works

Review URL: http://codereview.chromium.org/2255007

TBR=sergeyu@chromium.org

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

14 files changed, 29 insertions, 35 deletions

diff --git a/chrome/common/net/notifier/base/task_pump.cc b/chrome/common/net/notifier/base/task_pump.cc
index 17bde88..feaf96c 100644
--- a/chrome/common/net/notifier/base/task_pump.cc
+++ b/chrome/common/net/notifier/base/task_pump.cc
@@ -35,10 +35,7 @@ void TaskPump::CheckAndRunTasks() {
   posted_wake_ = false;
   // We shouldn't be using libjingle for timeout tasks, so we should
   // have no timeout tasks at all.
-
-  // TODO(akalin): Add HasTimeoutTask() back in TaskRunner class and
-  // uncomment this check.
-  // DCHECK(!HasTimeoutTask())
+  DCHECK(!HasTimeoutTask());
   RunTasks();
 }
 
diff --git a/chrome/common/net/notifier/communicator/connection_settings.cc b/chrome/common/net/notifier/communicator/connection_settings.cc
index 39005a2..0080322 100644
--- a/chrome/common/net/notifier/communicator/connection_settings.cc
+++ b/chrome/common/net/notifier/communicator/connection_settings.cc
@@ -17,7 +17,7 @@ namespace notifier {
 class RandomGenerator {
  public:
   int operator()(int ceiling) {
-    return static_cast<int>(talk_base::CreateRandomId() % ceiling);
+    return static_cast<int>(cricket::CreateRandomId() % ceiling);
   }
 };
 
@@ -58,7 +58,7 @@ void ConnectionSettingsList::AddPermutations(const std::string& hostname,
 
   // Permute addresses for this server. In some cases we haven't resolved the
   // to ip addresses.
-  talk_base::SocketAddress server(hostname, port);
+  talk_base::SocketAddress server(hostname, port, false);
   if (iplist_random.empty()) {
     // We couldn't pre-resolve the hostname, so let's hope it will resolve
     // further down the pipeline (by a proxy, for example).
diff --git a/chrome/common/net/notifier/communicator/login.cc b/chrome/common/net/notifier/communicator/login.cc
index 3566714..552eec6 100644
--- a/chrome/common/net/notifier/communicator/login.cc
+++ b/chrome/common/net/notifier/communicator/login.cc
@@ -35,7 +35,7 @@ static const int kRedirectTimeoutMinutes = 5;
 // Disconnect if network stays down for more than 10 seconds.
 static const int kDisconnectionDelaySecs = 10;
 
-Login::Login(talk_base::TaskParent* parent,
+Login::Login(talk_base::Task* parent,
              const buzz::XmppClientSettings& user_settings,
              const ConnectionOptions& options,
              std::string lang,
diff --git a/chrome/common/net/notifier/communicator/login.h b/chrome/common/net/notifier/communicator/login.h
index 06abef0..2eac1c4 100644
--- a/chrome/common/net/notifier/communicator/login.h
+++ b/chrome/common/net/notifier/communicator/login.h
@@ -31,7 +31,7 @@ class HostResolver;
 namespace talk_base {
 class FirewallManager;
 struct ProxyInfo;
-class TaskParent;
+class Task;
 }  // namespace talk_base
 
 namespace notifier {
@@ -49,7 +49,7 @@ class Login : public net::NetworkChangeNotifier::Observer,
               public sigslot::has_slots<> {
  public:
   // network_status and firewall may be NULL.
-  Login(talk_base::TaskParent* parent,
+  Login(talk_base::Task* parent,
         const buzz::XmppClientSettings& user_settings,
         const ConnectionOptions& options,
         std::string lang,
@@ -124,7 +124,7 @@ class Login : public net::NetworkChangeNotifier::Observer,
 
   void OnDisconnectTimeout();
 
-  talk_base::TaskParent* parent_;
+  talk_base::Task* parent_;
   scoped_ptr<LoginSettings> login_settings_;
   net::NetworkChangeNotifier* network_change_notifier_;
   AutoReconnect auto_reconnect_;
diff --git a/chrome/common/net/notifier/communicator/single_login_attempt.cc b/chrome/common/net/notifier/communicator/single_login_attempt.cc
index 706c8f2..965a024 100644
--- a/chrome/common/net/notifier/communicator/single_login_attempt.cc
+++ b/chrome/common/net/notifier/communicator/single_login_attempt.cc
@@ -21,13 +21,13 @@
 #include "talk/base/firewallsocketserver.h"
 #include "talk/base/signalthread.h"
 #include "talk/base/taskrunner.h"
-#include "talk/base/win32socketinit.h"
+#include "talk/base/winsock_initializer.h"
 #include "talk/xmllite/xmlelement.h"
 #include "talk/xmpp/prexmppauth.h"
 #include "talk/xmpp/saslcookiemechanism.h"
 #include "talk/xmpp/xmppclient.h"
 #include "talk/xmpp/xmppclientsettings.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 
 namespace notifier {
 
@@ -82,19 +82,19 @@ class GaiaTokenPreXmppAuth : public buzz::PreXmppAuth {
     SignalAuthDone();
   }
 
-  virtual bool IsAuthDone() const { return true; }
+  virtual bool IsAuthDone() { return true; }
 
-  virtual bool IsAuthorized() const { return true; }
+  virtual bool IsAuthorized() { return true; }
 
-  virtual bool HadError() const { return false; }
+  virtual bool HadError() { return false; }
 
-  virtual int GetError() const { return 0; }
+  virtual int GetError() { return 0; }
 
-  virtual buzz::CaptchaChallenge GetCaptchaChallenge() const {
+  virtual buzz::CaptchaChallenge GetCaptchaChallenge() {
     return buzz::CaptchaChallenge();
   }
 
-  virtual std::string GetAuthCookie() const { return std::string(); }
+  virtual std::string GetAuthCookie() { return std::string(); }
 
   // buzz::SaslHandler implementation.
 
@@ -114,10 +114,9 @@ class GaiaTokenPreXmppAuth : public buzz::PreXmppAuth {
         : NULL;
   }
 
-  // TODO(akalin): remove this code.
   virtual bool GetTlsServerInfo(const talk_base::SocketAddress& server,
                                 std::string* tls_server_hostname,
-                                std::string* tls_server_domain) const {
+                                std::string* tls_server_domain) {
     std::string server_ip = server.IPAsString();
     if ((server_ip == buzz::STR_TALK_GOOGLE_COM) ||
         (server_ip == buzz::STR_TALKX_L_GOOGLE_COM)) {
@@ -137,7 +136,7 @@ class GaiaTokenPreXmppAuth : public buzz::PreXmppAuth {
 
 }  // namespace
 
-SingleLoginAttempt::SingleLoginAttempt(talk_base::TaskParent* parent,
+SingleLoginAttempt::SingleLoginAttempt(talk_base::Task* parent,
                                        LoginSettings* login_settings,
                                        bool successful_connection)
     : talk_base::Task(parent),
diff --git a/chrome/common/net/notifier/communicator/single_login_attempt.h b/chrome/common/net/notifier/communicator/single_login_attempt.h
index 245fa9d..4d63cf0 100644
--- a/chrome/common/net/notifier/communicator/single_login_attempt.h
+++ b/chrome/common/net/notifier/communicator/single_login_attempt.h
@@ -46,7 +46,7 @@ class XmppConnectionGenerator;
 // fragile.
 class SingleLoginAttempt : public talk_base::Task, public sigslot::has_slots<> {
  public:
-  SingleLoginAttempt(talk_base::TaskParent* parent,
+  SingleLoginAttempt(talk_base::Task* parent,
                      LoginSettings* login_settings,
                      bool successful_connection);
   ~SingleLoginAttempt();
diff --git a/chrome/common/net/notifier/communicator/ssl_socket_adapter.cc b/chrome/common/net/notifier/communicator/ssl_socket_adapter.cc
index 9742283..1426864 100644
--- a/chrome/common/net/notifier/communicator/ssl_socket_adapter.cc
+++ b/chrome/common/net/notifier/communicator/ssl_socket_adapter.cc
@@ -95,7 +95,7 @@ int SSLSocketAdapter::BeginSSL() {
   // are correct for us, so we don't use the config service to initialize this
   // object.
   net::SSLConfig ssl_config;
-  transport_socket_->set_addr(talk_base::SocketAddress(hostname_, 0));
+  transport_socket_->set_addr(talk_base::SocketAddress(hostname_.c_str()));
   ssl_socket_.reset(
       net::ClientSocketFactory::GetDefaultFactory()->CreateSSLClientSocket(
           transport_socket_, hostname_.c_str(), ssl_config));
diff --git a/chrome/common/net/notifier/communicator/xmpp_socket_adapter.cc b/chrome/common/net/notifier/communicator/xmpp_socket_adapter.cc
index 7fe2b17..da44352 100644
--- a/chrome/common/net/notifier/communicator/xmpp_socket_adapter.cc
+++ b/chrome/common/net/notifier/communicator/xmpp_socket_adapter.cc
@@ -15,7 +15,6 @@
 #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"
 
@@ -34,7 +33,7 @@ XmppSocketAdapter::XmppSocketAdapter(const buzz::XmppClientSettings& xcs,
     write_buffer_capacity_(0),
     allow_unverified_certs_(allow_unverified_certs) {
   proxy_.type = xcs.proxy();
-  proxy_.address.SetIP(xcs.proxy_host());
+  proxy_.address.SetIP(xcs.proxy_host(), false);
   proxy_.address.SetPort(xcs.proxy_port());
   proxy_.username = xcs.proxy_user();
   proxy_.password = xcs.proxy_pass();
diff --git a/chrome/common/net/notifier/listener/listen_task.cc b/chrome/common/net/notifier/listener/listen_task.cc
index 715eeb9..03a74f4 100644
--- a/chrome/common/net/notifier/listener/listen_task.cc
+++ b/chrome/common/net/notifier/listener/listen_task.cc
@@ -11,7 +11,7 @@
 #include "talk/xmllite/qname.h"
 #include "talk/xmllite/xmlelement.h"
 #include "talk/xmpp/xmppclient.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 #include "talk/xmpp/xmppengine.h"
 
 namespace notifier {
diff --git a/chrome/common/net/notifier/listener/send_update_task.cc b/chrome/common/net/notifier/listener/send_update_task.cc
index eeeb0d1..29398ce 100644
--- a/chrome/common/net/notifier/listener/send_update_task.cc
+++ b/chrome/common/net/notifier/listener/send_update_task.cc
@@ -12,11 +12,11 @@
 #include "chrome/common/net/notifier/listener/xml_element_util.h"
 #include "talk/xmllite/qname.h"
 #include "talk/xmpp/xmppclient.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 
 namespace notifier {
 
-SendUpdateTask::SendUpdateTask(TaskParent* parent,
+SendUpdateTask::SendUpdateTask(Task* parent,
                                const OutgoingNotificationData& data)
     : XmppTask(parent, buzz::XmppEngine::HL_SINGLE),  // Watch for one reply.
       notification_data_(data) {
diff --git a/chrome/common/net/notifier/listener/send_update_task.h b/chrome/common/net/notifier/listener/send_update_task.h
index 2d78dfd..4ee5df7 100644
--- a/chrome/common/net/notifier/listener/send_update_task.h
+++ b/chrome/common/net/notifier/listener/send_update_task.h
@@ -18,7 +18,7 @@ namespace notifier {
 
 class SendUpdateTask : public buzz::XmppTask {
  public:
-  SendUpdateTask(TaskParent* parent, const OutgoingNotificationData& data);
+  SendUpdateTask(Task* parent, const OutgoingNotificationData& data);
   virtual ~SendUpdateTask();
 
   // Overridden from buzz::XmppTask.
diff --git a/chrome/common/net/notifier/listener/subscribe_task.cc b/chrome/common/net/notifier/listener/subscribe_task.cc
index ce12e54..9a4047e 100644
--- a/chrome/common/net/notifier/listener/subscribe_task.cc
+++ b/chrome/common/net/notifier/listener/subscribe_task.cc
@@ -13,13 +13,13 @@
 #include "talk/xmllite/qname.h"
 #include "talk/xmllite/xmlelement.h"
 #include "talk/xmpp/xmppclient.h"
-#include "talk/xmpp/constants.h"
+#include "talk/xmpp/xmppconstants.h"
 #include "talk/xmpp/xmppengine.h"
 
 namespace notifier {
 
 SubscribeTask::SubscribeTask(
-    TaskParent* parent,
+    Task* parent,
     const std::vector<std::string>& subscribed_services_list)
     : XmppTask(parent, buzz::XmppEngine::HL_SINGLE),
       subscribed_services_list_(subscribed_services_list) {
diff --git a/chrome/common/net/notifier/listener/subscribe_task.h b/chrome/common/net/notifier/listener/subscribe_task.h
index 6d236ef..5aa0685 100644
--- a/chrome/common/net/notifier/listener/subscribe_task.h
+++ b/chrome/common/net/notifier/listener/subscribe_task.h
@@ -21,7 +21,7 @@ namespace notifier {
 // in this class and any other class that uses notification_method.
 class SubscribeTask : public buzz::XmppTask {
  public:
-  SubscribeTask(TaskParent* parent,
+  SubscribeTask(Task* parent,
                 const std::vector<std::string>& subscribed_services_list);
   virtual ~SubscribeTask();
 
diff --git a/chrome/common/net/notifier/listener/subscribe_task_unittest.cc b/chrome/common/net/notifier/listener/subscribe_task_unittest.cc
index fb455b2..cda6b75 100644
--- a/chrome/common/net/notifier/listener/subscribe_task_unittest.cc
+++ b/chrome/common/net/notifier/listener/subscribe_task_unittest.cc
@@ -33,10 +33,9 @@ class SubscribeTaskTest : public testing::Test {
 
 TEST_F(SubscribeTaskTest, MakeSubscriptionMessage) {
   std::vector<std::string> subscribed_services_list;
-
   scoped_ptr<buzz::XmlElement> message_without_services(
       SubscribeTask::MakeSubscriptionMessage(subscribed_services_list,
-                                    to_jid_bare_, task_id_));
+                                             to_jid_bare_, task_id_));
   std::string expected_xml_string =
       StringPrintf(
           "<cli:iq type=\"get\" to=\"%s\" id=\"%s\" "
@@ -52,7 +51,7 @@ TEST_F(SubscribeTaskTest, MakeSubscriptionMessage) {
   subscribed_services_list.push_back("test_service_url2");
   scoped_ptr<buzz::XmlElement> message_with_services(
       SubscribeTask::MakeSubscriptionMessage(subscribed_services_list,
-                                    to_jid_bare_, task_id_));
+                                             to_jid_bare_, task_id_));
   expected_xml_string =
       StringPrintf(
           "<cli:iq type=\"get\" to=\"%s\" id=\"%s\" "