Commit 4224a22a authored by msarda's avatar msarda Committed by Commit bot

Remove google-profile-info switch.

This feature has been shipped for more than a year now. This CL removes
this experimental switch and the parts of the code that are now obsolete.

BUG=NONE

Review-Url: https://codereview.chromium.org/2758583002
Cr-Commit-Position: refs/heads/master@{#457801}
parent f18bffde
...@@ -1344,9 +1344,6 @@ const FeatureEntry kFeatureEntries[] = { ...@@ -1344,9 +1344,6 @@ const FeatureEntry kFeatureEntries[] = {
IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION, IDS_FLAGS_ENABLE_PASSWORD_SEPARATED_SIGNIN_FLOW_DESCRIPTION,
kOsMac | kOsWin | kOsLinux, kOsMac | kOsWin | kOsLinux,
FEATURE_VALUE_TYPE(switches::kUsePasswordSeparatedSigninFlow)}, FEATURE_VALUE_TYPE(switches::kUsePasswordSeparatedSigninFlow)},
{"enable-google-profile-info", IDS_FLAGS_GOOGLE_PROFILE_INFO_NAME,
IDS_FLAGS_GOOGLE_PROFILE_INFO_DESCRIPTION, kOsMac | kOsWin | kOsLinux,
SINGLE_VALUE_TYPE(switches::kGoogleProfileInfo)},
#if BUILDFLAG(ENABLE_APP_LIST) #if BUILDFLAG(ENABLE_APP_LIST)
{"reset-app-list-install-state", {"reset-app-list-install-state",
IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME, IDS_FLAGS_RESET_APP_LIST_INSTALL_STATE_NAME,
......
...@@ -70,13 +70,7 @@ bool GAIAInfoUpdateService::ShouldUseGAIAProfileInfo(Profile* profile) { ...@@ -70,13 +70,7 @@ bool GAIAInfoUpdateService::ShouldUseGAIAProfileInfo(Profile* profile) {
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
return false; return false;
#endif #endif
return true;
// To enable this feature for testing pass "--google-profile-info".
if (switches::IsGoogleProfileInfo())
return true;
// This feature is disable by default.
return false;
} }
bool GAIAInfoUpdateService::NeedsProfilePicture() const { bool GAIAInfoUpdateService::NeedsProfilePicture() const {
......
...@@ -190,12 +190,6 @@ void UpdateIsProfileLockEnabledIfNeeded(Profile* profile) { ...@@ -190,12 +190,6 @@ void UpdateIsProfileLockEnabledIfNeeded(Profile* profile) {
} }
void UpdateGaiaProfileInfoIfNeeded(Profile* profile) { void UpdateGaiaProfileInfoIfNeeded(Profile* profile) {
// If the --google-profile-info flag isn't used, then the
// GAIAInfoUpdateService isn't initialized, and we can't download the profile
// info.
if (!switches::IsGoogleProfileInfo())
return;
DCHECK(profile); DCHECK(profile);
GAIAInfoUpdateService* service = GAIAInfoUpdateService* service =
......
...@@ -74,8 +74,8 @@ bool IsProfileLocked(const base::FilePath& profile_path); ...@@ -74,8 +74,8 @@ bool IsProfileLocked(const base::FilePath& profile_path);
// an update for the Gaia profile info. // an update for the Gaia profile info.
void UpdateIsProfileLockEnabledIfNeeded(Profile* profile); void UpdateIsProfileLockEnabledIfNeeded(Profile* profile);
// If the --google-profile-info flag is turned on, starts an update for a new // Starts an update for a new version of the Gaia profile picture and other
// version of the Gaia profile picture and other profile info. // profile info.
void UpdateGaiaProfileInfoIfNeeded(Profile* profile); void UpdateGaiaProfileInfoIfNeeded(Profile* profile);
// Returns the sign-in error controller for the given profile. Some profiles, // Returns the sign-in error controller for the given profile. Some profiles,
......
...@@ -382,8 +382,7 @@ void SupervisedUserService::RegisterAndInitSync( ...@@ -382,8 +382,7 @@ void SupervisedUserService::RegisterAndInitSync(
weak_ptr_factory_.GetWeakPtr(), callback, custodian_profile)); weak_ptr_factory_.GetWeakPtr(), callback, custodian_profile));
// Fetch the custodian's profile information, to store the name. // Fetch the custodian's profile information, to store the name.
// TODO(pamg): If --google-profile-info (flag: switches::kGoogleProfileInfo) // TODO(pamg): Take the name from the ProfileAttributesStorage instead.
// is ever enabled, take the name from the ProfileAttributesStorage instead.
CustodianProfileDownloaderService* profile_downloader_service = CustodianProfileDownloaderService* profile_downloader_service =
CustodianProfileDownloaderServiceFactory::GetForProfile( CustodianProfileDownloaderServiceFactory::GetForProfile(
custodian_profile); custodian_profile);
......
...@@ -118,10 +118,6 @@ bool IsExtensionsMultiAccount() { ...@@ -118,10 +118,6 @@ bool IsExtensionsMultiAccount() {
STATE_ACCOUNT_CONSISTENCY); STATE_ACCOUNT_CONSISTENCY);
} }
bool IsGoogleProfileInfo() {
return CheckFlag(switches::kGoogleProfileInfo, STATE_NEW_AVATAR_MENU);
}
bool IsNewProfileManagement() { bool IsNewProfileManagement() {
return GetProcessState() >= STATE_NEW_PROFILE_MANAGEMENT; return GetProcessState() >= STATE_NEW_PROFILE_MANAGEMENT;
} }
......
...@@ -22,9 +22,6 @@ bool IsEnableAccountConsistency(); ...@@ -22,9 +22,6 @@ bool IsEnableAccountConsistency();
// Whether the chrome.identity API should be multi-account. // Whether the chrome.identity API should be multi-account.
bool IsExtensionsMultiAccount(); bool IsExtensionsMultiAccount();
// Enables using GAIA information to populate profile name and icon.
bool IsGoogleProfileInfo();
// Use new profile management system, including profile sign-out and new // Use new profile management system, including profile sign-out and new
// choosers. // choosers.
bool IsNewProfileManagement(); bool IsNewProfileManagement();
......
...@@ -32,9 +32,6 @@ extern const char kEnableRefreshTokenAnnotationRequest[] = ...@@ -32,9 +32,6 @@ extern const char kEnableRefreshTokenAnnotationRequest[] =
// Enables multiple account versions of chrome.identity APIs. // Enables multiple account versions of chrome.identity APIs.
const char kExtensionsMultiAccount[] = "extensions-multi-account"; const char kExtensionsMultiAccount[] = "extensions-multi-account";
// Enables using GAIA information to populate profile name and icon.
const char kGoogleProfileInfo[] = "google-profile-info";
// Enables or disables the new password separated sign in flow in a tab modal // Enables or disables the new password separated sign in flow in a tab modal
// dialog. // dialog.
const base::Feature kUsePasswordSeparatedSigninFlow { const base::Feature kUsePasswordSeparatedSigninFlow {
......
...@@ -23,7 +23,6 @@ extern const char kEnableAccountConsistency[]; ...@@ -23,7 +23,6 @@ extern const char kEnableAccountConsistency[];
extern const char kEnableNewProfileManagement[]; extern const char kEnableNewProfileManagement[];
extern const char kEnableRefreshTokenAnnotationRequest[]; extern const char kEnableRefreshTokenAnnotationRequest[];
extern const char kExtensionsMultiAccount[]; extern const char kExtensionsMultiAccount[];
extern const char kGoogleProfileInfo[];
extern const base::Feature kUsePasswordSeparatedSigninFlow; extern const base::Feature kUsePasswordSeparatedSigninFlow;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment