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

content/browser/dom_storage/local_storage_database_adapter.h

Index: content/browser/dom_storage/local_storage_database_adapter.h
diff --git a/webkit/browser/dom_storage/local_storage_database_adapter.h b/content/browser/dom_storage/local_storage_database_adapter.h
similarity index 42%
rename from webkit/browser/dom_storage/local_storage_database_adapter.h
rename to content/browser/dom_storage/local_storage_database_adapter.h
index 7cdabf4b03e0fe87ee27800cf7308c290bfd1c44..3ba1b0ef73c2f687f37726989ba78b3e01c2c12c 100644
--- a/webkit/browser/dom_storage/local_storage_database_adapter.h
+++ b/content/browser/dom_storage/local_storage_database_adapter.h
@@ -2,30 +2,30 @@
 // 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_LOCAL_STORAGE_DATABASE_ADAPTER_H_
-#define WEBKIT_BROWSER_DOM_STORAGE_LOCAL_STORAGE_DATABASE_ADAPTER_H_
+#ifndef CONTENT_BROWSER_DOM_STORAGE_LOCAL_STORAGE_DATABASE_ADAPTER_H_
+#define CONTENT_BROWSER_DOM_STORAGE_LOCAL_STORAGE_DATABASE_ADAPTER_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "webkit/browser/dom_storage/dom_storage_database_adapter.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
+#include "content/browser/dom_storage/dom_storage_database_adapter.h"
+#include "content/common/content_export.h"
 
 namespace base {
 class FilePath;
 }
 
-namespace dom_storage {
+namespace content {
 
-class DomStorageDatabase;
+class DOMStorageDatabase;
 
-class WEBKIT_STORAGE_BROWSER_EXPORT LocalStorageDatabaseAdapter :
-      public DomStorageDatabaseAdapter {
+class CONTENT_EXPORT LocalStorageDatabaseAdapter :
+      public DOMStorageDatabaseAdapter {
  public:
   explicit LocalStorageDatabaseAdapter(const base::FilePath& path);
   virtual ~LocalStorageDatabaseAdapter();
-  virtual void ReadAllValues(ValuesMap* result) OVERRIDE;
+  virtual void ReadAllValues(DOMStorageValuesMap* result) OVERRIDE;
   virtual bool CommitChanges(bool clear_all_first,
-                             const ValuesMap& changes) OVERRIDE;
+                             const DOMStorageValuesMap& changes) OVERRIDE;
   virtual void DeleteFiles() OVERRIDE;
   virtual void Reset() OVERRIDE;
 
@@ -34,17 +34,17 @@ class WEBKIT_STORAGE_BROWSER_EXPORT LocalStorageDatabaseAdapter :
   LocalStorageDatabaseAdapter();
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(DomStorageAreaTest, BackingDatabaseOpened);
-  FRIEND_TEST_ALL_PREFIXES(DomStorageAreaTest, CommitChangesAtShutdown);
-  FRIEND_TEST_ALL_PREFIXES(DomStorageAreaTest, CommitTasks);
-  FRIEND_TEST_ALL_PREFIXES(DomStorageAreaTest, DeleteOrigin);
-  FRIEND_TEST_ALL_PREFIXES(DomStorageAreaTest, PurgeMemory);
+  FRIEND_TEST_ALL_PREFIXES(DOMStorageAreaTest, BackingDatabaseOpened);
+  FRIEND_TEST_ALL_PREFIXES(DOMStorageAreaTest, CommitChangesAtShutdown);
+  FRIEND_TEST_ALL_PREFIXES(DOMStorageAreaTest, CommitTasks);
+  FRIEND_TEST_ALL_PREFIXES(DOMStorageAreaTest, DeleteOrigin);
+  FRIEND_TEST_ALL_PREFIXES(DOMStorageAreaTest, PurgeMemory);
 
-  scoped_ptr<DomStorageDatabase> db_;
+  scoped_ptr<DOMStorageDatabase> db_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalStorageDatabaseAdapter);
 };
 
-}  // namespace dom_storage
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_DOM_STORAGE_LOCAL_STORAGE_DATABASE_ADAPTER_H_
+#endif  // CONTENT_BROWSER_DOM_STORAGE_LOCAL_STORAGE_DATABASE_ADAPTER_H_