Provide correct guard for GCM connection tracking of login failures.

google_apis/gcm/engine/connection_factory_impl.h

Index: google_apis/gcm/engine/connection_factory_impl.h
diff --git a/google_apis/gcm/engine/connection_factory_impl.h b/google_apis/gcm/engine/connection_factory_impl.h
index ff7de143dc26ab94023d4cb6a1b2091c8ba58ef8..d99184caaebfc8e0949a286141e5f7f8b9a26ed9 100644
--- a/google_apis/gcm/engine/connection_factory_impl.h
+++ b/google_apis/gcm/engine/connection_factory_impl.h
@@ -183,10 +183,11 @@ class GCM_EXPORT ConnectionFactoryImpl :
   // 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.