Update ConnectionEventTracker to check if there is an in progress attempt.

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 <string>
 
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
@@ skipping 191 matching lines @@
   if (!last_login_time_.is_null()) {
     UMA_HISTOGRAM_CUSTOM_TIMES("GCM.ConnectionUpTime",
                                NowTicks() - last_login_time_,
                                base::TimeDelta::FromSeconds(1),
                                base::TimeDelta::FromHours(24),
                                50);
     // |last_login_time_| will be reset below, before attempting the new
     // connection.
   }
 
-  if (logging_in_)
-    event_tracker_.ConnectionLoginFailed();
-  event_tracker_.EndConnectionAttempt();
+  // SignalConnectionReset can be called at any time without regard to whether
+  // a connection attempt is currently in progress. Only notify the event
+  // tracker if there is an event in progress.
+  if (event_tracker_.EventInProgress()) {
+    if (logging_in_)

[Peter Beverloo, 2017/01/12 16:03:27]

note: this will need to merge with your reason == LOGIN_FAILURE change

[harkness, 2017/01/16 12:20:37]

Acknowledged.

+      event_tracker_.ConnectionLoginFailed();
+    event_tracker_.EndConnectionAttempt();
+  }
 
   CloseSocket();
   DCHECK(!IsEndpointReachable());
 
   // TODO(zea): if the network is offline, don't attempt to connect.
   // See crbug.com/396687
 
   // Network changes get special treatment as they can trigger a one-off canary
   // request that bypasses backoff (but does nothing if a connection is in
   // progress). Other connection reset events can be ignored as a connection
@@ skipping 367 matching lines @@
 
 void ConnectionFactoryImpl::RebuildNetworkSessionAuthCache() {
   if (!http_network_session_ || !http_network_session_->http_auth_cache())
     return;
 
   gcm_network_session_->http_auth_cache()->UpdateAllFrom(
       *http_network_session_->http_auth_cache());
 }
 
 }  // namespace gcm