[USS] Covert kSyncEnableUSSDeviceInfo commandline flag to Feature API

components/browser_sync/browser/profile_sync_components_factory_impl.cc

Index: components/browser_sync/browser/profile_sync_components_factory_impl.cc
diff --git a/components/browser_sync/browser/profile_sync_components_factory_impl.cc b/components/browser_sync/browser/profile_sync_components_factory_impl.cc
index df301a25c059fef6e9ee31c8183524cfadde16d6..7422c6b8a573b0f568337e256db833f86e7f6230 100644
--- a/components/browser_sync/browser/profile_sync_components_factory_impl.cc
+++ b/components/browser_sync/browser/profile_sync_components_factory_impl.cc
@@ -150,8 +150,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
       base::Bind(&ChromeReportUnrecoverableError, channel_);
 
   // TODO(stanisc): can DEVICE_INFO be one of disabled datatypes?
-  if (channel_ == version_info::Channel::UNKNOWN &&
-      command_line_.HasSwitch(switches::kSyncEnableUSSDeviceInfo)) {
+  if (base::FeatureList::IsEnabled(switches::kSyncUSSDeviceInfo)) {
     sync_service->RegisterDataTypeController(
         base::MakeUnique<UIModelTypeController>(syncer::DEVICE_INFO,
                                                 error_callback, sync_client_));