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

google_apis/gcm/engine/connection_factory_impl.cc

 // Copyright (c) 2013 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.
 
 #include "google_apis/gcm/engine/connection_factory_impl.h"
 
 #include "base/message_loop/message_loop.h"
 #include "google_apis/gcm/engine/connection_handler_impl.h"
 #include "google_apis/gcm/protocol/mcs.pb.h"
 #include "net/base/net_errors.h"
@@ skipping 99 matching lines @@
                    weak_ptr_factory_.GetWeakPtr()),
         NextRetryAttempt() - base::TimeTicks::Now());
     return;
   }
 
   DVLOG(1) << "Attempting connection to MCS endpoint.";
   ConnectImpl();
 }
 
 bool ConnectionFactoryImpl::IsEndpointReachable() const {
-  return connection_handler_ && connection_handler_->CanSendMessage();
+  return connection_handler_ &&
+      connection_handler_->CanSendMessage() &&
+      !connecting_;
 }
 
 void ConnectionFactoryImpl::SignalConnectionReset() {
   if (connecting_)
     return;  // Already attempting to reconnect.
 
   if (!backoff_reset_time_.is_null() &&
       base::TimeTicks::Now() - backoff_reset_time_ <=
           base::TimeDelta::FromSeconds(kConnectionResetWindowSecs)) {
     backoff_entry_.swap(previous_backoff_);
@@ skipping 26 matching lines @@
 void ConnectionFactoryImpl::OnIPAddressChanged() {
   DVLOG(1) << "IP Address changed, resetting backoff.";
   backoff_entry_->Reset();
   // Connect(..) should be retrying with backoff already if a connection is
   // necessary, so no need to call again.
 }
 
 void ConnectionFactoryImpl::ConnectImpl() {
   DCHECK(!IsEndpointReachable());
 
+  if (socket_handle_.socket() && socket_handle_.socket()->IsConnected())
+    socket_handle_.socket()->Disconnect();
+  socket_handle_.Reset();
+
   // TODO(zea): resolve proxies.
   net::ProxyInfo proxy_info;
   proxy_info.UseDirect();
   net::SSLConfig ssl_config;
   network_session_->ssl_config_service()->GetSSLConfig(&ssl_config);
 
   int status = net::InitSocketHandleForTlsConnect(
       net::HostPortPair::FromURL(mcs_endpoint_),
       network_session_.get(),
       proxy_info,
       ssl_config,
       ssl_config,
       net::kPrivacyModeDisabled,
       net::BoundNetLog::Make(net_log_, net::NetLog::SOURCE_SOCKET),
       &socket_handle_,
       base::Bind(&ConnectionFactoryImpl::OnConnectDone,
                  weak_ptr_factory_.GetWeakPtr()));
   if (status != net::ERR_IO_PENDING)
     OnConnectDone(status);
 }
 
 void ConnectionFactoryImpl::InitHandler() {
   // May be null in tests.
   mcs_proto::LoginRequest login_request;
   if (!request_builder_.is_null()) {
     request_builder_.Run(&login_request);
     DCHECK(login_request.IsInitialized());
   }
 
-  connection_handler_->Init(login_request, socket_handle_.PassSocket());
+  connection_handler_->Init(login_request, socket_handle_.socket());
 }
 
 scoped_ptr<net::BackoffEntry> ConnectionFactoryImpl::CreateBackoffEntry(
     const net::BackoffEntry::Policy* const policy) {
   return scoped_ptr<net::BackoffEntry>(new net::BackoffEntry(policy));
 }
 
 void ConnectionFactoryImpl::OnConnectDone(int result) {
   if (result != net::OK) {
     LOG(ERROR) << "Failed to connect to MCS endpoint with error " << result;
@@ skipping 16 matching lines @@
     return;
   }
   // TODO(zea): Consider how to handle errors that may require some sort of
   // user intervention (login page, etc.).
   LOG(ERROR) << "Connection reset with error " << result;
   backoff_entry_->InformOfRequest(false);
   Connect();
 }
 
 }  // namespace gcm