Re-enable syncing shared settings.

chrome/browser/sync/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 "base/command_line.h"
 #include "build/build_config.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 216 matching lines @@
 #if defined(ENABLE_MANAGED_USERS)
   if (profile_->IsManaged()) {
     pss->RegisterDataTypeController(
         new UIDataTypeController(
             syncer::MANAGED_USER_SETTINGS, this, profile_, pss));
   } else {
     pss->RegisterDataTypeController(
         new UIDataTypeController(
             syncer::MANAGED_USERS, this, profile_, pss));
   }
-  // TODO(bauerb): Enable once the Sync server has been updated to know about
-  // this data type.
-  // pss->RegisterDataTypeController(
-  //     new UIDataTypeController(
-  //         syncer::MANAGED_USER_SHARED_SETTINGS, this, profile_, pss));
+  pss->RegisterDataTypeController(
+      new UIDataTypeController(
+          syncer::MANAGED_USER_SHARED_SETTINGS, this, profile_, pss));
 #endif
 }
 
 void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
     ProfileSyncService* pss) {
   // App sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!command_line_->HasSwitch(switches::kDisableSyncApps)) {
     pss->RegisterDataTypeController(
         new ExtensionDataTypeController(syncer::APPS, this, profile_, pss));
@@ skipping 283 matching lines @@
 ProfileSyncComponentsFactory::SyncComponents
     ProfileSyncComponentsFactoryImpl::CreateSessionSyncComponents(
        ProfileSyncService* profile_sync_service,
         DataTypeErrorHandler* error_handler) {
   SessionModelAssociator* model_associator =
       new SessionModelAssociator(profile_sync_service, error_handler);
   SessionChangeProcessor* change_processor =
       new SessionChangeProcessor(error_handler, model_associator);
   return SyncComponents(model_associator, change_processor);
 }