Refactor SignalStrategy so that it can be reused for multiple connections.

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::StatusObserver,
+                       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
   // |environment|, but they should not be deleted until returned host
   // is destroyed.
   static ChromotingHost* Create(ChromotingHostContext* context,
                                 MutableHostConfig* config,
                                 DesktopEnvironment* environment,
                                 bool allow_nat_traversal);
@@ skipping 15 matching lines @@
   // 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::StatusObserver implementation.
-  virtual void OnStateChange(
-      SignalStrategy::StatusObserver::State state) OVERRIDE;
-  virtual void OnJidChange(const std::string& full_jid) OVERRIDE;

[Wez, 2011/12/21 23:35:30]

We can get rid of this because we'll see DISCONNECT->CONNECTED transition on
changes?

[Sergey Ulanov, 2011/12/22 21:45:10]

Because I added GetLocalJid() method.

+  // SignalStrategy::Listener interface.
+  virtual void OnSignalStrategyStateChange(
+      SignalStrategy::State state) OVERRIDE;
+  virtual bool OnSignalStrategyIncomingStanza(
+      const buzz::XmlElement* stanza) 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 OnSessionManagerInitialized() OVERRIDE;
+  virtual void OnSessionManagerReady() OVERRIDE;
   virtual void OnIncomingSession(
       protocol::Session* session,
       protocol::SessionManager::IncomingSessionResponse* response) OVERRIDE;
 
   // Sets desired configuration for the protocol. Ownership of the
   // |config| is transferred to the object. Must be called before Start().
   void set_protocol_config(protocol::CandidateSessionConfig* config);
 
   // TODO(wez): ChromotingHost shouldn't need to know about Me2Mom.
   void set_it2me(bool is_it2me) {
@@ skipping 105 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_