More cleanups in JingleSessionManager interface.

remoting/protocol/jingle_session_manager.h

 // 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.
 
 #ifndef REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_
 #define REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 14 matching lines @@
 class JingleSession;
 class TransportFactory;
 
 // JingleSessionManager and JingleSession implement the subset of the
 // Jingle protocol used in Chromoting. JingleSessionManager provides
 // the protocol::SessionManager interface for accepting incoming and
 // creating outgoing sessions.
 class JingleSessionManager : public SessionManager,
                              public SignalStrategy::Listener {
  public:
-  explicit JingleSessionManager(scoped_ptr<TransportFactory> transport_factory);
+  JingleSessionManager(scoped_ptr<TransportFactory> transport_factory,
+                       SignalStrategy* signal_strategy);
   ~JingleSessionManager() override;
 
   // SessionManager interface.
-  void Init(SignalStrategy* signal_strategy,
-            SessionManager::Listener* listener) override;
+  void AcceptIncoming(
+      const IncomingSessionCallback& incoming_session_callback) override;
   void set_protocol_config(scoped_ptr<CandidateSessionConfig> config) override;
   scoped_ptr<Session> Connect(
       const std::string& host_jid,
       scoped_ptr<Authenticator> authenticator) override;
-  void Close() override;
   void set_authenticator_factory(
       scoped_ptr<AuthenticatorFactory> authenticator_factory) override;
 
+ private:
+  friend class JingleSession;
+
   // SignalStrategy::Listener interface.
   void OnSignalStrategyStateChange(SignalStrategy::State state) override;
   bool OnSignalStrategyIncomingStanza(const buzz::XmlElement* stanza) override;
 
- private:
-  friend class JingleSession;
-
   typedef std::map<std::string, JingleSession*> SessionsMap;
 
   IqSender* iq_sender() { return iq_sender_.get(); }
   void SendReply(const buzz::XmlElement* original_stanza,
                  JingleMessageReply::ErrorType error);
 
   // Called by JingleSession when it is being destroyed.
   void SessionDestroyed(JingleSession* session);
 
+  scoped_ptr<TransportFactory> transport_factory_;
+  SignalStrategy* signal_strategy_;
+  IncomingSessionCallback incoming_session_callback_;
   scoped_ptr<CandidateSessionConfig> protocol_config_;
 
-  scoped_ptr<TransportFactory> transport_factory_;
-  bool fetch_stun_relay_config_;
-
-  SignalStrategy* signal_strategy_;
   scoped_ptr<AuthenticatorFactory> authenticator_factory_;
   scoped_ptr<IqSender> iq_sender_;
-  SessionManager::Listener* listener_;
 
   SessionsMap sessions_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleSessionManager);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_