Remove PrefService::ScheduleSavePersistentPrefs and SavePersistentPrefs.

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 56 matching lines @@
 
 // Stores user's OAuthTokenStatus 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)));
   DVLOG(1) << "Saving user OAuth token status in Local State.";
-  local_state->SavePersistentPrefs();
+  local_state->CommitPendingWrite();

[battre, 2011/10/11 18:46:23]

DictionaryPrefUpdate triggers a ScheduleSavePersistentPrefs() on *destruction*.
oauth_status_update is still on the stack at the time of calling
CommitPendingWrite. The same holds for other occurrences of this pattern.

[Bernhard Bauer, 2011/10/11 19:24:20]

Done.

 }
 
 // Gets user's OAuthTokenStatus from local state.
 UserManager::OAuthTokenStatus GetOAuthTokenStatusFromLocalState(
     const std::string& username) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSkipOAuthLogin)) {
     // Use OAUTH_TOKEN_STATUS_VALID flag if kSkipOAuthLogin is present.
@@ skipping 20 matching lines @@
                            int image_index) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   PrefService* local_state = g_browser_process->local_state();
   DictionaryPrefUpdate images_update(local_state, kUserImages);
   base::DictionaryValue* image_properties = new base::DictionaryValue();
   image_properties->Set(kImagePathNodeName, new StringValue(image_path));
   image_properties->Set(kImageIndexNodeName,
                         new base::FundamentalValue(image_index));
   images_update->SetWithoutPathExpansion(username, image_properties);
   DVLOG(1) << "Saving path to user image in Local State.";
-  local_state->SavePersistentPrefs();
+  local_state->CommitPendingWrite();
   UserManager::Get()->NotifyLocalStateChanged();
   UserManager* user_manager = UserManager::Get();
   NotificationService::current()->Notify(
       chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
       Source<UserManager>(user_manager),
       Details<const UserManager::User>(&(user_manager->logged_in_user())));
 }
 
 // Saves image to file with specified path. Runs on FILE thread.
 // Posts task for saving image info to local state on UI thread.
@@ skipping 319 matching lines @@
        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));
     } else {
       logged_in_user_ = *it;
     }
   }
-  prefs->SavePersistentPrefs();
+  prefs->CommitPendingWrite();
   NotifyOnLogin();
   if (current_user_is_new_) {
     SetDefaultUserImage(email);
   } else {
     // Download profile image if it's user image and see if it has changed.
     int image_index = logged_in_user_.default_image_index();
     if (image_index == User::kProfileImageIndex) {
       BrowserThread::PostDelayedTask(
           BrowserThread::UI,
           FROM_HERE,
@@ skipping 63 matching lines @@
   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);
   prefs_oauth_update->RemoveWithoutPathExpansion(email, NULL);
 
-  prefs->SavePersistentPrefs();
+  prefs->CommitPendingWrite();
 
   int default_image_id = kDefaultImagesCount;
   if (!IsDefaultImagePath(image_path_string, &default_image_id)) {
     FilePath image_path(image_path_string);
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         NewRunnableFunction(&DeleteUserImage,
                             image_path));
   }
@@ skipping 260 matching lines @@
     observer_list_,
     LocalStateChanged(this));
 }
 
 void UserManager::DownloadProfileImage() {
   profile_image_downloader_.reset(new ProfileImageDownloader(this));
   profile_image_downloader_->Start();
 }
 
 }  // namespace chromeos