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

content/browser/dom_storage/session_storage_database_adapter.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_ADAPTER_H_
-#define WEBKIT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_ADAPTER_H_
+#ifndef CONTENT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_ADAPTER_H_
+#define CONTENT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_ADAPTER_H_
 
 #include "base/memory/ref_counted.h"
+#include "content/browser/dom_storage/dom_storage_database_adapter.h"
 #include "url/gurl.h"
-#include "webkit/browser/dom_storage/dom_storage_database_adapter.h"
 
-namespace dom_storage {
+namespace content {
 
 class SessionStorageDatabase;
 
-class SessionStorageDatabaseAdapter : public DomStorageDatabaseAdapter {
+class SessionStorageDatabaseAdapter : public DOMStorageDatabaseAdapter {
  public:
   SessionStorageDatabaseAdapter(SessionStorageDatabase* db,
                                 const std::string& permanent_namespace_id,
                                 const GURL& origin);
   virtual ~SessionStorageDatabaseAdapter();
-  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;
  private:
   scoped_refptr<SessionStorageDatabase> db_;
   std::string permanent_namespace_id_;
   GURL origin_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionStorageDatabaseAdapter);
 };
 
-}  // namespace dom_storage
+}  // namespace content
 
-#endif  // WEBKIT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_ADAPTER_H_
+#endif  // CONTENT_BROWSER_DOM_STORAGE_SESSION_STORAGE_DATABASE_ADAPTER_H_