Change semantics of newProfileManagement() to accountConsistency()

chrome/browser/signin/chrome_signin_client.cc

Index: chrome/browser/signin/chrome_signin_client.cc
diff --git a/chrome/browser/signin/chrome_signin_client.cc b/chrome/browser/signin/chrome_signin_client.cc
index 14f7f99ccd99afae3824251b6a20f9eb7260f1c0..d9b2fd7a7896d160ea4c6ec0fc34e5ceb7dc7a0d 100644
--- a/chrome/browser/signin/chrome_signin_client.cc
+++ b/chrome/browser/signin/chrome_signin_client.cc
@@ -139,10 +139,10 @@ net::URLRequestContextGetter* ChromeSigninClient::GetURLRequestContext() {
 }
 
 bool ChromeSigninClient::ShouldMergeSigninCredentialsIntoCookieJar() {
-  // If inline sign in is enabled, but new profile management is not, the user's
+  // If inline sign in is enabled, but account consistency is not, the user's
   // credentials should be merge into the cookie jar.
   return !switches::IsEnableWebBasedSignin() &&
-         !switches::IsNewProfileManagement();
+         !switches::IsEnableAccountConsistency();
 }
 
 std::string ChromeSigninClient::GetProductVersion() {
@@ -169,8 +169,8 @@ void ChromeSigninClient::SetCookieChangedCallback(
 void ChromeSigninClient::GoogleSigninSucceeded(const std::string& username,
                                                const std::string& password) {
 #if !defined(OS_ANDROID)
-  // Don't store password hash except for users of new profile features.
-  if (switches::IsNewProfileManagement())
+  // Don't store password hash except for users of account consistency features.
+  if (switches::IsEnableAccountConsistency())
     chrome::SetLocalAuthCredentials(profile_, password);
 #endif
 }