Handle account removal correctly on all platforms.

components/signin/core/browser/signin_metrics.h

 // Copyright 2014 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 COMPONENTS_SIGNIN_CORE_BROWSER_SIGNIN_METRICS_H_
 #define COMPONENTS_SIGNIN_CORE_BROWSER_SIGNIN_METRICS_H_
 
 #include "base/time/time.h"
 
 namespace signin_metrics {
@@ skipping 35 matching lines @@
 
   // Keep this as the last enum.
   NUM_PROFILE_SIGNOUT_METRICS,
 };
 
 // Log to UMA histograms and UserCounts stats about a single execution of the
 // AccountReconciler.
 // |total_number_accounts| - How many accounts are in the browser for this
 //                           profile.
 // |count_added_to_cookie_jar| - How many accounts were in the browser but not
-//                               the cookie jar.
-// |count_added_to_token| - How may accounts were in the cookie jar but not in
-//                          the browser.
+//                              in the cookie jar.

[Mike Lerman, 2014/09/23 14:27:47]

Nit: add a space to left-align the comments

[Roger Tawa OOO till Jul 10th, 2014/09/23 21:25:59]

Done.

+// |count_removed_from_cookie_jar| - How many accounts were in the cookie jar
+//                                   but not in the browser.
 // |primary_accounts_same| - False if the primary account for the cookie jar
 //                           and the token service were different; else true.
 // |is_first_reconcile| - True if these stats are from the first execution of
 //                        the AccountReconcilor.
 // |pre_count_gaia_cookies| - How many GAIA cookies were present before
 //                            the AccountReconcilor began modifying the state.
 void LogSigninAccountReconciliation(int total_number_accounts,
                                     int count_added_to_cookie_jar,
-                                    int count_added_to_token,
+                                    int count_removed_from_cookie_jar,
                                     bool primary_accounts_same,
                                     bool is_first_reconcile,
                                     int pre_count_gaia_cookies);
 
 // Track a successful signin.
 void LogSigninAddAccount();
 
 // Track a successful signin of a profile.
 void LogSigninProfile(bool is_first_run, base::Time install_date);
 
 // Track a profile signout.
 void LogSignout(ProfileSignout metric);
 
 // Tracks whether the external connection results were all fetched before
 // the reconcilor tried to use them with MergeSession.
 void LogExternalCcResultFetches(bool fetches_completed);
 
 }  // namespace signin_metrics
 
 #endif  // COMPONENTS_SIGNIN_CORE_BROWSER_SIGNIN_METRICS_H_