Fix gpu_video_decode_accelerator include order by renaming enum with X11 name collision

content/common/child_process_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.
 
 // Common IPC messages used for child processes.
 // Multiply-included message file, hence no include guard.
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 13 matching lines @@
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/ipc/gfx_param_traits.h"
 #include "ui/gfx/ipc/skia/gfx_skia_param_traits.h"
 
 IPC_ENUM_TRAITS_MAX_VALUE(content::CauseForGpuLaunch,
                           content::CAUSE_FOR_GPU_LAUNCH_MAX_ENUM - 1)
 
-IPC_ENUM_TRAITS_MAX_VALUE(tracked_objects::ThreadData::Status,
+IPC_ENUM_TRAITS_MAX_VALUE(tracked_objects::ThreadData::ThreadStatus,
                           tracked_objects::ThreadData::STATUS_LAST)
 
 IPC_STRUCT_TRAITS_BEGIN(tracked_objects::LocationSnapshot)
   IPC_STRUCT_TRAITS_MEMBER(file_name)
   IPC_STRUCT_TRAITS_MEMBER(function_name)
   IPC_STRUCT_TRAITS_MEMBER(line_number)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(tracked_objects::BirthOnThreadSnapshot)
   IPC_STRUCT_TRAITS_MEMBER(location)
@@ skipping 37 matching lines @@
 IPC_MESSAGE_CONTROL0(ChildProcessMsg_Shutdown)
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
 // Tell the child process to begin or end IPC message logging.
 IPC_MESSAGE_CONTROL1(ChildProcessMsg_SetIPCLoggingEnabled,
                      bool /* on or off */)
 #endif
 
 // Tell the child process to enable or disable the profiler status.
 IPC_MESSAGE_CONTROL1(ChildProcessMsg_SetProfilerStatus,
-                     tracked_objects::ThreadData::Status /* profiler status */)
+                     tracked_objects::ThreadData::ThreadStatus
+                     /* profiler status */)
 
 // Send to all the child processes to send back profiler data (ThreadData in
 // tracked_objects).
 IPC_MESSAGE_CONTROL2(ChildProcessMsg_GetChildProfilerData,
                      int /* sequence_number */,
                      int /* current_profiling_phase */)
 
 // Send to all the child processes to mark the current profiling phase as
 // finished and start a new phase.
 IPC_MESSAGE_CONTROL1(ChildProcessMsg_ProfilingPhaseCompleted,
@@ skipping 103 matching lines @@
 IPC_SYNC_MESSAGE_CONTROL2_1(
     ChildProcessHostMsg_SyncAllocateLockedDiscardableSharedMemory,
     uint32_t /* size */,
     content::DiscardableSharedMemoryId,
     base::SharedMemoryHandle)
 
 // Informs the browser that the child deleted a block of discardable shared
 // memory.
 IPC_MESSAGE_CONTROL1(ChildProcessHostMsg_DeletedDiscardableSharedMemory,
                      content::DiscardableSharedMemoryId)