Rename "managed (mode|user)" to "supervised user" (part 1)

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/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 #include "chrome/browser/history/history_service.h"
@@ skipping 233 matching lines @@
     pss->RegisterDataTypeController(
         new UIDataTypeController(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
             base::Bind(&ChromeReportUnrecoverableError),
             syncer::ARTICLES,
             this,
             pss));
   }
 
 #if defined(ENABLE_MANAGED_USERS)
-  if (profile_->IsManaged()) {
+  if (profile_->IsSupervised()) {
     pss->RegisterDataTypeController(
         new UIDataTypeController(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
             base::Bind(&ChromeReportUnrecoverableError),
-            syncer::MANAGED_USER_SETTINGS,
+            syncer::SUPERVISED_USER_SETTINGS,
             this,
             pss));
   } else {
     pss->RegisterDataTypeController(
         new UIDataTypeController(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
             base::Bind(&ChromeReportUnrecoverableError),
-            syncer::MANAGED_USERS,
+            syncer::SUPERVISED_USERS,
             this,
             pss));
   }
   pss->RegisterDataTypeController(
       new UIDataTypeController(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
             base::Bind(&ChromeReportUnrecoverableError),
-            syncer::MANAGED_USER_SHARED_SETTINGS,
+            syncer::SUPERVISED_USER_SHARED_SETTINGS,
             this,
             pss));
 #endif
 }
 
 void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
     syncer::ModelTypeSet disabled_types,
     ProfileSyncService* pss) {
   // App sync is enabled by default.  Register unless explicitly
   // disabled.
@@ skipping 219 matching lines @@
 #endif
     case syncer::FAVICON_IMAGES:
     case syncer::FAVICON_TRACKING: {
       browser_sync::FaviconCache* favicons =
           ProfileSyncServiceFactory::GetForProfile(profile_)->
               GetFaviconCache();
       return favicons ? favicons->AsWeakPtr()
                       : base::WeakPtr<syncer::SyncableService>();
     }
 #if defined(ENABLE_MANAGED_USERS)
-    case syncer::MANAGED_USER_SETTINGS:
+    case syncer::SUPERVISED_USER_SETTINGS:
       return ManagedUserSettingsServiceFactory::GetForProfile(profile_)->
           AsWeakPtr();
-    case syncer::MANAGED_USERS:
+    case syncer::SUPERVISED_USERS:
       return ManagedUserSyncServiceFactory::GetForProfile(profile_)->
           AsWeakPtr();
-    case syncer::MANAGED_USER_SHARED_SETTINGS:
+    case syncer::SUPERVISED_USER_SHARED_SETTINGS:
       return ManagedUserSharedSettingsServiceFactory::GetForBrowserContext(
           profile_)->AsWeakPtr();
 #endif
     case syncer::ARTICLES: {
       dom_distiller::DomDistillerService* service =
           dom_distiller::DomDistillerServiceFactory::GetForBrowserContext(
               profile_);
       if (service)
         return service->GetSyncableService()->AsWeakPtr();
       return base::WeakPtr<syncer::SyncableService>();
@@ skipping 82 matching lines @@
       new TypedUrlModelAssociator(profile_sync_service,
                                   history_backend,
                                   error_handler);
   TypedUrlChangeProcessor* change_processor =
       new TypedUrlChangeProcessor(profile_,
                                   model_associator,
                                   history_backend,
                                   error_handler);
   return SyncComponents(model_associator, change_processor);
 }