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

content/browser/dom_storage/session_storage_database.h

Index: content/browser/dom_storage/session_storage_database.h
diff --git a/webkit/browser/dom_storage/session_storage_database.h b/content/browser/dom_storage/session_storage_database.h
similarity index 92%
rename from webkit/browser/dom_storage/session_storage_database.h
rename to content/browser/dom_storage/session_storage_database.h
index c442504726d311b49d646d1012851cab5efedd13..60b97146a4361a6bec0d79f9df2fb9b76fbb4d47 100644
--- a/webkit/browser/dom_storage/session_storage_database.h
+++ b/content/browser/dom_storage/session_storage_database.h
@@ -2,8 +2,8 @@
 // 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_SESSION_STORAGE_DATABASE_H_
-#define WEBKIT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_H_
+#ifndef CONTENT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_H_
+#define CONTENT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_H_
 
 #include <map>
 #include <string>
@@ -12,9 +12,9 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
+#include "content/common/content_export.h"
+#include "content/common/dom_storage/dom_storage_types.h"
 #include "third_party/leveldatabase/src/include/leveldb/status.h"
-#include "webkit/browser/webkit_storage_browser_export.h"
-#include "webkit/common/dom_storage/dom_storage_types.h"
 
 class GURL;
 
@@ -24,16 +24,16 @@ struct ReadOptions;
 class WriteBatch;
 }  // namespace leveldb
 
-namespace dom_storage {
+namespace content {
 
 // SessionStorageDatabase holds the data from multiple namespaces and multiple
-// origins. All DomStorageAreas for session storage share the same
+// origins. All DOMStorageAreas for session storage share the same
 // SessionStorageDatabase.
 
 // Only one thread is allowed to call the public functions other than
 // ReadAreaValues and ReadNamespacesAndOrigins. Other threads are allowed to
 // call ReadAreaValues and ReadNamespacesAndOrigins.
-class WEBKIT_STORAGE_BROWSER_EXPORT SessionStorageDatabase :
+class CONTENT_EXPORT SessionStorageDatabase :
     public base::RefCountedThreadSafe<SessionStorageDatabase> {
  public:
   explicit SessionStorageDatabase(const base::FilePath& file_path);
@@ -44,7 +44,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT SessionStorageDatabase :
   // it will not be created and |result| will be unmodified.
   void ReadAreaValues(const std::string& namespace_id,
                       const GURL& origin,
-                      ValuesMap* result);
+                      DOMStorageValuesMap* result);
 
   // Updates the data for |namespace_id| and |origin|. Will remove all keys
   // before updating the database if |clear_all_first| is set. Then all entries
@@ -55,7 +55,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT SessionStorageDatabase :
   bool CommitAreaChanges(const std::string& namespace_id,
                          const GURL& origin,
                          bool clear_all_first,
-                         const ValuesMap& changes);
+                         const DOMStorageValuesMap& changes);
 
   // Creates shallow copies of the areas for |namespace_id| and associates them
   // with |new_namespace_id|.
@@ -149,11 +149,11 @@ class WEBKIT_STORAGE_BROWSER_EXPORT SessionStorageDatabase :
   // be empty.
   bool ReadMap(const std::string& map_id,
                const leveldb::ReadOptions& options,
-               ValuesMap* result,
+               DOMStorageValuesMap* result,
                bool only_keys);
   // Writes |values| into the map |map_id|.
   void WriteValuesToMap(const std::string& map_id,
-                        const ValuesMap& values,
+                        const DOMStorageValuesMap& values,
                         leveldb::WriteBatch* batch);
 
   bool GetMapRefCount(const std::string& map_id, int64* ref_count);
@@ -200,6 +200,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT SessionStorageDatabase :
   DISALLOW_COPY_AND_ASSIGN(SessionStorageDatabase);
 };
 
-}  // namespace dom_storage
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_H_
+#endif  // CONTENT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_H_