Move webkit/{browser,common}/dom_storage into content/

content/browser/dom_storage/dom_storage_task_runner.h

Index: content/browser/dom_storage/dom_storage_task_runner.h
diff --git a/webkit/browser/dom_storage/dom_storage_task_runner.h b/content/browser/dom_storage/dom_storage_task_runner.h
similarity index 82%
rename from webkit/browser/dom_storage/dom_storage_task_runner.h
rename to content/browser/dom_storage/dom_storage_task_runner.h
index a18bedfbe582e3a64002d6a7ad48cb350356b2ab..cd0a93825455064965b4e1ad15ac3065dd67ef82 100644
--- a/webkit/browser/dom_storage/dom_storage_task_runner.h
+++ b/content/browser/dom_storage/dom_storage_task_runner.h
@@ -2,22 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_BROWSER_DOM_STORAGE_DOM_STORAGE_TASK_RUNNER_
-#define WEBKIT_BROWSER_DOM_STORAGE_DOM_STORAGE_TASK_RUNNER_
+#ifndef CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_TASK_RUNNER_
+#define CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_TASK_RUNNER_
 
 #include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
+#include "content/common/content_export.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
-namespace dom_storage {
+namespace content {
 
-// DomStorage uses two task sequences (primary vs commit) to avoid
+// DOMStorage uses two task sequences (primary vs commit) to avoid
 // primary access from queuing up behind commits to disk.
 // * Initialization, shutdown, and administrative tasks are performed as
 //   shutdown-blocking primary sequence tasks.
@@ -26,7 +26,7 @@ namespace dom_storage {
 //   TODO(michaeln): Skip tasks for reading during shutdown.
 // * Internal tasks related to committing changes to disk are performed as
 //   shutdown-blocking commit sequence tasks.
-class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageTaskRunner
+class CONTENT_EXPORT DOMStorageTaskRunner
     : public base::TaskRunner {
  public:
   enum SequenceID {
@@ -61,16 +61,16 @@ class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageTaskRunner
   }
 
  protected:
-  virtual ~DomStorageTaskRunner() {}
+  virtual ~DOMStorageTaskRunner() {}
 };
 
 // A derived class used in chromium that utilizes a SequenceWorkerPool
 // under dom_storage specific SequenceTokens. The |delayed_task_loop|
 // is used to delay scheduling on the worker pool.
-class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageWorkerPoolTaskRunner :
-      public DomStorageTaskRunner {
+class CONTENT_EXPORT DOMStorageWorkerPoolTaskRunner :
+      public DOMStorageTaskRunner {
  public:
-  DomStorageWorkerPoolTaskRunner(
+  DOMStorageWorkerPoolTaskRunner(
       base::SequencedWorkerPool* sequenced_worker_pool,
       base::SequencedWorkerPool::SequenceToken primary_sequence_token,
       base::SequencedWorkerPool::SequenceToken commit_sequence_token,
@@ -89,7 +89,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageWorkerPoolTaskRunner :
   virtual bool IsRunningOnSequence(SequenceID sequence_id) const OVERRIDE;
 
  protected:
-  virtual ~DomStorageWorkerPoolTaskRunner();
+  virtual ~DOMStorageWorkerPoolTaskRunner();
 
  private:
 
@@ -106,10 +106,10 @@ class WEBKIT_STORAGE_BROWSER_EXPORT DomStorageWorkerPoolTaskRunner :
 // There is no distinction between [non]-shutdown-blocking or
 // the primary sequence vs the commit sequence in the mock,
 // all tasks are scheduled on |message_loop| with zero delay.
-class WEBKIT_STORAGE_BROWSER_EXPORT MockDomStorageTaskRunner :
-      public DomStorageTaskRunner {
+class CONTENT_EXPORT MockDOMStorageTaskRunner :
+      public DOMStorageTaskRunner {
  public:
-  explicit MockDomStorageTaskRunner(base::MessageLoopProxy* message_loop);
+  explicit MockDOMStorageTaskRunner(base::MessageLoopProxy* message_loop);
 
   virtual bool PostDelayedTask(
       const tracked_objects::Location& from_here,
@@ -124,12 +124,12 @@ class WEBKIT_STORAGE_BROWSER_EXPORT MockDomStorageTaskRunner :
   virtual bool IsRunningOnSequence(SequenceID sequence_id) const OVERRIDE;
 
  protected:
-  virtual ~MockDomStorageTaskRunner();
+  virtual ~MockDOMStorageTaskRunner();
 
  private:
   const scoped_refptr<base::MessageLoopProxy> message_loop_;
 };
 
-}  // namespace dom_storage
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_DOM_STORAGE_DOM_STORAGE_TASK_RUNNER_
+#endif  // CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_TASK_RUNNER_