Index: content/browser/dom_storage/dom_storage_task_runner.cc |
diff --git a/webkit/browser/dom_storage/dom_storage_task_runner.cc b/content/browser/dom_storage/dom_storage_task_runner.cc |
similarity index 72% |
rename from webkit/browser/dom_storage/dom_storage_task_runner.cc |
rename to content/browser/dom_storage/dom_storage_task_runner.cc |
index e1cc2f4d47995f3ea00fb03983b79621744cb65b..427fb490a8bf955d270a4e92e0484e712e21e1ed 100644 |
--- a/webkit/browser/dom_storage/dom_storage_task_runner.cc |
+++ b/content/browser/dom_storage/dom_storage_task_runner.cc |
@@ -2,24 +2,24 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "webkit/browser/dom_storage/dom_storage_task_runner.h" |
+#include "content/browser/dom_storage/dom_storage_task_runner.h" |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
#include "base/message_loop/message_loop_proxy.h" |
#include "base/tracked_objects.h" |
-namespace dom_storage { |
+namespace content { |
-// DomStorageTaskRunner |
+// DOMStorageTaskRunner |
-bool DomStorageTaskRunner::RunsTasksOnCurrentThread() const { |
+bool DOMStorageTaskRunner::RunsTasksOnCurrentThread() const { |
return IsRunningOnSequence(PRIMARY_SEQUENCE); |
} |
-// DomStorageWorkerPoolTaskRunner |
+// DOMStorageWorkerPoolTaskRunner |
-DomStorageWorkerPoolTaskRunner::DomStorageWorkerPoolTaskRunner( |
+DOMStorageWorkerPoolTaskRunner::DOMStorageWorkerPoolTaskRunner( |
base::SequencedWorkerPool* sequenced_worker_pool, |
base::SequencedWorkerPool::SequenceToken primary_sequence_token, |
base::SequencedWorkerPool::SequenceToken commit_sequence_token, |
@@ -30,10 +30,10 @@ DomStorageWorkerPoolTaskRunner::DomStorageWorkerPoolTaskRunner( |
commit_sequence_token_(commit_sequence_token) { |
} |
-DomStorageWorkerPoolTaskRunner::~DomStorageWorkerPoolTaskRunner() { |
+DOMStorageWorkerPoolTaskRunner::~DOMStorageWorkerPoolTaskRunner() { |
} |
-bool DomStorageWorkerPoolTaskRunner::PostDelayedTask( |
+bool DOMStorageWorkerPoolTaskRunner::PostDelayedTask( |
const tracked_objects::Location& from_here, |
const base::Closure& task, |
base::TimeDelta delay) { |
@@ -48,12 +48,12 @@ bool DomStorageWorkerPoolTaskRunner::PostDelayedTask( |
// Post a task to call this->PostTask() after the delay. |
return message_loop_->PostDelayedTask( |
FROM_HERE, |
- base::Bind(base::IgnoreResult(&DomStorageWorkerPoolTaskRunner::PostTask), |
+ base::Bind(base::IgnoreResult(&DOMStorageWorkerPoolTaskRunner::PostTask), |
this, from_here, task), |
delay); |
} |
-bool DomStorageWorkerPoolTaskRunner::PostShutdownBlockingTask( |
+bool DOMStorageWorkerPoolTaskRunner::PostShutdownBlockingTask( |
const tracked_objects::Location& from_here, |
SequenceID sequence_id, |
const base::Closure& task) { |
@@ -62,46 +62,46 @@ bool DomStorageWorkerPoolTaskRunner::PostShutdownBlockingTask( |
base::SequencedWorkerPool::BLOCK_SHUTDOWN); |
} |
-bool DomStorageWorkerPoolTaskRunner::IsRunningOnSequence( |
+bool DOMStorageWorkerPoolTaskRunner::IsRunningOnSequence( |
SequenceID sequence_id) const { |
return sequenced_worker_pool_->IsRunningSequenceOnCurrentThread( |
IDtoToken(sequence_id)); |
} |
base::SequencedWorkerPool::SequenceToken |
-DomStorageWorkerPoolTaskRunner::IDtoToken(SequenceID id) const { |
+DOMStorageWorkerPoolTaskRunner::IDtoToken(SequenceID id) const { |
if (id == PRIMARY_SEQUENCE) |
return primary_sequence_token_; |
DCHECK_EQ(COMMIT_SEQUENCE, id); |
return commit_sequence_token_; |
} |
-// MockDomStorageTaskRunner |
+// MockDOMStorageTaskRunner |
-MockDomStorageTaskRunner::MockDomStorageTaskRunner( |
+MockDOMStorageTaskRunner::MockDOMStorageTaskRunner( |
base::MessageLoopProxy* message_loop) |
: message_loop_(message_loop) { |
} |
-MockDomStorageTaskRunner::~MockDomStorageTaskRunner() { |
+MockDOMStorageTaskRunner::~MockDOMStorageTaskRunner() { |
} |
-bool MockDomStorageTaskRunner::PostDelayedTask( |
+bool MockDOMStorageTaskRunner::PostDelayedTask( |
const tracked_objects::Location& from_here, |
const base::Closure& task, |
base::TimeDelta delay) { |
return message_loop_->PostTask(from_here, task); |
} |
-bool MockDomStorageTaskRunner::PostShutdownBlockingTask( |
+bool MockDOMStorageTaskRunner::PostShutdownBlockingTask( |
const tracked_objects::Location& from_here, |
SequenceID sequence_id, |
const base::Closure& task) { |
return message_loop_->PostTask(from_here, task); |
} |
-bool MockDomStorageTaskRunner::IsRunningOnSequence(SequenceID) const { |
+bool MockDOMStorageTaskRunner::IsRunningOnSequence(SequenceID) const { |
return message_loop_->RunsTasksOnCurrentThread(); |
} |
-} // namespace dom_storage |
+} // namespace content |