Change semantics of newProfileManagement() to accountConsistency()

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 344 matching lines @@
   VLOG(1) << "AccountReconcilor::GoogleSignedOut: signed out";
   gaia_fetcher_.reset();
   get_gaia_accounts_callbacks_.clear();
   AbortReconcile();
   UnregisterWithTokenService();
   UnregisterForCookieChanges();
   PerformLogoutAllAccountsAction();
 }
 
 void AccountReconcilor::PerformMergeAction(const std::string& account_id) {
-  if (!switches::IsNewProfileManagement()) {
+  if (!switches::IsEnableAccountConsistency()) {
     MarkAccountAsAddedToCookie(account_id);
     return;
   }
   VLOG(1) << "AccountReconcilor::PerformMergeAction: " << account_id;
   merge_session_helper_.LogIn(account_id);
 }
 
 void AccountReconcilor::PerformStartRemoveAction(
     const std::string& account_id) {
   VLOG(1) << "AccountReconcilor::PerformStartRemoveAction: " << account_id;
   GetAccountsFromCookie(base::Bind(
       &AccountReconcilor::PerformFinishRemoveAction,
       base::Unretained(this),
       account_id));
 }
 
 void AccountReconcilor::PerformFinishRemoveAction(
     const std::string& account_id,
     const GoogleServiceAuthError& error,
     const std::vector<std::pair<std::string, bool> >& accounts) {
-  if (!switches::IsNewProfileManagement())
+  if (!switches::IsEnableAccountConsistency())
     return;
   VLOG(1) << "AccountReconcilor::PerformFinishRemoveAction:"
           << " account=" << account_id << " error=" << error.ToString();
   if (error.state() == GoogleServiceAuthError::NONE) {
     AbortReconcile();
     std::vector<std::string> accounts_only;
     for (std::vector<std::pair<std::string, bool> >::const_iterator i =
              accounts.begin();
          i != accounts.end();
          ++i) {
       accounts_only.push_back(i->first);
     }
     merge_session_helper_.LogOut(account_id, accounts_only);
   }
   // Wait for the next ReconcileAction if there is an error.
 }
 
 void AccountReconcilor::PerformAddToChromeAction(
     const std::string& account_id,
     int session_index,
     const std::string& signin_scoped_device_id) {
-  if (!switches::IsNewProfileManagement()) {
+  if (!switches::IsEnableAccountConsistency()) {
     MarkAccountAsAddedToChrome(account_id);
     return;
   }
   VLOG(1) << "AccountReconcilor::PerformAddToChromeAction:"
           << " account=" << account_id << " session_index=" << session_index;
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   refresh_token_fetchers_.push_back(new RefreshTokenFetcher(
       this, account_id, session_index, signin_scoped_device_id));
 #endif
 }
 
 void AccountReconcilor::PerformLogoutAllAccountsAction() {
-  if (!switches::IsNewProfileManagement())
+  if (!switches::IsEnableAccountConsistency())
     return;
   VLOG(1) << "AccountReconcilor::PerformLogoutAllAccountsAction";
   merge_session_helper_.LogOutAllAccounts();
 }
 
 void AccountReconcilor::StartReconcile() {
   if (!IsProfileConnected() || is_reconcile_started_)
     return;
 
   is_reconcile_started_ = true;
@@ skipping 322 matching lines @@
     const std::string& account_id) {
   invalid_chrome_accounts_.insert(account_id);
   FinishReconcile();
 }
 
 void AccountReconcilor::PerformAddAccountToTokenService(
     const std::string& account_id,
     const std::string& refresh_token) {
   // The flow should never get to this method if new_profile_management is
   // false, but better safe than sorry.
-  if (!switches::IsNewProfileManagement())
+  if (!switches::IsEnableAccountConsistency())
     return;
   token_service_->UpdateCredentials(account_id, refresh_token);
 }
 
 // Remove the account from the list that is being updated.
 void AccountReconcilor::MarkAccountAsAddedToChrome(
     const std::string& account_id) {
   for (std::vector<std::pair<std::string, int> >::iterator i =
            add_to_chrome_.begin();
        i != add_to_chrome_.end();
        ++i) {
     if (gaia::AreEmailsSame(account_id, i->first)) {
       add_to_chrome_.erase(i);
       break;
     }
   }
 }
 
 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();
 }