| Index: chrome/browser/metrics/metrics_service.cc
|
| diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
|
| index 293af4db8496be65c25bd994f34bd8cd2269b00a..be83782410520347ed132e209342c5b35ab052d7 100644
|
| --- a/chrome/browser/metrics/metrics_service.cc
|
| +++ b/chrome/browser/metrics/metrics_service.cc
|
| @@ -1669,27 +1669,11 @@ bool MetricsService::UmaMetricsProperlyShutdown() {
|
| return clean_shutdown_status_ == CLEANLY_SHUTDOWN;
|
| }
|
|
|
| -// 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->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,
|
| - base::Bind(Signal, &done_writing));
|
| - // http://crbug.com/124954
|
| - base::ThreadRestrictions::ScopedAllowWait allow_wait;
|
| - done_writing.TimedWait(base::TimeDelta::FromHours(1));
|
| -
|
| // Redundant setting to assure that we always reset this value at shutdown
|
| // (and that we don't use some alternate path, and not call LogCleanShutdown).
|
| clean_shutdown_status_ = CLEANLY_SHUTDOWN;
|
|
|