New libjingle integrated to chrome.

chrome/common/net/notifier/communicator/single_login_attempt.cc

Index: chrome/common/net/notifier/communicator/single_login_attempt.cc
diff --git a/chrome/common/net/notifier/communicator/single_login_attempt.cc b/chrome/common/net/notifier/communicator/single_login_attempt.cc
index 965a024902e23db64b0ddd56740f63f7f88ee5f9..706c8f29253f9f5aa22cb5dc2ad04e31ea8f30db 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/winsock_initializer.h"
+#include "talk/base/win32socketinit.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/xmppconstants.h"
+#include "talk/xmpp/constants.h"
 
 namespace notifier {
 
@@ -82,19 +82,19 @@ class GaiaTokenPreXmppAuth : public buzz::PreXmppAuth {
     SignalAuthDone();
   }
 
-  virtual bool IsAuthDone() { return true; }
+  virtual bool IsAuthDone() const { return true; }
 
-  virtual bool IsAuthorized() { return true; }
+  virtual bool IsAuthorized() const { return true; }
 
-  virtual bool HadError() { return false; }
+  virtual bool HadError() const { return false; }
 
-  virtual int GetError() { return 0; }
+  virtual int GetError() const { return 0; }
 
-  virtual buzz::CaptchaChallenge GetCaptchaChallenge() {
+  virtual buzz::CaptchaChallenge GetCaptchaChallenge() const {
     return buzz::CaptchaChallenge();
   }
 
-  virtual std::string GetAuthCookie() { return std::string(); }
+  virtual std::string GetAuthCookie() const { return std::string(); }
 
   // buzz::SaslHandler implementation.
 
@@ -114,9 +114,10 @@ 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) {
+                                std::string* tls_server_domain) const {
     std::string server_ip = server.IPAsString();
     if ((server_ip == buzz::STR_TALK_GOOGLE_COM) ||
         (server_ip == buzz::STR_TALKX_L_GOOGLE_COM)) {
@@ -136,7 +137,7 @@ class GaiaTokenPreXmppAuth : public buzz::PreXmppAuth {
 
 }  // namespace
 
-SingleLoginAttempt::SingleLoginAttempt(talk_base::Task* parent,
+SingleLoginAttempt::SingleLoginAttempt(talk_base::TaskParent* parent,
                                        LoginSettings* login_settings,
                                        bool successful_connection)
     : talk_base::Task(parent),