Remove PrefService::ScheduleSavePersistentPrefs and SavePersistentPrefs.

chrome/browser/metrics/metrics_service.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.
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
 //
 // A MetricsService instance is typically created at application startup.  It
@@ skipping 752 matching lines @@
 }
 
 void MetricsService::SaveLocalState() {
   PrefService* pref = g_browser_process->local_state();
   if (!pref) {
     NOTREACHED();
     return;
   }
 
   RecordCurrentState(pref);
-  pref->ScheduleSavePersistentPrefs();
 
   // TODO(jar): Does this run down the batteries????
   ScheduleNextStateSave();
 }
 
 
 //------------------------------------------------------------------------------
 // Recording control methods
 
 void MetricsService::StartRecording() {
@@ skipping 330 matching lines @@
 
       case SENDING_CURRENT_LOGS:
         break;
 
       default:
         NOTREACHED();
         break;
     }
 
     log_manager_.DiscardStagedLog();
-    // Since we sent a log, make sure our in-memory state is recorded to disk.
-    PrefService* local_state = g_browser_process->local_state();
-    DCHECK(local_state);
-    if (local_state)
-      local_state->ScheduleSavePersistentPrefs();
 
     if (log_manager_.has_unsent_logs())
       DCHECK(state_ < SENDING_CURRENT_LOGS);
   }
 
   // Error 400 indicates a problem with the log, not with the server, so
   // don't consider that a sign that the server is in trouble.
   bool server_is_healthy = upload_succeeded || response_code == 400;
 
   scheduler_->UploadFinished(server_is_healthy,
@@ skipping 147 matching lines @@
 
 // For use in hack in LogCleanShutdown.
 static void Signal(base::WaitableEvent* event) {
   event->Signal();
 }
 
 void MetricsService::LogCleanShutdown() {
   // Redundant hack to write pref ASAP.
   PrefService* pref = g_browser_process->local_state();
   pref->SetBoolean(prefs::kStabilityExitedCleanly, true);
-  pref->SavePersistentPrefs();
+  pref->CommitPendingWrite();
   // Hack: TBD: Remove this wait.
   // We are so concerned that the pref gets written, we are now willing to stall
   // the UI thread until we get assurance that a pref-writing task has
   // completed.
   base::WaitableEvent done_writing(false, false);
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       NewRunnableFunction(Signal, &done_writing));
   done_writing.TimedWait(base::TimeDelta::FromHours(1));
 
   // Redundant setting to assure that we always reset this value at shutdown
@@ skipping 229 matching lines @@
   if (local_state) {
     const PrefService::Preference* uma_pref =
         local_state->FindPreference(prefs::kMetricsReportingEnabled);
     if (uma_pref) {
       bool success = uma_pref->GetValue()->GetAsBoolean(&result);
       DCHECK(success);
     }
   }
   return result;
 }