Fix gpu_video_decode_accelerator include order by renaming enum with X11 name collision

content/child/child_thread_impl.cc

 // 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.
 
 #include "content/child/child_thread_impl.h"
 
 #include <signal.h>
 #include <string>
 #include <utility>
 
@@ skipping 656 matching lines @@
 
 #if defined(IPC_MESSAGE_LOG_ENABLED)
 void ChildThreadImpl::OnSetIPCLoggingEnabled(bool enable) {
   if (enable)
     IPC::Logging::GetInstance()->Enable();
   else
     IPC::Logging::GetInstance()->Disable();
 }
 #endif  //  IPC_MESSAGE_LOG_ENABLED
 
-void ChildThreadImpl::OnSetProfilerStatus(ThreadData::Status status) {
+void ChildThreadImpl::OnSetProfilerStatus(ThreadData::ThreadStatus status) {
   ThreadData::InitializeAndSetTrackingStatus(status);
 }
 
 void ChildThreadImpl::OnGetChildProfilerData(int sequence_number,
                                              int current_profiling_phase) {
   tracked_objects::ProcessDataSnapshot process_data;
   ThreadData::Snapshot(current_profiling_phase, &process_data);
 
   Send(
       new ChildProcessHostMsg_ChildProfilerData(sequence_number, process_data));
@@ skipping 33 matching lines @@
 void ChildThreadImpl::EnsureConnected() {
   VLOG(0) << "ChildThreadImpl::EnsureConnected()";
   base::Process::Current().Terminate(0, false);
 }
 
 bool ChildThreadImpl::IsInBrowserProcess() const {
   return browser_process_io_runner_;
 }
 
 }  // namespace content