PART4: Removed the owner cache special handling from UserCrosSettingsProvider.

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"
@@ skipping 784 matching lines @@
 void UserManager::UpdateOwnership(bool is_owner) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   set_current_user_is_owner(is_owner);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_OWNERSHIP_CHECKED,
       content::NotificationService::AllSources(),
       content::NotificationService::NoDetails());
   if (is_owner) {
     // Also update cached value.
-    UserCrosSettingsProvider::UpdateCachedOwner(logged_in_user().email());
+    CrosSettings::Get()->SetString(
+        kDeviceOwner,
+        g_user_manager.Get().logged_in_user().email());
   }
 }
 
 void UserManager::CheckOwnership() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   bool is_owner = OwnershipService::GetSharedInstance()->CurrentUserIsOwner();
   VLOG(1) << "Current user " << (is_owner ? "is owner" : "is not owner");
 
   set_current_user_is_owner(is_owner);
 
@@ skipping 81 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