| OLD | NEW | 
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "remoting/signaling/xmpp_login_handler.h" | 5 #include "remoting/signaling/xmpp_login_handler.h" | 
| 6 | 6 | 
| 7 #include <utility> | 7 #include <utility> | 
| 8 | 8 | 
| 9 #include "base/base64.h" | 9 #include "base/base64.h" | 
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" | 
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 44       login_handler_.reset(); | 44       login_handler_.reset(); | 
| 45   } | 45   } | 
| 46 | 46 | 
| 47   void StartTls() override { | 47   void StartTls() override { | 
| 48     start_tls_called_ = true; | 48     start_tls_called_ = true; | 
| 49     if (delete_login_handler_from_delegate_) | 49     if (delete_login_handler_from_delegate_) | 
| 50       login_handler_.reset(); | 50       login_handler_.reset(); | 
| 51   } | 51   } | 
| 52 | 52 | 
| 53   void OnHandshakeDone(const std::string& jid, | 53   void OnHandshakeDone(const std::string& jid, | 
| 54                        scoped_ptr<XmppStreamParser> parser) override { | 54                        std::unique_ptr<XmppStreamParser> parser) override { | 
| 55     jid_ = jid; | 55     jid_ = jid; | 
| 56     parser_ = std::move(parser); | 56     parser_ = std::move(parser); | 
| 57     if (delete_login_handler_from_delegate_) | 57     if (delete_login_handler_from_delegate_) | 
| 58       login_handler_.reset(); | 58       login_handler_.reset(); | 
| 59   } | 59   } | 
| 60 | 60 | 
| 61   void OnLoginHandlerError(SignalStrategy::Error error) override { | 61   void OnLoginHandlerError(SignalStrategy::Error error) override { | 
| 62     EXPECT_NE(error, SignalStrategy::OK); | 62     EXPECT_NE(error, SignalStrategy::OK); | 
| 63     error_ = error; | 63     error_ = error; | 
| 64     if (delete_login_handler_from_delegate_) | 64     if (delete_login_handler_from_delegate_) | 
| 65       login_handler_.reset(); | 65       login_handler_.reset(); | 
| 66   } | 66   } | 
| 67 | 67 | 
| 68  protected: | 68  protected: | 
| 69   void HandshakeBase(); | 69   void HandshakeBase(); | 
| 70 | 70 | 
| 71   base::MessageLoop message_loop_; | 71   base::MessageLoop message_loop_; | 
| 72 | 72 | 
| 73   scoped_ptr<XmppLoginHandler> login_handler_; | 73   std::unique_ptr<XmppLoginHandler> login_handler_; | 
| 74   std::string sent_data_; | 74   std::string sent_data_; | 
| 75   bool start_tls_called_; | 75   bool start_tls_called_; | 
| 76   std::string jid_; | 76   std::string jid_; | 
| 77   scoped_ptr<XmppStreamParser> parser_; | 77   std::unique_ptr<XmppStreamParser> parser_; | 
| 78   SignalStrategy::Error error_; | 78   SignalStrategy::Error error_; | 
| 79   bool delete_login_handler_from_delegate_ = false; | 79   bool delete_login_handler_from_delegate_ = false; | 
| 80 }; | 80 }; | 
| 81 | 81 | 
| 82 void XmppLoginHandlerTest::HandshakeBase() { | 82 void XmppLoginHandlerTest::HandshakeBase() { | 
| 83   login_handler_.reset( | 83   login_handler_.reset( | 
| 84       new XmppLoginHandler("google.com", kTestUsername, kTestToken, | 84       new XmppLoginHandler("google.com", kTestUsername, kTestToken, | 
| 85                            XmppLoginHandler::TlsMode::WITHOUT_HANDSHAKE, this)); | 85                            XmppLoginHandler::TlsMode::WITHOUT_HANDSHAKE, this)); | 
| 86   login_handler_->Start(); | 86   login_handler_->Start(); | 
| 87   EXPECT_TRUE(start_tls_called_); | 87   EXPECT_TRUE(start_tls_called_); | 
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 257   login_handler_.reset( | 257   login_handler_.reset( | 
| 258       new XmppLoginHandler("google.com", kTestUsername, kTestToken, | 258       new XmppLoginHandler("google.com", kTestUsername, kTestToken, | 
| 259                            XmppLoginHandler::TlsMode::WITHOUT_HANDSHAKE, this)); | 259                            XmppLoginHandler::TlsMode::WITHOUT_HANDSHAKE, this)); | 
| 260   delete_login_handler_from_delegate_ = true; | 260   delete_login_handler_from_delegate_ = true; | 
| 261   login_handler_->Start(); | 261   login_handler_->Start(); | 
| 262   EXPECT_TRUE(start_tls_called_); | 262   EXPECT_TRUE(start_tls_called_); | 
| 263   EXPECT_FALSE(login_handler_); | 263   EXPECT_FALSE(login_handler_); | 
| 264 } | 264 } | 
| 265 | 265 | 
| 266 }  // namespace remoting | 266 }  // namespace remoting | 
| OLD | NEW | 
|---|