Change semantics of newProfileManagement() to accountConsistency()

chrome/browser/signin/signin_header_helper.cc

 // Copyright 2013 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/signin_header_helper.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
@@ skipping 188 matching lines @@
 
   // Only set the header for Drive always, and other Google properties if
   // new-profile-management is enabled.
   // Vasquette, which is integrated with most Google properties, needs the
   // header to redirect certain user actions to Chrome native UI. Drive needs
   // the header to tell if the current user is connected. The drive path is a
   // temporary workaround until the more generic chrome.principals API is
   // available.
   const GURL& url = redirect_url.is_empty() ? request->url() : redirect_url;
   GURL origin(url.GetOrigin());
-  bool is_new_profile_management = switches::IsNewProfileManagement();
+  bool is_enable_account_consistency = switches::IsEnableAccountConsistency();
   bool is_google_url =
       !switches::IsEnableWebBasedSignin() &&
-      is_new_profile_management &&
+      is_enable_account_consistency &&
       (google_util::IsGoogleDomainUrl(
            url,
            google_util::ALLOW_SUBDOMAIN,
            google_util::DISALLOW_NON_STANDARD_PORTS) ||
        google_util::IsYoutubeDomainUrl(
            url,
            google_util::ALLOW_SUBDOMAIN,
            google_util::DISALLOW_NON_STANDARD_PORTS));
   if (!is_google_url && !IsDriveOrigin(origin))
     return false;
 
   std::string account_id(io_data->google_services_account_id()->GetValue());
 
   int profile_mode_mask = PROFILE_MODE_DEFAULT;
   if (io_data->incognito_availibility()->GetValue() ==
           IncognitoModePrefs::DISABLED ||
       IncognitoModePrefs::ArePlatformParentalControlsEnabledCached()) {
     profile_mode_mask |= PROFILE_MODE_INCOGNITO_DISABLED;
   }
 
   // TODO(guohui): needs to make a new flag for enabling account consistency.
   std::string header_value(base::StringPrintf("%s=%s,%s=%s,%s=%s",
       kGaiaIdAttrName, account_id.c_str(),
       kProfileModeAttrName, base::IntToString(profile_mode_mask).c_str(),
       kEnableAccountConsistencyAttrName,
-      is_new_profile_management ? "true" : "false"));
+      is_enable_account_consistency ? "true" : "false"));
   request->SetExtraRequestHeaderByName(
       kChromeConnectedHeader, header_value, false);
   return true;
 }
 
 void ProcessMirrorResponseHeaderIfExists(
     net::URLRequest* request,
     ProfileIOData* io_data,
     int child_id,
     int route_id) {
 #if defined(OS_IOS)
   NOTREACHED();
 #else
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   if (!gaia::IsGaiaSignonRealm(request->url().GetOrigin()))
     return;
 
   std::string header_value;
   if (!request->response_headers()->GetNormalizedHeader(
           kChromeManageAccountsHeader, &header_value)) {
     return;
   }
 
-  DCHECK(switches::IsNewProfileManagement() && !io_data->IsOffTheRecord());
+  DCHECK(switches::IsEnableAccountConsistency() && !io_data->IsOffTheRecord());
   ManageAccountsParams params(BuildManageAccountsParams(header_value));
   if (params.service_type == GAIA_SERVICE_TYPE_NONE)
     return;
 
   params.child_id = child_id;
   params.route_id = route_id;
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(ProcessMirrorHeaderUIThread, child_id, route_id, params));
 #endif  // defined(OS_IOS)
 }
 
 } // namespace signin