Delete ServiceManagerStartupUtils#SERVICE_MANAGER_FEATURES_OLD_KEY.

The cleanup period has already passed. Add the key to the deprecated
list so it's not reused.

Bug: 960767, 1022108
Change-Id: I8323c5bd897a041691f278da04861f4d799ca613
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1993642Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#729984}

chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java

@@ -411,9 +411,6 @@ public class ChromeBrowserInitializer {
             mTasksToRunWithNative = null;
         }
 
-        // TODO(crbug.com/960767): Remove this in M77.
-        ServiceManagerStartupUtils.cleanupSharedPreferences();
-
         // Needed for field trial metrics to be properly collected in ServiceManager only mode.
         FeatureUtilities.cacheNativeFlagsForServiceManagerOnlyMode();
 

chrome/android/java/src/org/chromium/chrome/browser/init/ServiceManagerStartupUtils.java

@@ -4,27 +4,9 @@
 
 package org.chromium.chrome.browser.init;
 
-import android.content.SharedPreferences;
-
-import org.chromium.base.ContextUtils;
-
 /**
  * Helper class for features that can be run in the ServiceManager only mode.
  */
 public class ServiceManagerStartupUtils {
     public static final String TASK_TAG = "Servicification Startup Task";
-
-    // Key in the SharedPreferences for storing all features that will start ServiceManager.
-    private static final String SERVICE_MANAGER_FEATURES_OLD_KEY = "ServiceManagerFeatures";
-
-    // Remove the {@link SERVICE_MANAGER_FEATURES_OLD_KEY} from the SharedPreferences. The same
-    // features are now cached in the FeatureUtilities.
-    public static void cleanupSharedPreferences() {
-        SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences();
-        if (sharedPreferences.contains(SERVICE_MANAGER_FEATURES_OLD_KEY)) {
-            SharedPreferences.Editor editor = sharedPreferences.edit();
-            editor.remove(SERVICE_MANAGER_FEATURES_OLD_KEY);
-            editor.apply();
-        }
-    }
 }
\ No newline at end of file

chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java

@@ -540,6 +540,7 @@ public final class ChromePreferenceKeys {
                 "PhysicalWeb.TotalUrls.OnRefresh",
                 "PhysicalWeb.UrlSelected",
                 "PrefMigrationVersion",
+                "ServiceManagerFeatures",
                 "allow_low_end_device_ui",
                 "allow_starting_service_manager_only",
                 "bookmark_search_history",