Revert of Mustash: Move GURL ParamTraits to url/ipc

components/nacl/common/nacl_host_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 file, no traditional include guard.
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/process/process.h"
 #include "build/build_config.h"
 #include "components/nacl/common/nacl_types.h"
 #include "components/nacl/common/nacl_types_param_traits.h"
 #include "components/nacl/common/pnacl_types.h"
+#include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
 #include "url/gurl.h"
-#include "url/ipc/url_param_traits.h"
 
 #define IPC_MESSAGE_START NaClHostMsgStart
 
 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClResourcePrefetchRequest)
   IPC_STRUCT_TRAITS_MEMBER(file_key)
   IPC_STRUCT_TRAITS_MEMBER(resource_url)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchParams)
   IPC_STRUCT_TRAITS_MEMBER(manifest_url)
@@ skipping 91 matching lines @@
 // processors are online.
 IPC_SYNC_MESSAGE_CONTROL0_1(NaClHostMsg_NaClGetNumProcessors,
                             int /* Number of processors */)
 
 // A renderer sends this to the browser process to determine if the
 // NaCl application started from the given NMF URL will be debugged.
 // If not (filtered out by commandline flags), it sets should_debug to false.
 IPC_SYNC_MESSAGE_CONTROL1_1(NaClHostMsg_NaClDebugEnabledForURL,
                             GURL /* alleged URL of NMF file */,
                             bool /* should debug */)