PART1: Initiated the SignedSettings refactoring.

chrome/browser/chromeos/login/user_manager.cc

 // Copyright (c) 2011 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/chromeos/login/user_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/cros_settings.h"
 #include "chrome/browser/chromeos/cros/cert_library.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/login/default_user_images.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_display.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
@@ skipping 73 matching lines @@
         delegate_(delegate),
         weak_factory_(this) {
     RemoveUser();
   }
 
   virtual ~RemoveAttempt() {}
 
   void RemoveUser() {
     // Owner is not allowed to be removed from the device.
     // Must not proceed without signature verification.
-    UserCrosSettingsProvider user_settings;
-    bool trusted_owner_available = user_settings.RequestTrustedOwner(
+    CrosSettings* cros_settings = CrosSettings::Get();
+    bool trusted_owner_available = cros_settings->GetTrusted(
+        kDeviceOwner,
         base::Bind(&RemoveAttempt::RemoveUser, weak_factory_.GetWeakPtr()));
     if (!trusted_owner_available) {
       // Value of owner email is still not verified.
       // Another attempt will be invoked after verification completion.
       return;
     }
-    if (user_email_ == UserCrosSettingsProvider::cached_owner()) {
+    std::string owner;
+    cros_settings->GetString(kDeviceOwner, &owner);
+    if (user_email_ == owner) {
       // Owner is not allowed to be removed from the device. Probably on
       // the stack, so deffer the deletion.
       MessageLoop::current()->DeleteSoon(FROM_HERE, this);
       return;
     }
 
     if (delegate_)
       delegate_->OnBeforeUserRemoved(user_email_);
 
     chromeos::UserManager::Get()->RemoveUserFromList(user_email_);
@@ skipping 734 matching lines @@
 
 User* UserManager::CreateUser(const std::string& email) const {
   User* user = new User(email);
   user->set_oauth_token_status(GetUserOAuthStatus(email));
   // Used to determine whether user's display name is unique.
   ++display_name_count_[user->GetDisplayName()];
   return user;
 }
 
 }  // namespace chromeos