Remove PrefService::ScheduleSavePersistentPrefs and SavePersistentPrefs.

chrome/browser/chromeos/login/user_manager.cc

Index: chrome/browser/chromeos/login/user_manager.cc
diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc
index 57075a01cbeb95dd7c0db8dd4716850816916873..f56c3412f0eecb2d857d42b6422674e705caa6e3 100644
--- a/chrome/browser/chromeos/login/user_manager.cc
+++ b/chrome/browser/chromeos/login/user_manager.cc
@@ -74,7 +74,7 @@ void SaveOAuthTokenStatusToLocalState(const std::string& username,
   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.
@@ -115,7 +115,7 @@ void SaveImageToLocalState(const std::string& username,
                         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(
@@ -455,7 +455,7 @@ void UserManager::UserLoggedIn(const std::string& email) {
       logged_in_user_ = *it;
     }
   }
-  prefs->SavePersistentPrefs();
+  prefs->CommitPendingWrite();
   NotifyOnLogin();
   if (current_user_is_new_) {
     SetDefaultUserImage(email);
@@ -539,7 +539,7 @@ void UserManager::RemoveUserFromList(const std::string& email) {
   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)) {