Index: storage/common/blob/scoped_file.cc |
diff --git a/webkit/common/blob/scoped_file.cc b/storage/common/blob/scoped_file.cc |
similarity index 72% |
rename from webkit/common/blob/scoped_file.cc |
rename to storage/common/blob/scoped_file.cc |
index d009108cce6ff0bd67faeb3642acc5d4f4fcdb89..1e63839051f29e9a974834851a9b987627cba6be 100644 |
--- a/webkit/common/blob/scoped_file.cc |
+++ b/storage/common/blob/scoped_file.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "webkit/common/blob/scoped_file.h" |
+#include "storage/common/blob/scoped_file.h" |
#include "base/bind.h" |
#include "base/callback.h" |
@@ -11,21 +11,19 @@ |
#include "base/message_loop/message_loop_proxy.h" |
#include "base/task_runner.h" |
-namespace webkit_blob { |
+namespace storage { |
-ScopedFile::ScopedFile() |
- : scope_out_policy_(DONT_DELETE_ON_SCOPE_OUT) { |
+ScopedFile::ScopedFile() : scope_out_policy_(DONT_DELETE_ON_SCOPE_OUT) { |
} |
-ScopedFile::ScopedFile( |
- const base::FilePath& path, ScopeOutPolicy policy, |
- base::TaskRunner* file_task_runner) |
+ScopedFile::ScopedFile(const base::FilePath& path, |
+ ScopeOutPolicy policy, |
+ base::TaskRunner* file_task_runner) |
: path_(path), |
scope_out_policy_(policy), |
file_task_runner_(file_task_runner) { |
DCHECK(path.empty() || policy != DELETE_ON_SCOPE_OUT || file_task_runner) |
- << "path:" << path.value() |
- << " policy:" << policy |
+ << "path:" << path.value() << " policy:" << policy |
<< " runner:" << file_task_runner; |
} |
@@ -37,9 +35,8 @@ ScopedFile::~ScopedFile() { |
Reset(); |
} |
-void ScopedFile::AddScopeOutCallback( |
- const ScopeOutCallback& callback, |
- base::TaskRunner* callback_runner) { |
+void ScopedFile::AddScopeOutCallback(const ScopeOutCallback& callback, |
+ base::TaskRunner* callback_runner) { |
if (!callback_runner) |
callback_runner = base::MessageLoopProxy::current().get(); |
scope_out_callbacks_.push_back(std::make_pair(callback, callback_runner)); |
@@ -58,7 +55,8 @@ void ScopedFile::Reset() { |
return; |
for (ScopeOutCallbackList::iterator iter = scope_out_callbacks_.begin(); |
- iter != scope_out_callbacks_.end(); ++iter) { |
+ iter != scope_out_callbacks_.end(); |
+ ++iter) { |
iter->second->PostTask(FROM_HERE, base::Bind(iter->first, path_)); |
} |
@@ -66,7 +64,8 @@ void ScopedFile::Reset() { |
file_task_runner_->PostTask( |
FROM_HERE, |
base::Bind(base::IgnoreResult(&base::DeleteFile), |
- path_, false /* recursive */)); |
+ path_, |
+ false /* recursive */)); |
} |
// Clear all fields. |
@@ -82,4 +81,4 @@ void ScopedFile::MoveFrom(ScopedFile& other) { |
path_ = other.Release(); |
} |
-} // namespace webkit_blob |
+} // namespace storage |