Enable invalidations for supervised user settings on Android.

chrome/browser/sync/profile_sync_components_factory_impl.cc

Index: chrome/browser/sync/profile_sync_components_factory_impl.cc
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index aa16e7eefa68d5ac2780a129d785b2e295fbcf56..55baf1e406e29a8735bc51ac6abf2095070b8ca5 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -276,16 +276,6 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(
           syncer::SUPERVISED_USER_SETTINGS,
           this,
           profile_));
-  pss->RegisterDataTypeController(
-      new SupervisedUserSyncDataTypeController(
-          syncer::SUPERVISED_USERS,
-          this,
-          profile_));
-  pss->RegisterDataTypeController(
-      new SupervisedUserSyncDataTypeController(
-          syncer::SUPERVISED_USER_SHARED_SETTINGS,
-          this,
-          profile_));
 #endif
 }
 
@@ -397,6 +387,19 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
             this));
   }
 #endif
+
+#if defined(ENABLE_MANAGED_USERS)
+  pss->RegisterDataTypeController(
+      new SupervisedUserSyncDataTypeController(
+          syncer::SUPERVISED_USERS,
+          this,
+          profile_));
+  pss->RegisterDataTypeController(
+      new SupervisedUserSyncDataTypeController(
+          syncer::SUPERVISED_USER_SHARED_SETTINGS,
+          this,
+          profile_));
+#endif
 }
 
 DataTypeManager* ProfileSyncComponentsFactoryImpl::CreateDataTypeManager(