Move signaling connection creation out of 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"
+#include "base/gtest_prod_util.h"
 #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 "base/gtest_prod_util.h"
+#include "remoting/jingle_glue/signal_strategy.h"
 
 namespace base {
 class MessageLoopProxy;
 }  // namespace base
 
 namespace buzz {
 class XmlElement;
 }  // namespace buzz
 
 namespace remoting {
@@ skipping 29 matching lines @@
 //      <rem:set-interval>300</rem:set-interval>
 //    </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?

[Wez, 2012/01/03 16:25:04]

nit: Consider creating a bug for this, or removing it if the issue is resolved.

[Sergey Ulanov, 2012/01/03 21:51:02]

Just removed it.

-class HeartbeatSender : public HostStatusObserver {
+class HeartbeatSender : public SignalStrategy::Listener {
  public:
-  HeartbeatSender(base::MessageLoopProxy* main_loop,
-                  MutableHostConfig* config);
+  HeartbeatSender();
   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();
+  // Initializes heartbeating. Returns false if the |config| is

[Wez, 2012/01/03 16:25:04]

nit: Initializes the HeartbeatSender.

Heartbeats will start when the supplied SignalStrategy enters the CONNECTED
state?

What is the ownership of |config|?

[Sergey Ulanov, 2012/01/03 21:51:02]

Done.
|config| is ref-counted. I removed it in on the next CLs.

+  // invalid (e.g. private key cannot be parsed). SignalStrategy must
+  // outlive this object.

[Wez, 2012/01/03 16:25:04]

HeartbeatSender must now be initialized and deleted on the SignallingStrategy
thread?

[Sergey Ulanov, 2012/01/03 21:51:02]

Not yet in this CL - they are still initialized on plugin/main thread, but in
the next CL I made XmppSignalStrategy NonThreadSafe.

+  bool Init(SignalStrategy* signal_strategy, MutableHostConfig* config);
 
-  // HostStatusObserver implementation.
-  virtual void OnSignallingConnected(SignalStrategy* signal_strategy) OVERRIDE;
-  virtual void OnSignallingDisconnected() OVERRIDE;
-  virtual void OnClientAuthenticated(const std::string& jid) OVERRIDE;
-  virtual void OnClientDisconnected(const std::string& jid) OVERRIDE;
-  virtual void OnAccessDenied() OVERRIDE;
-  virtual void OnShutdown() OVERRIDE;
+  // SignalStrategy::Listener interface.
+  virtual void OnSignalStrategyStateChange(
+      SignalStrategy::State state) 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();
 
   State state_;
-  scoped_refptr<base::MessageLoopProxy> message_loop_;
-  scoped_refptr<MutableHostConfig> config_;
+  SignalStrategy* signal_strategy_;
   std::string host_id_;
   HostKeyPair key_pair_;
-  std::string full_jid_;
   scoped_ptr<IqSender> iq_sender_;
   scoped_ptr<IqRequest> request_;
   int interval_ms_;
   base::RepeatingTimer<HeartbeatSender> timer_;
 
   DISALLOW_COPY_AND_ASSIGN(HeartbeatSender);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_HEARTBEAT_SENDER_H_