diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-27 16:41:48 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-27 16:41:48 +0000 |
| commit | fbe17c8a2baf508c2ce5210a1322331d0c011ce3 (patch) | |
| tree | 7c996389f4673186d2637bbab576776691a40a0a /chrome/browser/metrics/metrics_service.cc | |
| parent | 3eff133b651ca64430e0ab105b132f08cfc9df58 (diff) | |
| download | chromium_src-fbe17c8a2baf508c2ce5210a1322331d0c011ce3.zip chromium_src-fbe17c8a2baf508c2ce5210a1322331d0c011ce3.tar.gz chromium_src-fbe17c8a2baf508c2ce5210a1322331d0c011ce3.tar.bz2 | |
Remove PrefService::ScheduleSavePersistentPrefs and change SavePersistentPrefs calls to CommitPendingWrites.
TBR=ncarter@chromium.org
BUG=99306
TEST=none
Review URL: http://codereview.chromium.org/8198007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/metrics/metrics_service.cc')
| -rw-r--r-- | chrome/browser/metrics/metrics_service.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index e034a30..3fda3d4 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -777,7 +777,6 @@ void MetricsService::SaveLocalState() { } RecordCurrentState(pref); - pref->ScheduleSavePersistentPrefs(); // TODO(jar): Does this run down the batteries???? ScheduleNextStateSave(); @@ -1132,11 +1131,6 @@ void MetricsService::OnURLFetchComplete(const content::URLFetcher* source) { } 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); @@ -1304,7 +1298,7 @@ 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 |