Revert of Mustash: Move GURL ParamTraits to url/ipc

content/common/dom_storage/dom_storage_messages.h

 // Copyright 2013 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 <stdint.h>
 
 #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 "url/ipc/url_param_traits.h"
 
 #define IPC_MESSAGE_START DOMStorageMsgStart
 
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebStorageArea::Result,
                           blink::WebStorageArea::ResultLast)
 
 // 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)
@@ skipping 65 matching lines @@
                      base::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)