Move signaling connection creation out of ChromotingHost.

remoting/host/chromoting_host.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_HOST_CHROMOTING_HOST_H_
 #define REMOTING_HOST_CHROMOTING_HOST_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 44 matching lines @@
 //    After we have done all the initialization we'll start the ScreenRecorder.
 //    We'll then enter the running state of the host process.
 //
 // 3. When the user is disconnected, we will pause the ScreenRecorder
 //    and try to terminate the threads we have created. This will allow
 //    all pending tasks to complete. After all of that completed we
 //    return to the idle state. We then go to step (2) if there a new
 //    incoming connection.
 class ChromotingHost : public base::RefCountedThreadSafe<ChromotingHost>,
                        public ClientSession::EventHandler,
-                       public SignalStrategy::Listener,
                        public protocol::SessionManager::Listener {
  public:
-  // Factory methods that must be used to create ChromotingHost
-  // instances. It does NOT take ownership of |context|, and
+  // Caller keeps ownership of |context|, |signal_strategy| and
   // |environment|, but they should not be deleted until returned host
   // is destroyed.

[Wez, 2012/01/03 16:25:04]

nit: Reword, e.g. "Creates a ChromotingHost instance, which takes ownership of
|config|.  The caller must ensure that |context|, |signal_strategy| and
|environment| out-live the ChromotingHost."

[Sergey Ulanov, 2012/01/03 21:51:02]

Done. This is a constructor, so I don't think that the comment needs to state
that it creates ChrtomotingHostInstance. Also, |config| is ref-counted, and I
removed this parameter in one of the next CLs.

-  static ChromotingHost* Create(ChromotingHostContext* context,
-                                MutableHostConfig* config,
-                                DesktopEnvironment* environment,
-                                bool allow_nat_traversal);
+  ChromotingHost(ChromotingHostContext* context,
+                 MutableHostConfig* config,
+                 SignalStrategy* signal_strategy,
+                 DesktopEnvironment* environment,
+                 bool allow_nat_traversal);
 
   // Asynchronously start the host process.
   //
   // After this is invoked, the host process will connect to the talk
   // network and start listening for incoming connections.
   //
   // This method can only be called once during the lifetime of this object.
   void Start();
 
   // Asynchronously shutdown the host process. |shutdown_task| is
   // called after shutdown is completed.
   void Shutdown(const base::Closure& shutdown_task);
 
   // Adds |observer| to the list of status observers. Doesn't take
   // ownership of |observer|, so |observer| must outlive this
   // object. All status observers must be added before the host is
   // started.
   void AddStatusObserver(HostStatusObserver* observer);
 
   // Sets shared secret for the host. All incoming connections are
   // rejected if shared secret isn't set. Must be called on the
   // network thread after the host is started.
   void SetSharedSecret(const std::string& shared_secret);
 
   ////////////////////////////////////////////////////////////////////////////
-  // SignalStrategy::Listener interface.
-  virtual void OnSignalStrategyStateChange(
-      SignalStrategy::State state) OVERRIDE;
-
-  ////////////////////////////////////////////////////////////////////////////
   // ClientSession::EventHandler implementation.
   virtual void OnSessionAuthenticated(ClientSession* client) OVERRIDE;
   virtual void OnSessionAuthenticationFailed(ClientSession* client) OVERRIDE;
   virtual void OnSessionClosed(ClientSession* session) OVERRIDE;
   virtual void OnSessionSequenceNumber(ClientSession* session,
                                        int64 sequence_number) OVERRIDE;
 
   // SessionManager::Listener implementation.
   virtual void OnSessionManagerReady() OVERRIDE;
   virtual void OnIncomingSession(
@@ skipping 29 matching lines @@
   typedef std::vector<HostStatusObserver*> StatusObserverList;
   typedef std::vector<ClientSession*> ClientList;
 
   enum State {
     kInitial,
     kStarted,
     kStopping,
     kStopped,
   };
 
-  // Caller keeps ownership of |context| and |environment|.
-  ChromotingHost(ChromotingHostContext* context,
-                 MutableHostConfig* config,
-                 DesktopEnvironment* environment,
-                 bool allow_nat_traversal);
   virtual ~ChromotingHost();
 
   // Creates encoder for the specified configuration.
   Encoder* CreateEncoder(const protocol::SessionConfig& config);
 
   std::string GenerateHostAuthToken(const std::string& encoded_client_token);
 
   void AddAuthenticatedClient(ClientSession* client,
                               const protocol::SessionConfig& config,
                               const std::string& jid);
@@ skipping 19 matching lines @@
   // TODO(lambroslambrou): The following is a temporary fix for Me2Me
   // (crbug.com/105995), pending the AuthenticatorFactory work.
   // Cache the shared secret, in case SetSharedSecret() is called before the
   // session manager has been created.
   // The |have_shared_secret_| flag is to distinguish SetSharedSecret() not
   // being called at all, from being called with an empty string.
   std::string shared_secret_;
   bool have_shared_secret_;
 
   // Connection objects.
-  scoped_ptr<SignalStrategy> signal_strategy_;
-  std::string local_jid_;
+  SignalStrategy* signal_strategy_;
   scoped_ptr<protocol::SessionManager> session_manager_;
 
   // StatusObserverList is thread-safe and can be used on any thread.
   StatusObserverList status_observers_;
 
   // The connections to remote clients.
   ClientList clients_;
 
   // Session manager for the host process.
   scoped_refptr<ScreenRecorder> recorder_;
@@ skipping 19 matching lines @@
   bool is_it2me_;
   std::string access_code_;
   UiStrings ui_strings_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromotingHost);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CHROMOTING_HOST_H_