Add HostObserverInterface and decouple HeartbeatSender and ChromotingHost.

remoting/host/heartbeat_sender.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_HEARTBEAT_SENDER_H_
 #define REMOTING_HOST_HEARTBEAT_SENDER_H_
 
 #include <string>
 
+#include "base/compiler_specific.h"

[Wez, 2011/05/03 05:21:50]

Is this for OVERRIDE?

[Sergey Ulanov, 2011/05/03 17:24:18]

Yes.

 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/timer.h"
 #include "remoting/host/host_key_pair.h"
+#include "remoting/host/host_status_observer.h"
 #include "remoting/jingle_glue/iq_request.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 
 namespace remoting {
 
 class IqRequest;
 class HostKeyPair;
-class JingleClient;
-class JingleThread;
 class MutableHostConfig;
 
 // HeartbeatSender periodically sends heartbeat stanzas to the Chromoting Bot.
 // Each heartbeat stanza looks as follows:
 //
 // <iq type="set" to="remoting@bot.talk.google.com"
 //     from="user@gmail.com/chromoting123123" id="5" xmlns="jabber:client">
 //   <rem:heartbeat rem:hostid="a1ddb11e-8aef-11df-bccf-18a905b9cb5a"
 //                  xmlns:rem="google:remoting">
 //     <rem:signature rem:time="1279061748">.signature.</rem:signature>
@@ skipping 16 matching lines @@
 //    </rem:heartbeat>
 //  </iq>
 //
 // The set-interval tag is used to specify desired heartbeat interval
 // in seconds. The heartbeat-result and the set-interval tags are
 // optional. Host uses default heartbeat interval if it doesn't find
 // set-interval tag in the result Iq stanza it receives from the
 // server.
 //
 // TODO(sergeyu): Is it enough to sign JID and nothing else?
-class HeartbeatSender : public base::RefCountedThreadSafe<HeartbeatSender> {
+class HeartbeatSender : public HostStatusObserver {
  public:
   HeartbeatSender(MessageLoop* main_loop,
-                  JingleClient* jingle_client,
                   MutableHostConfig* config);
   virtual ~HeartbeatSender();
 
   // Initializes heart-beating for |jingle_client_| with |config_|. Returns
   // false if the config is invalid (e.g. private key cannot be parsed).
   bool Init();
 
-  // Starts heart-beating. Must be called after init.
-  void Start();
-
-  // Stops heart-beating. Must be called before corresponding JingleClient
-  // is destroyed. This object will not be deleted until Stop() is called,
-  // and it may (and will) crash after JingleClient is destroyed. Heartbeating
-  // cannot be restarted after it has been stopped, A new sender must be created
-  // instead.
-  void Stop();
+  // HostStatusObserver implementation.
+  virtual void OnSignallingConnected(SignalStrategy* signal_strategy,
+                                     const std::string& full_jid) OVERRIDE;
+  virtual void OnSignallingDisconnected() OVERRIDE;
+  virtual void OnShutdown() OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(HeartbeatSenderTest, DoSendStanza);
   FRIEND_TEST_ALL_PREFIXES(HeartbeatSenderTest, CreateHeartbeatMessage);
   FRIEND_TEST_ALL_PREFIXES(HeartbeatSenderTest, ProcessResponse);
 
   enum State {
     CREATED,
     INITIALIZED,
     STARTED,
     STOPPED,
   };
 
   void DoSendStanza();
+  void ProcessResponse(const buzz::XmlElement* response);
+  void SetInterval(int interval);
 
   // Helper methods used by DoSendStanza() to generate heartbeat stanzas.
   // Caller owns the result.
   buzz::XmlElement* CreateHeartbeatMessage();
   buzz::XmlElement* CreateSignature();
 
-  void ProcessResponse(const buzz::XmlElement* response);
-
   State state_;
   MessageLoop* message_loop_;
-  JingleClient* jingle_client_;
   scoped_refptr<MutableHostConfig> config_;
-  scoped_ptr<IqRequest> request_;
   std::string host_id_;
   HostKeyPair key_pair_;
+  std::string full_jid_;
+  scoped_ptr<IqRequest> request_;
   int interval_ms_;
+  base::RepeatingTimer<HeartbeatSender> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(HeartbeatSender);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_HEARTBEAT_SENDER_H_