[GCM] Add heartbeat manager and reconnection logic due to heartbeat failure

google_apis/gcm/engine/connection_handler_impl.cc

Index: google_apis/gcm/engine/connection_handler_impl.cc
diff --git a/google_apis/gcm/engine/connection_handler_impl.cc b/google_apis/gcm/engine/connection_handler_impl.cc
index 9772000e0d87d879d6d362d7e39ee4df2aeedb2e..aea168325ba3c3f7a67fc7867fb200b721fe3847 100644
--- a/google_apis/gcm/engine/connection_handler_impl.cc
+++ b/google_apis/gcm/engine/connection_handler_impl.cc
@@ -52,7 +52,7 @@ ConnectionHandlerImpl::~ConnectionHandlerImpl() {
 
 void ConnectionHandlerImpl::Init(
     const mcs_proto::LoginRequest& login_request,
-    scoped_ptr<net::StreamSocket> socket) {
+    net::StreamSocket* socket) {
   DCHECK(!read_callback_.is_null());
   DCHECK(!write_callback_.is_null());
   DCHECK(!connection_callback_.is_null());
@@ -63,9 +63,9 @@ void ConnectionHandlerImpl::Init(
   handshake_complete_ = false;
   message_tag_ = 0;
   message_size_ = 0;
-  socket_ = socket.Pass();
-  input_stream_.reset(new SocketInputStream(socket_.get()));
-  output_stream_.reset(new SocketOutputStream(socket_.get()));
+  socket_ = socket;
+  input_stream_.reset(new SocketInputStream(socket_));
+  output_stream_.reset(new SocketOutputStream(socket_));
 
   Login(login_request);
 }
@@ -393,8 +393,6 @@ void ConnectionHandlerImpl::OnTimeout() {
 
 void ConnectionHandlerImpl::CloseConnection() {
   DVLOG(1) << "Closing connection.";
-  read_callback_.Reset();
-  write_callback_.Reset();

[fgorski, 2013/12/19 23:55:13]

Did you mean to remove these?

[Nicolas Zea, 2013/12/20 22:52:56]

Yes, otherwise calling Init above a second time DCHECKs.

   read_timeout_timer_.Stop();
   socket_->Disconnect();
   input_stream_.reset();