[USS] Covert kSyncEnableUSSDeviceInfo commandline flag to Feature API

components/sync/driver/sync_driver_switches.cc

Index: components/sync/driver/sync_driver_switches.cc
diff --git a/components/sync/driver/sync_driver_switches.cc b/components/sync/driver/sync_driver_switches.cc
index 69273938e906e370fd20809e0e2f26815ee3ee56..33b9051f89beedc2c8e1b34646dbd6f3a7352538 100644
--- a/components/sync/driver/sync_driver_switches.cc
+++ b/components/sync/driver/sync_driver_switches.cc
@@ -17,11 +17,6 @@ const char kSyncDisableDeferredStartup[] = "sync-disable-deferred-startup";
 // Enables feature to avoid unnecessary GetUpdate requests.
 const char kSyncEnableGetUpdateAvoidance[] = "sync-enable-get-update-avoidance";
 
-// Enables USS implementation of DeviceInfo datatype. This flag controls whether
-// SyncableService based or ModelTypeService based implementation is used for
-// DeviceInfo type.
-const char kSyncEnableUSSDeviceInfo[] = "sync-enable-uss-device-info";
-
 // Overrides the default server used for profile sync.
 const char kSyncServiceURL[] = "sync-url";
 
@@ -34,4 +29,10 @@ const char kSyncShortInitialRetryOverride[] =
 const base::Feature kSyncClearDataOnPassphraseEncryption{
     "ClearSyncDataOnPassphraseEncryption", base::FEATURE_DISABLED_BY_DEFAULT};
 
+// Enables USS implementation of DeviceInfo datatype. This flag controls whether
+// SyncableService based or ModelTypeService based implementation is used for
+// DeviceInfo type.
+const base::Feature kSyncUSSDeviceInfo{"EnableSyncUSSDeviceInfo",
+                                       base::FEATURE_DISABLED_BY_DEFAULT};
+
 }  // namespace switches