Minor cleanups in JingleSession and JingleSessionManager.

remoting/protocol/jingle_session_manager.h

 // Copyright (c) 2011 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 <list>
 #include <string>
 
@@ skipping 19 matching lines @@
 
 namespace protocol {
 
 // This class implements SessionClient for Chromoting sessions. It acts as a
 // server that accepts chromoting connections and can also make new connections
 // to other hosts.
 class JingleSessionManager
     : public SessionManager,
       public cricket::SessionClient {
  public:
-  JingleSessionManager(
+  virtual ~JingleSessionManager();
+
+  static JingleSessionManager* Create();
+  static JingleSessionManager* Create(

[Wez, 2011/07/06 21:24:25]

nit: It's not clear from the name what kinds of network manager, etc, Connect()
causes to be used; give it a more descriptive name?

[Sergey Ulanov, 2011/07/06 23:15:01]

Done.

       talk_base::NetworkManager* network_manager,
       talk_base::PacketSocketFactory* socket_factory,
       PortAllocatorSessionFactory* port_allocator_session_factory);
-  virtual ~JingleSessionManager();
 
   // SessionManager interface.
   virtual void Init(const std::string& local_jid,
                     SignalStrategy* signal_strategy,
                     IncomingSessionCallback* incoming_session_callback,
                     crypto::RSAPrivateKey* private_key,
                     scoped_refptr<net::X509Certificate> certificate) OVERRIDE;
   virtual Session* Connect(
       const std::string& host_jid,
       const std::string& host_public_key,
@@ skipping 14 matching lines @@
                             const cricket::ContentDescription** content,
                             cricket::ParseError* error) OVERRIDE;
   virtual bool WriteContent(cricket::SignalingProtocol protocol,
                             const cricket::ContentDescription* content,
                             buzz::XmlElement** elem,
                             cricket::WriteError* error) OVERRIDE;
 
  private:
   friend class JingleSession;
 
+  JingleSessionManager(
+      talk_base::NetworkManager* network_manager,
+      talk_base::PacketSocketFactory* socket_factory,
+      PortAllocatorSessionFactory* port_allocator_session_factory);
+
   // Called by JingleSession when a new connection is
   // initiated. Returns true if session is accepted.
   bool AcceptConnection(JingleSession* jingle_session,
                         cricket::Session* cricket_session);
 
   // Called by JingleSession when it is being destroyed.
   void SessionDestroyed(JingleSession* jingle_session);
 
-  void DoConnect(
-      JingleSession* jingle_session,
-      const std::string& host_jid,
-      const std::string& host_public_key,
-      const std::string& client_token,
-      Session::StateChangeCallback* state_change_callback);
-
   // Callback for JingleInfoRequest.
   void OnJingleInfo(
       const std::string& token,
       const std::vector<std::string>& relay_hosts,
       const std::vector<talk_base::SocketAddress>& stun_hosts);
 
   // Creates cricket::SessionManager.
   void DoStartSessionManager();
 
   // Creates session description for outgoing session.
@@ skipping 35 matching lines @@
 
   ScopedRunnableMethodFactory<JingleSessionManager> task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleSessionManager);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_JINGLE_SESSION_MANAGER_H_