| Index: remoting/protocol/pepper_session_manager.h
|
| diff --git a/remoting/protocol/pepper_session_manager.h b/remoting/protocol/pepper_session_manager.h
|
| index 41c06f6d8a8dea754e52e1e5a80daf6889cfe513..3ae1823b66ab4a44d3ef6d53ead7a4f2dffdf235 100644
|
| --- a/remoting/protocol/pepper_session_manager.h
|
| +++ b/remoting/protocol/pepper_session_manager.h
|
| @@ -51,16 +51,15 @@ class PepperSessionManager : public SessionManager,
|
| virtual void Init(const std::string& local_jid,
|
| SignalStrategy* signal_strategy,
|
| SessionManager::Listener* listener,
|
| - crypto::RSAPrivateKey* private_key,
|
| - const std::string& certificate,
|
| bool allow_nat_traversal) OVERRIDE;
|
| virtual Session* Connect(
|
| const std::string& host_jid,
|
| - const std::string& host_public_key,
|
| - const std::string& client_token,
|
| + Authenticator* authenticator,
|
| CandidateSessionConfig* config,
|
| const Session::StateChangeCallback& state_change_callback) OVERRIDE;
|
| virtual void Close() OVERRIDE;
|
| + virtual void set_authenticator_factory(
|
| + AuthenticatorFactory* authenticator_factory) OVERRIDE;
|
|
|
| // SignalStrategy::Listener interface.
|
| virtual bool OnIncomingStanza(const buzz::XmlElement* stanza) OVERRIDE;
|
| @@ -86,10 +85,9 @@ class PepperSessionManager : public SessionManager,
|
|
|
| std::string local_jid_;
|
| SignalStrategy* signal_strategy_;
|
| + scoped_ptr<AuthenticatorFactory> authenticator_factory_;
|
| scoped_ptr<IqSender> iq_sender_;
|
| SessionManager::Listener* listener_;
|
| - scoped_ptr<crypto::RSAPrivateKey> private_key_;
|
| - std::string certificate_;
|
| bool allow_nat_traversal_;
|
|
|
| TransportConfig transport_config_;
|
|
|