Use scoped_ptr<> to pass ownership in more places.

remoting/host/heartbeat_sender.h

 // Copyright (c) 2012 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"
@@ skipping 61 matching lines @@
 // stanza of this form:
 //
 //  <iq type="set" from="remoting@bot.talk.google.com"
 //      to="user@gmail.com/chromoting123123" id="5" xmlns="jabber:client">
 //    <rem:heartbeat-result xmlns:rem="google:remoting">
 //      <rem:expected-sequence-id>654</rem:expected-sequence-id>
 //    </rem:heartbeat-result>
 //  </iq>
 class HeartbeatSender : public SignalStrategy::Listener {
  public:
-  // Doesn't take ownership of |signal_strategy| or |key_pair|. Both
-  // parameters must outlive this object. Heartbeats will start when
-  // the supplied SignalStrategy enters the CONNECTED state.
+  // |signal_strategy| and |key_pair| must outlive this
+  // object. Heartbeats will start when the supplied SignalStrategy
+  // enters the CONNECTED state.
   HeartbeatSender(const std::string& host_id,
                   SignalStrategy* signal_strategy,
                   HostKeyPair* key_pair);
   virtual ~HeartbeatSender();
 
   // SignalStrategy::Listener interface.
   virtual void OnSignalStrategyStateChange(
       SignalStrategy::State state) OVERRIDE;
 
  private:
@@ skipping 27 matching lines @@
   int sequence_id_;
   bool sequence_id_was_set_;
   int sequence_id_recent_set_num_;
 
   DISALLOW_COPY_AND_ASSIGN(HeartbeatSender);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_HEARTBEAT_SENDER_H_