Added HostKeyPair class, signatures for heartbeat messages.

remoting/jingle_glue/jingle_client.h

 // Copyright (c) 2010 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_JINGLE_GLUE_JINGLE_CLIENT_H_
 #define REMOTING_JINGLE_GLUE_JINGLE_CLIENT_H_
 
 #include <string>
 
 #include "remoting/jingle_glue/jingle_channel.h"
@@ skipping 12 matching lines @@
 namespace cricket {
 class BasicPortAllocator;
 class SessionManager;
 class TunnelSessionClient;
 class SessionManagerTask;
 class Session;
 }  // namespace cricket
 
 namespace remoting {
 
+class IqRequest;
+
 class JingleClient : public base::RefCountedThreadSafe<JingleClient>,
                      public sigslot::has_slots<> {
  public:
   enum State {
-    START,  // Initial state.
+    CREATED,  // Initial state.
+    INITIALIZED,
     CONNECTING,
     CONNECTED,
     CLOSED,
   };
 
   class Callback {
    public:
     virtual ~Callback() {}
 
     // Called when state of the connection is changed.
@@ skipping 33 matching lines @@
                          JingleChannel::Callback* callback);
 
   // Closes XMPP connection and stops the thread. Must be called before the
   // object is destroyed.
   void Close();
 
   // Returns JID with resource ID. Empty string is returned if full JID is not
   // known yet, i.e. authentication hasn't finished.
   std::string GetFullJid();
 
+  // Creates new IqRequest for this client. Ownership for of the created object
+  // is transfered to the caller.
+  virtual IqRequest* CreateIqRequest();
+
   // Current state of the client.
   State state() { return state_; }
 
   // Returns XmppClient object for the xmpp connection or NULL if not connected.
   buzz::XmppClient* xmpp_client() { return client_; }
 
   // Message loop used by this object to execute tasks.
   MessageLoop* message_loop();
 
  private:
+  friend class HeartbeatSenderTest;
+
   void OnConnectionStateChanged(buzz::XmppEngine::State state);
 
   void OnIncomingTunnel(cricket::TunnelSessionClient* client, buzz::Jid jid,
                         std::string description, cricket::Session* session);
 
   void DoInitialize(const std::string& username,
                     const std::string& auth_token,
                     const std::string& auth_token_service);
 
   // Used by Connect().
@@ skipping 23 matching lines @@
   scoped_ptr<cricket::BasicPortAllocator> port_allocator_;
   scoped_ptr<cricket::SessionManager> session_manager_;
   scoped_ptr<cricket::TunnelSessionClient> tunnel_session_client_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleClient);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_JINGLE_GLUE_JINGLE_CLIENT_H_