| Index: components/signin/core/browser/account_reconcilor.cc
|
| diff --git a/components/signin/core/browser/account_reconcilor.cc b/components/signin/core/browser/account_reconcilor.cc
|
| index 058bc3b3dc24c2d9be5f63d8efdec2aa26cce195..3308d077fc6cc207fca1c7bf707a66270d7ca85d 100644
|
| --- a/components/signin/core/browser/account_reconcilor.cc
|
| +++ b/components/signin/core/browser/account_reconcilor.cc
|
| @@ -587,10 +587,12 @@ void AccountReconcilor::FinishReconcile() {
|
|
|
| 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) {
|
| @@ -656,7 +658,8 @@ void AccountReconcilor::FinishReconcile() {
|
| added_to_cookie,
|
| add_to_chrome_.size(),
|
| are_primaries_equal,
|
| - first_execution_);
|
| + first_execution_,
|
| + number_gaia_accounts);
|
| first_execution_ = false;
|
| CalculateIfReconcileIsDone();
|
| ScheduleStartReconcileIfChromeAccountsChanged();
|
|
|