UMA metrics - number of accounts per profile and account reconciler.

components/signin/core/browser/account_reconcilor.cc

 // 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.
 
 #include "components/signin/core/browser/account_reconcilor.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_client.h"
+#include "components/signin/core/browser/signin_metrics.h"
 #include "components/signin/core/browser/signin_oauth_helper.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_oauth_client.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/cookies/canonical_cookie.h"
 
 
 namespace {
@@ skipping 164 matching lines @@
     : OAuth2TokenService::Consumer("account_reconcilor"),
       token_service_(token_service),
       signin_manager_(signin_manager),
       client_(client),
       merge_session_helper_(token_service_,
                             client->GetURLRequestContext(),
                             this),
       registered_with_token_service_(false),
       is_reconcile_started_(false),
       are_gaia_accounts_set_(false),
-      requests_(NULL) {
+      requests_(NULL),
+      first_execution_(true) {
   VLOG(1) << "AccountReconcilor::AccountReconcilor";
 }
 
 AccountReconcilor::~AccountReconcilor() {
   VLOG(1) << "AccountReconcilor::~AccountReconcilor";
   // Make sure shutdown was called first.
   DCHECK(!registered_with_token_service_);
   DCHECK(!reconciliation_timer_.IsRunning());
   DCHECK(!requests_);
   DCHECK_EQ(0u, user_id_fetchers_.size());
@@ skipping 413 matching lines @@
         ++i) {
     if (*i != primary_account_)
       add_to_cookie_.push_back(*i);
   }
 
   // For each account known to chrome, PerformMergeAction() if the account is
   // not already in the cookie jar or its state is invalid, or signal merge
   // completed otherwise.  Make a copy of |add_to_cookie_| since calls to
   // SignalComplete() will change the array.
   std::vector<std::string> add_to_cookie_copy = add_to_cookie_;
+  int added_to_cookie = 0;
   for (size_t i = 0; i < add_to_cookie_copy.size(); ++i) {
     if (gaia_accounts_.end() !=
             std::find_if(gaia_accounts_.begin(),
                          gaia_accounts_.end(),
                          std::bind1st(EmailEqualToFunc(),
                                       std::make_pair(add_to_cookie_copy[i],
                                                      true)))) {
       merge_session_helper_.SignalComplete(
           add_to_cookie_copy[i],
           GoogleServiceAuthError::AuthErrorNone());
     } else {
       PerformMergeAction(add_to_cookie_copy[i]);
+      added_to_cookie++;
     }
   }
 
   // For each account in the gaia cookie not known to chrome,
   // PerformAddToChromeAction.
   for (std::vector<std::pair<std::string, int> >::const_iterator i =
            add_to_chrome_.begin();
        i != add_to_chrome_.end();
        ++i) {
     PerformAddToChromeAction(i->first, i->second);
   }
 
+  SigninMetrics::LogSigninAccountReconciliation(valid_chrome_accounts_.size(),
+                    added_to_cookie, add_to_chrome_.size(),
+                    are_primaries_equal, first_execution_);

[Roger Tawa OOO till Jul 10th, 2014/05/07 17:05:38]

Spacing is off.  Line up all subsequent args under the 'v' in
|valid_chrome_accounts_|.

[Mike Lerman, 2014/05/07 18:49:37]

Done.

+
+  first_execution_ = false;
   CalculateIfReconcileIsDone();
   ScheduleStartReconcileIfChromeAccountsChanged();
 }
 
 void AccountReconcilor::AbortReconcile() {
   VLOG(1) << "AccountReconcilor::AbortReconcile: we'll try again later";
   DeleteFetchers();
   add_to_cookie_.clear();
   add_to_chrome_.clear();
   CalculateIfReconcileIsDone();
@@ skipping 67 matching lines @@
        i != add_to_chrome_.end();
        ++i) {
     if (gaia::AreEmailsSame(account_id, i->first)) {
       add_to_chrome_.erase(i);
       break;
     }
   }
 
   CalculateIfReconcileIsDone();
 }