more changes

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/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 44 matching lines @@
 
 base::LazyInstance<UserManager> g_user_manager(base::LINKER_INITIALIZED);
 
 // Stores path to the image in local state. Runs on UI thread.
 void SaveOAuthTokenStatusToLocalState(const std::string& username,
     UserManager::OAuthTokenStatus oauth_token_status) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   PrefService* local_state = g_browser_process->local_state();
   DictionaryPrefUpdate oauth_status_update(local_state, kUserOAuthTokenStatus);
   oauth_status_update->SetWithoutPathExpansion(username,
-      new base::FundamentalValue(static_cast<int>(oauth_token_status)));
+      base::NumberValue::New(static_cast<int>(oauth_token_status)));
   DVLOG(1) << "Saving user OAuth token status in Local State.";
   local_state->SavePersistentPrefs();
 }
 
 // Stores path to the image in local state. Runs on UI thread.
 void SavePathToLocalState(const std::string& username,
                           const std::string& image_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   PrefService* local_state = g_browser_process->local_state();
   DictionaryPrefUpdate images_update(local_state, kUserImages);
-  images_update->SetWithoutPathExpansion(username, new StringValue(image_path));
+  images_update->SetWithoutPathExpansion(username,
+                                         base::StringValue::New(image_path));
   DVLOG(1) << "Saving path to user image in Local State.";
   local_state->SavePersistentPrefs();
   UserManager::Get()->NotifyLocalStateChanged();
 }
 
 // Saves image to file with specified path. Runs on FILE thread.
 // Posts task for saving image path to local state on UI thread.
 void SaveImageToFile(const SkBitmap& image,
                      const FilePath& image_path,
                      const std::string& username) {
@@ skipping 289 matching lines @@
   // Clear the prefs view of the users.
   PrefService* prefs = g_browser_process->local_state();
   ListPrefUpdate prefs_users_update(prefs, kLoggedInUsers);
   prefs_users_update->Clear();
 
   user_is_logged_in_ = true;
   logged_in_user_ = User();
   logged_in_user_.set_email(email);
 
   // Make sure this user is first.
-  prefs_users_update->Append(Value::CreateStringValue(email));
+  prefs_users_update->Append(base::StringValue::New(email));
   for (std::vector<User>::iterator it = users.begin();
        it != users.end();
        ++it) {
     std::string user_email = it->email();
     // Skip the most recent user.
     if (email != user_email) {
-      prefs_users_update->Append(Value::CreateStringValue(user_email));
+      prefs_users_update->Append(base::StringValue::New(user_email));
     } else {
       logged_in_user_ = *it;
     }
   }
   prefs->SavePersistentPrefs();
   NotifyOnLogin();
   if (current_user_is_new_) {
     SetDefaultUserImage(email);
   } else {
     int metric = kDefaultImagesCount;
@@ skipping 36 matching lines @@
   PrefService* prefs = g_browser_process->local_state();
   ListPrefUpdate prefs_users_update(prefs, kLoggedInUsers);
   prefs_users_update->Clear();
 
   for (std::vector<User>::iterator it = users.begin();
        it != users.end();
        ++it) {
     std::string user_email = it->email();
     // Skip user that we would like to delete.
     if (email != user_email)
-      prefs_users_update->Append(Value::CreateStringValue(user_email));
+      prefs_users_update->Append(base::StringValue::New(user_email));
   }
 
   DictionaryPrefUpdate prefs_images_update(prefs, kUserImages);
   std::string image_path_string;
   prefs_images_update->GetStringWithoutPathExpansion(email, &image_path_string);
   prefs_images_update->RemoveWithoutPathExpansion(email, NULL);
 
   DictionaryPrefUpdate prefs_oauth_update(prefs, kUserOAuthTokenStatus);
   int oauth_status;
   prefs_oauth_update->GetIntegerWithoutPathExpansion(email, &oauth_status);
@@ skipping 261 matching lines @@
 }
 
 void UserManager::NotifyLocalStateChanged() {
  FOR_EACH_OBSERVER(
     Observer,
     observer_list_,
     LocalStateChanged(this));
 }
 
 }  // namespace chromeos