[USS] Covert kSyncEnableUSSDeviceInfo commandline flag to Feature API

components/browser_sync/browser/profile_sync_components_factory_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/browser_sync/browser/profile_sync_components_factory_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
@@ skipping 132 matching lines @@
 }
 
 void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
     sync_driver::SyncService* sync_service,
     syncer::ModelTypeSet disabled_types,
     syncer::ModelTypeSet enabled_types) {
   base::Closure error_callback =
       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_));
   } else {
     sync_service->RegisterDataTypeController(
         base::MakeUnique<DeviceInfoDataTypeController>(
             error_callback, sync_client_,
             sync_service->GetLocalDeviceInfoProvider()));
   }
 
@@ skipping 255 matching lines @@
   return SyncComponents(model_associator, change_processor);
 }
 
 // static
 void ProfileSyncComponentsFactoryImpl::OverridePrefsForUssTest(bool use_uss) {
   override_prefs_controller_to_uss_for_test_ = use_uss;
 }
 
 bool ProfileSyncComponentsFactoryImpl::
     override_prefs_controller_to_uss_for_test_ = false;