Provide correct guard for GCM connection tracking of login failures.

google_apis/gcm/engine/connection_factory_impl.h

 // 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.
 
 #ifndef GOOGLE_APIS_GCM_ENGINE_CONNECTION_FACTORY_IMPL_H_
 #define GOOGLE_APIS_GCM_ENGINE_CONNECTION_FACTORY_IMPL_H_
 
 #include "google_apis/gcm/engine/connection_factory.h"
 
 #include <stddef.h>
@@ skipping 165 matching lines @@
   // Whether the client is waiting for backoff to finish before attempting to
   // connect. Canary jobs are able to preempt connections pending backoff
   // expiration.
   bool waiting_for_backoff_;
 
   // Whether the NetworkChangeNotifier has informed the client that there is
   // no current connection. No connection attempts will be made until the
   // client is informed of a valid connection type.
   bool waiting_for_network_online_;
 
-  // Whether login successfully completed after the connection was established.
-  // If a connection reset happens while attempting to log in, the current
-  // backoff entry is reused (after incrementing with a new failure).
-  bool logging_in_;
+  // Whether handshake successfully completed after the connection was

[Nicolas Zea, 2017/01/12 18:00:57]

nit: given this is "in progress", perhaps just reword this to be "Whether
handshake is in progress after the connection..."

[harkness, 2017/01/13 08:28:08]

Done.

+  // established. If a connection reset happens while attempting to complete
+  // the handshake, the current backoff entry is reused (after incrementing
+  // with a new failure).
+  bool handshake_in_progress_;
 
   // The time of the last login completion. Used for calculating whether to
   // restore a previous backoff entry and for measuring uptime.
   base::TimeTicks last_login_time_;
 
   // Cached callbacks. Set at |Initialize| time, consumed at first |Connect|
   // time.
   ConnectionHandler::ProtoReceivedCallback read_callback_;
   ConnectionHandler::ProtoSentCallback write_callback_;
 
@@ skipping 10 matching lines @@
   ConnectionListener* listener_;
 
   base::WeakPtrFactory<ConnectionFactoryImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionFactoryImpl);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_ENGINE_CONNECTION_FACTORY_IMPL_H_