Fix gpu_video_decode_accelerator include order by renaming enum with X11 name collision

content/child/child_thread_impl.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.
 
 #ifndef CONTENT_CHILD_CHILD_THREAD_IMPL_H_
 #define CONTENT_CHILD_CHILD_THREAD_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 207 matching lines @@
   };
 
   void Init(const Options& options);
 
   // We create the channel first without connecting it so we can add filters
   // prior to any messages being received, then connect it afterwards.
   void ConnectChannel(bool use_mojo_channel, const std::string& ipc_token);
 
   // IPC message handlers.
   void OnShutdown();
-  void OnSetProfilerStatus(tracked_objects::ThreadData::Status status);
+  void OnSetProfilerStatus(tracked_objects::ThreadData::ThreadStatus status);
   void OnGetChildProfilerData(int sequence_number, int current_profiling_phase);
   void OnProfilingPhaseCompleted(int profiling_phase);
 #ifdef IPC_MESSAGE_LOG_ENABLED
   void OnSetIPCLoggingEnabled(bool enable);
 #endif
 
   void EnsureConnected();
 
   std::unique_ptr<IPC::ScopedIPCSupport> mojo_ipc_support_;
   std::unique_ptr<MojoApplication> mojo_application_;
@@ skipping 85 matching lines @@
 
  private:
   struct Options options_;
 
   DISALLOW_COPY_AND_ASSIGN(Builder);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_CHILD_THREAD_IMPL_H_