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

chrome/browser/managed_mode/managed_user_registration_utility.cc

 // Copyright 2013 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 "chrome/browser/managed_mode/managed_user_registration_utility.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 212 matching lines @@
 void ManagedUserRegistrationUtilityImpl::Register(
     const std::string& managed_user_id,
     const ManagedUserRegistrationInfo& info,
     const RegistrationCallback& callback) {
   DCHECK(pending_managed_user_id_.empty());
   callback_ = callback;
   pending_managed_user_id_ = managed_user_id;
 
   bool need_password_update = !info.password_data.empty();
   const base::DictionaryValue* dict =
-      prefs_->GetDictionary(prefs::kManagedUsers);
+      prefs_->GetDictionary(prefs::kSupervisedUsers);
   is_existing_managed_user_ = dict->HasKey(managed_user_id);
   if (!is_existing_managed_user_) {
     managed_user_sync_service_->AddManagedUser(pending_managed_user_id_,
                                                base::UTF16ToUTF8(info.name),
                                                info.master_key,
                                                info.password_signature_key,
                                                info.password_encryption_key,
                                                info.avatar_index);
   } else {
     const base::DictionaryValue* value = NULL;
@@ skipping 100 matching lines @@
     return;
   }
 
   DCHECK(!token.empty());
   pending_managed_user_token_ = token;
   CompleteRegistrationIfReady();
 }
 
 void ManagedUserRegistrationUtilityImpl::CompleteRegistrationIfReady() {
   bool skip_check = CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kNoManagedUserAcknowledgmentCheck);
+      switches::kNoSupervisedUserAcknowledgmentCheck);
 
   if (!pending_managed_user_acknowledged_ && !skip_check)
     return;
   if (password_update_ && !skip_check)
     return;
   if (pending_managed_user_token_.empty())
     return;
 
   GoogleServiceAuthError error(GoogleServiceAuthError::NONE);
   CompleteRegistration(true, error);
@@ skipping 28 matching lines @@
           pending_managed_user_id_);
     }
   }
 
   if (run_callback)
     callback_.Run(error, pending_managed_user_token_);
   callback_.Reset();
 }
 
 } // namespace