Remove rtc::SocketAddress from PreXmppAuth::StartPreXmppAuth.

The end goal is to stop using rtc::SocketAddress in libjingle_xmpp, it seems that PreXmppAuth::StartPreXmppAuth doesn't use this parameter so this CL removes it. It seems that a deeper refactoring is needed, most of the parameters are unused. Bug: 919085 Change-Id: I5039296580995303cc0df3a2a89ac75bbc0a669a Reviewed-on: https://chromium-review.googlesource.com/c/1405322 Commit-Queue: Sergey Ulanov <sergeyu@chromium.org> Reviewed-by: Sergey Ulanov <sergeyu@chromium.org> Cr-Commit-Position: refs/heads/master@{#621793}
Denger-Network · Jan 10, 2019 · 5a0f1a1 · 5a0f1a1
1 parent bb118ea
commit 5a0f1a1
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc b/jingle/notifier/base/gaia_token_pre_xmpp_auth.cc
@@ -65,7 +65,6 @@ GaiaTokenPreXmppAuth::~GaiaTokenPreXmppAuth() { }
 
 void GaiaTokenPreXmppAuth::StartPreXmppAuth(
     const buzz::Jid& jid,
-    const rtc::SocketAddress& server,
     const std::string& pass,
     const std::string& auth_mechanism,
     const std::string& auth_token) {

diff --git a/jingle/notifier/base/gaia_token_pre_xmpp_auth.h b/jingle/notifier/base/gaia_token_pre_xmpp_auth.h
@@ -28,7 +28,6 @@ class GaiaTokenPreXmppAuth : public buzz::PreXmppAuth {
   // all the methods out as we don't actually do any authentication at
   // this point.
   void StartPreXmppAuth(const buzz::Jid& jid,
-                        const rtc::SocketAddress& server,
                         const std::string& pass,
                         const std::string& auth_mechanism,
                         const std::string& auth_token) override;

diff --git a/jingle/notifier/base/xmpp_connection_unittest.cc b/jingle/notifier/base/xmpp_connection_unittest.cc
@@ -50,9 +50,8 @@ class MockPreXmppAuth : public buzz::PreXmppAuth {
                std::string(const std::vector<std::string>&, bool));
   MOCK_METHOD1(CreateSaslMechanism,
                buzz::SaslMechanism*(const std::string&));
-  MOCK_METHOD5(StartPreXmppAuth,
+  MOCK_METHOD4(StartPreXmppAuth,
                void(const buzz::Jid&,
-                    const rtc::SocketAddress&,
                     const std::string&,
                     const std::string&,
                     const std::string&));
@@ -127,7 +126,7 @@ TEST_F(XmppConnectionTest, ImmediateFailure) {
 }
 
 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));
@@ -148,7 +147,7 @@ TEST_F(XmppConnectionTest, PreAuthFailure) {
 }
 
 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_, GetAuthMechanism()).WillOnce(Return(""));

diff --git a/third_party/libjingle_xmpp/xmpp/prexmppauth.h b/third_party/libjingle_xmpp/xmpp/prexmppauth.h
@@ -49,7 +49,6 @@ class PreXmppAuth : public SaslHandler {
 
   virtual void StartPreXmppAuth(
     const Jid& jid,
-    const rtc::SocketAddress& server,
     const std::string& pass,
     const std::string& auth_mechanism,
     const std::string& auth_token) = 0;

diff --git a/third_party/libjingle_xmpp/xmpp/xmppclient.cc b/third_party/libjingle_xmpp/xmpp/xmppclient.cc
@@ -192,7 +192,7 @@ int XmppClient::ProcessStart() {
   if (d_->pre_auth_) {
     d_->pre_auth_->SignalAuthDone.connect(this, &XmppClient::OnAuthDone);
     d_->pre_auth_->StartPreXmppAuth(
-        d_->engine_->GetUser(), d_->server_, d_->pass_,
+        d_->engine_->GetUser(), d_->pass_,
         d_->auth_mechanism_, d_->auth_token_);
     d_->pass_.clear(); // done with this;
     return STATE_PRE_XMPP_LOGIN;