| Index: trunk/src/base/files/important_file_writer.cc
|
| ===================================================================
|
| --- trunk/src/base/files/important_file_writer.cc (revision 269437)
|
| +++ trunk/src/base/files/important_file_writer.cc (working copy)
|
| @@ -23,7 +23,6 @@
|
| #include "base/metrics/histogram.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/task_runner.h"
|
| -#include "base/task_runner_util.h"
|
| #include "base/threading/thread.h"
|
| #include "base/time/time.h"
|
|
|
| @@ -94,13 +93,13 @@
|
| return true;
|
| }
|
|
|
| -ImportantFileWriter::ImportantFileWriter(const FilePath& path,
|
| - base::SequencedTaskRunner* task_runner)
|
| - : path_(path),
|
| - task_runner_(task_runner),
|
| - serializer_(NULL),
|
| - commit_interval_(TimeDelta::FromMilliseconds(kDefaultCommitIntervalMs)),
|
| - weak_factory_(this) {
|
| +ImportantFileWriter::ImportantFileWriter(
|
| + const FilePath& path, base::SequencedTaskRunner* task_runner)
|
| + : path_(path),
|
| + task_runner_(task_runner),
|
| + serializer_(NULL),
|
| + commit_interval_(TimeDelta::FromMilliseconds(
|
| + kDefaultCommitIntervalMs)) {
|
| DCHECK(CalledOnValidThread());
|
| DCHECK(task_runner_.get());
|
| }
|
| @@ -127,13 +126,11 @@
|
| if (HasPendingWrite())
|
| timer_.Stop();
|
|
|
| - if (!base::PostTaskAndReplyWithResult(
|
| - task_runner_,
|
| + if (!task_runner_->PostTask(
|
| FROM_HERE,
|
| MakeCriticalClosure(
|
| - Bind(&ImportantFileWriter::WriteFileAtomically, path_, data)),
|
| - Bind(&ImportantFileWriter::ForwardSuccessfulWrite,
|
| - weak_factory_.GetWeakPtr()))) {
|
| + Bind(IgnoreResult(&ImportantFileWriter::WriteFileAtomically),
|
| + path_, data)))) {
|
| // Posting the task to background message loop is not expected
|
| // to fail, but if it does, avoid losing data and just hit the disk
|
| // on the current thread.
|
| @@ -167,18 +164,4 @@
|
| serializer_ = NULL;
|
| }
|
|
|
| -void ImportantFileWriter::RegisterOnNextSuccessfulWriteCallback(
|
| - const base::Closure& on_next_successful_write) {
|
| - DCHECK(on_next_successful_write_.is_null());
|
| - on_next_successful_write_ = on_next_successful_write;
|
| -}
|
| -
|
| -void ImportantFileWriter::ForwardSuccessfulWrite(bool result) {
|
| - DCHECK(CalledOnValidThread());
|
| - if (result && !on_next_successful_write_.is_null()) {
|
| - on_next_successful_write_.Run();
|
| - on_next_successful_write_.Reset();
|
| - }
|
| -}
|
| -
|
| } // namespace base
|
|
|