Revert of Mustash: Move GURL ParamTraits to url/ipc

content/public/common/common_param_traits.h

Index: content/public/common/common_param_traits.h
diff --git a/content/public/common/common_param_traits.h b/content/public/common/common_param_traits.h
index 4e7610cdc04b79679ffb871127a2793333288bd2..5f55f13f72748ad9d9f2505f9eacb28a779cf6eb 100644
--- a/content/public/common/common_param_traits.h
+++ b/content/public/common/common_param_traits.h
@@ -25,7 +25,7 @@
 #include "ipc/ipc_message_utils.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/surface/transport_dib.h"
-#include "url/ipc/url_param_traits.h"
+#include "url/gurl.h"
 #include "url/origin.h"
 
 #if defined(OS_WIN)
@@ -43,6 +43,16 @@
 }
 
 namespace IPC {
+
+template <>
+struct CONTENT_EXPORT ParamTraits<GURL> {
+  typedef GURL param_type;
+  static void Write(base::Pickle* m, const param_type& p);
+  static bool Read(const base::Pickle* m,
+                   base::PickleIterator* iter,
+                   param_type* p);
+  static void Log(const param_type& p, std::string* l);
+};
 
 template <>
 struct CONTENT_EXPORT ParamTraits<url::Origin> {