[Android] Rename kMiceFeature to kMobileIdentityConsistency

This CL removes some remaining usages of kMiceFeature and renames the
feature object to kMobileIdentityConsistency to reduce confusion.

Bug: 1046385, 1048635
Change-Id: Ia0fd886c9a458060b5794f9a53fcd7c3dbba9236
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2033518Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: David Roger <droger@chromium.org>
Auto-Submit: Tanmoy Mollik <triploblastic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738904}

chrome/browser/about_flags.cc

@@ -4072,7 +4072,7 @@ const FeatureEntry kFeatureEntries[] = {
     {"mobile-identity-consistency",
      flag_descriptions::kMobileIdentityConsistencyName,
      flag_descriptions::kMobileIdentityConsistencyDescription, kOsAndroid,
-     FEATURE_VALUE_TYPE(signin::kMiceFeature)},
+     FEATURE_VALUE_TYPE(signin::kMobileIdentityConsistency)},
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_ANDROID)

chrome/browser/flags/android/chrome_feature_list.cc

@@ -244,7 +244,7 @@ const base::Feature* kFeaturesExposedToJava[] = {
     &password_manager::features::kPasswordManagerOnboardingAndroid,
     &safe_browsing::kCaptureSafetyNetId,
     &security_state::features::kMarkHttpAsFeature,
-    &signin::kMiceFeature,
+    &signin::kMobileIdentityConsistency,
     &switches::kSyncErrorInfoBarAndroid,
     &switches::kSyncUseSessionsUnregisterDelay,
     &subresource_filter::kSafeBrowsingSubresourceFilter,

components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.cc

@@ -413,8 +413,7 @@ bool ProfileOAuth2TokenServiceDelegateAndroid::UpdateAccountList(
     std::vector<CoreAccountId>* refreshed_ids,
     std::vector<CoreAccountId>* revoked_ids) {
   bool keep_accounts =
-      base::FeatureList::IsEnabled(signin::kMiceFeature) ||
-      (signed_in_id.has_value() && base::Contains(curr_ids, *signed_in_id));
+      signed_in_id.has_value() && base::Contains(curr_ids, *signed_in_id);
   if (keep_accounts) {
     // Revoke token for ids that have been removed from the device.
     for (const CoreAccountId& prev_id : prev_ids) {
@@ -488,8 +487,7 @@ void ProfileOAuth2TokenServiceDelegateAndroid::LoadCredentials(
             load_credentials_state());
   set_load_credentials_state(
       signin::LoadCredentialsState::LOAD_CREDENTIALS_IN_PROGRESS);
-  if (primary_account_id.empty() &&
-      !base::FeatureList::IsEnabled(signin::kMiceFeature)) {
+  if (primary_account_id.empty()) {
     FireRefreshTokensLoaded();
     return;
   }

components/signin/public/base/account_consistency_method.cc

@@ -9,8 +9,8 @@
 namespace signin {
 
 #if defined(OS_ANDROID)
-const base::Feature kMiceFeature{"MobileIdentityConsistency",
-                                 base::FEATURE_DISABLED_BY_DEFAULT};
+const base::Feature kMobileIdentityConsistency{
+    "MobileIdentityConsistency", base::FEATURE_DISABLED_BY_DEFAULT};
 #endif
 
 }  // namespace signin

components/signin/public/base/account_consistency_method.h

@@ -17,7 +17,7 @@ namespace signin {
 #if defined(OS_ANDROID)
 // Mice is similar to Mirror but also works when the user is not opted into
 // Sync.
-extern const base::Feature kMiceFeature;
+extern const base::Feature kMobileIdentityConsistency;
 #endif
 
 enum class AccountConsistencyMethod : int {