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

remoting/protocol/pepper_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_PEPPER_SESSION_MANAGER_H_
 #define REMOTING_PROTOCOL_PEPPER_SESSION_MANAGER_H_
 
 #include <map>
 #include <list>
 #include <string>
@@ skipping 30 matching lines @@
 
 // This class implements SessionManager interface on top of the Pepper
 // P2P Transport API.
 class PepperSessionManager : public SessionManager,
                              public SignalStrategy::Listener {
  public:
   explicit PepperSessionManager(pp::Instance* pp_instance);
   virtual ~PepperSessionManager();
 
   // SessionManager interface.
-  virtual void Init(const std::string& local_jid,
-                    SignalStrategy* signal_strategy,
+  virtual void Init(SignalStrategy* signal_strategy,
                     SessionManager::Listener* listener,
                     bool allow_nat_traversal) OVERRIDE;
   virtual Session* Connect(
       const std::string& host_jid,
       Authenticator* authenticator,
       CandidateSessionConfig* config,
       const Session::StateChangeCallback& state_change_callback) OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual void set_authenticator_factory(
       AuthenticatorFactory* authenticator_factory) OVERRIDE;
 
   // SignalStrategy::Listener interface.
-  virtual bool OnIncomingStanza(const buzz::XmlElement* stanza) OVERRIDE;
+  virtual void OnSignalStrategyStateChange(
+      SignalStrategy::State state) OVERRIDE;
+  virtual bool OnSignalStrategyIncomingStanza(
+      const buzz::XmlElement* stanza) OVERRIDE;
 
  private:
   friend class PepperSession;
 
   typedef std::map<std::string, PepperSession*> SessionsMap;
 
   void OnJingleInfo(
       const std::string& relay_token,
       const std::vector<std::string>& relay_hosts,
       const std::vector<talk_base::SocketAddress>& stun_hosts);
 
   IqSender* iq_sender() { return iq_sender_.get(); }
   void SendReply(const buzz::XmlElement* original_stanza,
                  const JingleMessageReply& reply);
 
   // Called by PepperSession when it is being destroyed.
   void SessionDestroyed(PepperSession* session);
 
   pp::Instance* pp_instance_;
 
-  std::string local_jid_;
   SignalStrategy* signal_strategy_;
   scoped_ptr<AuthenticatorFactory> authenticator_factory_;
   scoped_ptr<IqSender> iq_sender_;
   SessionManager::Listener* listener_;
   bool allow_nat_traversal_;
 
+  bool ready_;
+
   TransportConfig transport_config_;
 
   scoped_ptr<JingleInfoRequest> jingle_info_request_;
 
   SessionsMap sessions_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperSessionManager);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_PEPPER_SESSION_MANAGER_H_