Changes needed to roll libjingle r141

jingle/notifier/base/xmpp_connection_unittest.cc

 // 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.
 
 #include "jingle/notifier/base/xmpp_connection.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 29 matching lines @@
 using ::testing::SaveArg;
 
 class MockPreXmppAuth : public buzz::PreXmppAuth {
  public:
   virtual ~MockPreXmppAuth() {}
 
   MOCK_METHOD2(ChooseBestSaslMechanism,
                std::string(const std::vector<std::string>&, bool));
   MOCK_METHOD1(CreateSaslMechanism,
                buzz::SaslMechanism*(const std::string&));
-  MOCK_METHOD4(StartPreXmppAuth,
+  MOCK_METHOD5(StartPreXmppAuth,
                void(const buzz::Jid&,
                     const talk_base::SocketAddress&,
                     const talk_base::CryptString&,
+                    const std::string&,
                     const std::string&));
   MOCK_CONST_METHOD0(IsAuthDone, bool());
   MOCK_CONST_METHOD0(IsAuthorized, bool());
   MOCK_CONST_METHOD0(HadError, bool());
   MOCK_CONST_METHOD0(GetError, int());
   MOCK_CONST_METHOD0(GetCaptchaChallenge, buzz::CaptchaChallenge());
-  MOCK_CONST_METHOD0(GetAuthCookie, std::string());
+  MOCK_CONST_METHOD0(GetAuthToken, std::string());
+  MOCK_CONST_METHOD0(GetAuthMechanism, std::string());
 };
 
 class MockXmppConnectionDelegate : public XmppConnection::Delegate {
  public:
   virtual ~MockXmppConnectionDelegate() {}
 
   MOCK_METHOD1(OnConnect, void(base::WeakPtr<buzz::XmppTaskParentInterface>));
   MOCK_METHOD3(OnError,
                void(buzz::XmppEngine::Error, int, const buzz::XmlElement*));
 };
@@ skipping 35 matching lines @@
   XmppConnection xmpp_connection(buzz::XmppClientSettings(),
                                  url_request_context_getter_,
                                  &mock_xmpp_connection_delegate_, NULL);
 
   // We need to do this *before* |xmpp_connection| gets destroyed or
   // our delegate won't be called.
   message_loop_.RunAllPending();
 }
 
 TEST_F(XmppConnectionTest, PreAuthFailure) {
-  EXPECT_CALL(*mock_pre_xmpp_auth_, StartPreXmppAuth(_, _, _, _));
+  EXPECT_CALL(*mock_pre_xmpp_auth_, StartPreXmppAuth(_, _, _, _,_));
   EXPECT_CALL(*mock_pre_xmpp_auth_, IsAuthDone()).WillOnce(Return(true));
   EXPECT_CALL(*mock_pre_xmpp_auth_, IsAuthorized()).WillOnce(Return(false));
   EXPECT_CALL(*mock_pre_xmpp_auth_, HadError()).WillOnce(Return(true));
   EXPECT_CALL(*mock_pre_xmpp_auth_, GetError()).WillOnce(Return(5));
 
   EXPECT_CALL(mock_xmpp_connection_delegate_,
               OnError(buzz::XmppEngine::ERROR_AUTH, 5, NULL));
 
   XmppConnection xmpp_connection(
       buzz::XmppClientSettings(), url_request_context_getter_,
       &mock_xmpp_connection_delegate_, mock_pre_xmpp_auth_.release());
 
   // We need to do this *before* |xmpp_connection| gets destroyed or
   // our delegate won't be called.
   message_loop_.RunAllPending();
 }
 
 TEST_F(XmppConnectionTest, FailureAfterPreAuth) {
-  EXPECT_CALL(*mock_pre_xmpp_auth_, StartPreXmppAuth(_, _, _, _));
+  EXPECT_CALL(*mock_pre_xmpp_auth_, StartPreXmppAuth(_, _, _, _,_));
   EXPECT_CALL(*mock_pre_xmpp_auth_, IsAuthDone()).WillOnce(Return(true));
   EXPECT_CALL(*mock_pre_xmpp_auth_, IsAuthorized()).WillOnce(Return(true));
-  EXPECT_CALL(*mock_pre_xmpp_auth_, GetAuthCookie()).WillOnce(Return(""));
+  EXPECT_CALL(*mock_pre_xmpp_auth_, GetAuthMechanism()).WillOnce(Return(""));
+  EXPECT_CALL(*mock_pre_xmpp_auth_, GetAuthToken()).WillOnce(Return(""));
 
   EXPECT_CALL(mock_xmpp_connection_delegate_,
               OnError(buzz::XmppEngine::ERROR_NONE, 0, NULL));
 
   XmppConnection xmpp_connection(
       buzz::XmppClientSettings(), url_request_context_getter_,
       &mock_xmpp_connection_delegate_, mock_pre_xmpp_auth_.release());
 
   // We need to do this *before* |xmpp_connection| gets destroyed or
   // our delegate won't be called.
@@ skipping 87 matching lines @@
         .WillByDefault(Return(TASK_STATE_ERROR));
     EXPECT_CALL(*task, ProcessStart()).Times(0);
     task->Start();
   }
 
   // This should destroy |task_pump|, but |task| still shouldn't run.
   message_loop_.RunAllPending();
 }
 
 }  // namespace notifier