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

content/browser/dom_storage/session_storage_database.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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>
 
 #include "base/files/file_path.h"
 #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;
 
 namespace leveldb {
 class DB;
 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);
 
   // Reads the (key, value) pairs for |namespace_id| and |origin|. |result| is
   // assumed to be empty and any duplicate keys will be overwritten. If the
   // database exists on disk then it will be opened. If it does not exist then
   // 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
   // in |changes| will be examined - keys mapped to a null NullableString16 will
   // be removed and all others will be inserted/updated as appropriate. It is
   // allowed to write data into a shallow copy created by CloneNamespace, and in
   // that case the copy will be made deep before writing the values.
   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|.
   bool CloneNamespace(const std::string& namespace_id,
                       const std::string& new_namespace_id);
 
   // Deletes the data for |namespace_id| and |origin|.
   bool DeleteArea(const std::string& namespace_id, const GURL& origin);
 
   // Deletes the data for |namespace_id|.
@@ skipping 73 matching lines @@
   // the ref count.
   bool CreateMapForArea(const std::string& namespace_id,
                         const GURL& origin,
                         std::string* map_id,
                         leveldb::WriteBatch* batch);
   // Reads the contents of the map |map_id| into |result|. If |only_keys| is
   // true, only keys are aread from the database and the values in |result| will
   // 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);
   bool IncreaseMapRefCount(const std::string& map_id,
                            leveldb::WriteBatch* batch);
   // Decreases the ref count of a map by |decrease|. If the ref count goes to 0,
   // deletes the map.
   bool DecreaseMapRefCount(const std::string& map_id,
                            int decrease,
                            leveldb::WriteBatch* batch);
@@ skipping 26 matching lines @@
   base::Lock db_lock_;
 
   // True if a database error has occurred (e.g., cannot read data).
   bool db_error_;
   // True if the database is in an inconsistent state.
   bool is_inconsistent_;
 
   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_