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

components/sync_driver/model_association_manager.cc

 // Copyright 2014 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/sync_driver/model_association_manager.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/debug/trace_event.h"
@@ skipping 21 matching lines @@
   syncer::AUTOFILL_PROFILE,
   syncer::EXTENSION_SETTINGS,
   syncer::APP_SETTINGS,
   syncer::TYPED_URLS,
   syncer::HISTORY_DELETE_DIRECTIVES,
   syncer::SYNCED_NOTIFICATIONS,
   syncer::SYNCED_NOTIFICATION_APP_INFO,
 
   // UI thread data types.
   syncer::BOOKMARKS,
-  syncer::MANAGED_USERS,        //  Syncing managed users on initial login might
-                                //  block creating a new managed user, so we
-                                //  want to do it early.
+  syncer::SUPERVISED_USERS,     //  Syncing supervised users on initial login
+                                //  might block creating a new supervised user,
+                                //  so we want to do it early.
   syncer::PREFERENCES,
   syncer::PRIORITY_PREFERENCES,
   syncer::EXTENSIONS,
   syncer::APPS,
   syncer::APP_LIST,
   syncer::THEMES,
   syncer::SEARCH_ENGINES,
   syncer::SESSIONS,
   syncer::APP_NOTIFICATIONS,
   syncer::DICTIONARY,
   syncer::FAVICON_IMAGES,
   syncer::FAVICON_TRACKING,
-  syncer::MANAGED_USER_SETTINGS,
-  syncer::MANAGED_USER_SHARED_SETTINGS,
+  syncer::SUPERVISED_USER_SETTINGS,
+  syncer::SUPERVISED_USER_SHARED_SETTINGS,
   syncer::ARTICLES,
 };
 
 COMPILE_ASSERT(arraysize(kStartOrder) ==
                syncer::MODEL_TYPE_COUNT - syncer::FIRST_REAL_MODEL_TYPE,
                kStartOrder_IncorrectSize);
 
 // The amount of time we wait for association to finish. If some types haven't
 // finished association by the time, configuration result will be
 // PARTIAL_SUCCESS and DataTypeManager is notified of the unfinished types.
@@ skipping 386 matching lines @@
 
   delegate_->OnModelAssociationDone(result);
 }
 
 base::OneShotTimer<ModelAssociationManager>*
     ModelAssociationManager::GetTimerForTesting() {
   return &timer_;
 }
 
 }  // namespace browser_sync