[GCM] Fix gcm network change handling before connect

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 "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "google_apis/gcm/engine/connection_handler_impl.h"
@@ skipping 66 matching lines @@
     gcm_network_session_->proxy_service()->CancelPacRequest(pac_request_);
     pac_request_ = NULL;
   }
 }
 
 void ConnectionFactoryImpl::Initialize(
     const BuildLoginRequestCallback& request_builder,
     const ConnectionHandler::ProtoReceivedCallback& read_callback,
     const ConnectionHandler::ProtoSentCallback& write_callback) {
   DCHECK(!connection_handler_);
+  DCHECK(read_callback_.is_null());
+  DCHECK(write_callback_.is_null());
 
   previous_backoff_ = CreateBackoffEntry(&backoff_policy_);
   backoff_entry_ = CreateBackoffEntry(&backoff_policy_);
   request_builder_ = request_builder;
+  read_callback_ = read_callback;
+  write_callback_ = write_callback;
 
   net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
   waiting_for_network_online_ = net::NetworkChangeNotifier::IsOffline();
-  connection_handler_ = CreateConnectionHandler(
-      base::TimeDelta::FromMilliseconds(kReadTimeoutMs),
-      read_callback,
-      write_callback,
-      base::Bind(&ConnectionFactoryImpl::ConnectionHandlerCallback,
-                 weak_ptr_factory_.GetWeakPtr())).Pass();
 }
 
 ConnectionHandler* ConnectionFactoryImpl::GetConnectionHandler() const {
   return connection_handler_.get();
 }
 
 void ConnectionFactoryImpl::Connect() {
-  DCHECK(connection_handler_);
+  if (!connection_handler_) {
+    connection_handler_ = CreateConnectionHandler(
+        base::TimeDelta::FromMilliseconds(kReadTimeoutMs),
+        read_callback_,
+        write_callback_,
+        base::Bind(&ConnectionFactoryImpl::ConnectionHandlerCallback,
+                   weak_ptr_factory_.GetWeakPtr())).Pass();
+  }
 
   if (connecting_ || waiting_for_backoff_)
     return;  // Connection attempt already in progress or pending.
 
   if (IsEndpointReachable())
     return;  // Already connected.
 
   ConnectWithBackoff();
 }
 
@@ skipping 38 matching lines @@
     return "CONNECTING";
   if (waiting_for_backoff_)
     return "WAITING FOR BACKOFF";
   if (waiting_for_network_online_)
     return "WAITING FOR NETWORK CHANGE";
   return "NOT CONNECTED";
 }
 
 void ConnectionFactoryImpl::SignalConnectionReset(
     ConnectionResetReason reason) {
+  if (!connection_handler_) {
+    // No initial connection has been made. No need to do anything.
+    return;
+  }
+
   // A failure can trigger multiple resets, so no need to do anything if a
   // connection is already in progress.
   if (connecting_) {
     DVLOG(1) << "Connection in progress, ignoring reset.";
     return;
   }
 
   if (listener_)
     listener_->OnDisconnected();
 
@@ skipping 376 matching lines @@
 
 void ConnectionFactoryImpl::RebuildNetworkSessionAuthCache() {
   if (!http_network_session_.get() || !http_network_session_->http_auth_cache())
     return;
 
   gcm_network_session_->http_auth_cache()->UpdateAllFrom(
       *http_network_session_->http_auth_cache());
 }
 
 }  // namespace gcm