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

content/common/dom_storage/dom_storage_messages.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.
 
 // Multiply-included message file, no traditional include guard.
+#include "content/common/dom_storage/dom_storage_types.h"
 #include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 #include "third_party/WebKit/public/platform/WebStorageArea.h"
 #include "url/gurl.h"
-#include "webkit/common/dom_storage/dom_storage_types.h"
 
 #define IPC_MESSAGE_START DOMStorageMsgStart
 
 // Signals a local storage event.
 IPC_STRUCT_BEGIN(DOMStorageMsg_Event_Params)
   // The key that generated the storage event.  Null if clear() was called.
   IPC_STRUCT_MEMBER(base::NullableString16, key)
 
   // The old value of this key.  Null on clear() or if it didn't have a value.
   IPC_STRUCT_MEMBER(base::NullableString16, old_value)
@@ skipping 40 matching lines @@
                      GURL /* origin */)
 
 // Close a previously opened storage area.
 IPC_MESSAGE_CONTROL1(DOMStorageHostMsg_CloseStorageArea,
                      int /* connection_id */)
 
 // Retrieves the set of key/value pairs for the area. Used to prime
 // the renderer-side cache. A completion notification is sent in response.
 IPC_SYNC_MESSAGE_CONTROL1_1(DOMStorageHostMsg_LoadStorageArea,
                             int /* connection_id */,
-                            dom_storage::ValuesMap)
+                            content::DOMStorageValuesMap)
 
 // Set a value that's associated with a key in a storage area.
 // A completion notification is sent in response.
 IPC_MESSAGE_CONTROL4(DOMStorageHostMsg_SetItem,
                      int /* connection_id */,
                      string16 /* key */,
                      string16 /* value */,
                      GURL /* page_url */)
 
 // Remove the value associated with a key in a storage area.
 // A completion notification is sent in response.
 IPC_MESSAGE_CONTROL3(DOMStorageHostMsg_RemoveItem,
                      int /* connection_id */,
                      string16 /* key */,
                      GURL /* page_url */)
 
 // Clear the storage area. A completion notification is sent in response.
 IPC_MESSAGE_CONTROL2(DOMStorageHostMsg_Clear,
                      int /* connection_id */,
                      GURL /* page_url */)
 
 // Used to flush the ipc message queue.
 IPC_SYNC_MESSAGE_CONTROL0_0(DOMStorageHostMsg_FlushMessages)