Differentiate primary account compares on GAIA cookie presence.

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"
@@ skipping 586 matching lines @@
   // tokens individually is done before proceeding with reconciliation.
   if (!are_gaia_accounts_set_ || !AreAllRefreshTokensChecked())
     return;
 
   VLOG(1) << "AccountReconcilor::FinishReconcile";
 
   DeleteFetchers();
 
   DCHECK(add_to_cookie_.empty());
   DCHECK(add_to_chrome_.empty());
+  int number_gaia_accounts = gaia_accounts_.size();
   bool are_primaries_equal =
-      gaia_accounts_.size() > 0 &&
+      number_gaia_accounts > 0 &&
       gaia::AreEmailsSame(primary_account_, gaia_accounts_[0].first);
 
+
   if (are_primaries_equal) {
     // Determine if we need to merge accounts from gaia cookie to chrome.
     for (size_t i = 0; i < gaia_accounts_.size(); ++i) {
       const std::string& gaia_account = gaia_accounts_[i].first;
       if (gaia_accounts_[i].second &&
           valid_chrome_accounts_.find(gaia_account) ==
               valid_chrome_accounts_.end()) {
         add_to_chrome_.push_back(std::make_pair(gaia_account, i));
       }
     }
@@ skipping 47 matching lines @@
            add_to_chrome_copy.begin();
        i != add_to_chrome_copy.end();
        ++i) {
     PerformAddToChromeAction(i->first, i->second);
   }
 
   signin_metrics::LogSigninAccountReconciliation(valid_chrome_accounts_.size(),
                                                  added_to_cookie,
                                                  add_to_chrome_.size(),
                                                  are_primaries_equal,
-                                                 first_execution_);
+                                                 first_execution_,
+                                                 number_gaia_accounts);
   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();
@@ skipping 85 matching lines @@
 
 void AccountReconcilor::HandleRefreshTokenFetched(
     const std::string& account_id,
     const std::string& refresh_token) {
   if (!refresh_token.empty())
     PerformAddAccountToTokenService(account_id, refresh_token);
 
   MarkAccountAsAddedToChrome(account_id);
   CalculateIfReconcileIsDone();
 }