Change semantics of newProfileManagement() to accountConsistency()

chrome/browser/signin/chrome_signin_client.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 "chrome/browser/signin/chrome_signin_client.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
 #include "chrome/browser/signin/local_auth.h"
@@ skipping 121 matching lines @@
   // SigninScopedDeviceId from prefs, generating new one if it doesn't exist.
   // For now it returns empty string to maintain existing behavior.
   return std::string();
 }
 
 net::URLRequestContextGetter* ChromeSigninClient::GetURLRequestContext() {
   return profile_->GetRequestContext();
 }
 
 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() {
   chrome::VersionInfo chrome_version;
   if (!chrome_version.is_valid())
     return "invalid";
   return chrome_version.CreateVersionString();
 }
 
 void ChromeSigninClient::SetCookieChangedCallback(
     const CookieChangedCallback& callback) {
   if (callback_.Equals(callback))
     return;
 
   // There should be only one callback active at a time.
   DCHECK(callback.is_null() || callback_.is_null());
   callback_ = callback;
   if (!callback_.is_null())
     RegisterForCookieChangedNotification();
   else
     UnregisterForCookieChangedNotification();
 }
 
 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
 }
 
 void ChromeSigninClient::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_COOKIE_CHANGED: {
       DCHECK(!callback_.is_null());
@@ skipping 17 matching lines @@
 
 void ChromeSigninClient::UnregisterForCookieChangedNotification() {
   // Note that it's allowed to call this method multiple times without an
   // intervening call to |RegisterForCookieChangedNotification()|.
   content::Source<Profile> source(profile_);
   if (!registrar_.IsRegistered(
       this, chrome::NOTIFICATION_COOKIE_CHANGED, source))
     return;
   registrar_.Remove(this, chrome::NOTIFICATION_COOKIE_CHANGED, source);
 }