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

remoting/protocol/connection_to_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_PROTOCOL_CONNECTION_TO_HOST_H_
 #define REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 22 matching lines @@
 
 class ClientControlDispatcher;
 class ClientEventDispatcher;
 class ClientStub;
 class HostStub;
 class InputStub;
 class SessionConfig;
 class VideoReader;
 class VideoStub;
 
-class ConnectionToHost : public SignalStrategy::StatusObserver,
+class ConnectionToHost : public SignalStrategy::Listener,
                          public SessionManager::Listener {
  public:
   enum State {
     CONNECTING,
     CONNECTED,
     FAILED,
     CLOSED,
   };
 
   enum Error {
@@ skipping 28 matching lines @@
 
   virtual void Disconnect(const base::Closure& shutdown_task);
 
   virtual const SessionConfig& config();
 
   virtual InputStub* input_stub();
 
   virtual HostStub* host_stub();
 
   // SignalStrategy::StatusObserver interface.
-  virtual void OnStateChange(
-      SignalStrategy::StatusObserver::State state) OVERRIDE;
-  virtual void OnJidChange(const std::string& full_jid) OVERRIDE;
+  virtual void OnSignalStrategyStateChange(
+      SignalStrategy::State state) OVERRIDE;
 
   // SessionManager::Listener interface.
-  virtual void OnSessionManagerInitialized() OVERRIDE;
+  virtual void OnSessionManagerReady() OVERRIDE;
   virtual void OnIncomingSession(
       Session* session,
       SessionManager::IncomingSessionResponse* response) OVERRIDE;
 
   // Called when the host accepts the client authentication.
   void OnClientAuthenticated();
 
   // Return the current state of ConnectionToHost.
   State state() const;
 
  private:
-  // Called on the jingle thread after we've successfully to XMPP server. Starts
-  // P2P connection to the host.
-  void InitSession();
-
   // Callback for |session_|.
   void OnSessionStateChange(Session::State state);
 
   // Callbacks for channel initialization
   void OnChannelInitialized(bool successful);
 
   void NotifyIfChannelsReady();
 
   // Callback for |video_reader_|.
   void OnVideoPacket(VideoPacket* packet);
@@ skipping 13 matching lines @@
   std::string host_public_key_;
   std::string access_code_;
 
   HostEventCallback* event_callback_;
 
   // Stub for incoming messages.
   ClientStub* client_stub_;
   VideoStub* video_stub_;
 
   scoped_ptr<SignalStrategy> signal_strategy_;
-  std::string local_jid_;
   scoped_ptr<SessionManager> session_manager_;
   scoped_ptr<Session> session_;
 
   scoped_ptr<VideoReader> video_reader_;
   scoped_ptr<ClientControlDispatcher> control_dispatcher_;
   scoped_ptr<ClientEventDispatcher> event_dispatcher_;
 
   // Internal state of the connection.
   State state_;
   Error error_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ConnectionToHost);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_