Fix gpu_video_decode_accelerator include order by renaming enum with X11 name collision

base/tracked_objects.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 BASE_TRACKED_OBJECTS_H_
 #define BASE_TRACKED_OBJECTS_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 419 matching lines @@
 
 // Map from profiling phase number to the process-wide snapshotted
 // representation of the list of ThreadData objects that died during the given
 // phase.
 typedef std::map<int, ProcessDataPhaseSnapshot> PhasedProcessDataSnapshotMap;
 
 class BASE_EXPORT ThreadData {
  public:
   // Current allowable states of the tracking system.  The states can vary
   // between ACTIVE and DEACTIVATED, but can never go back to UNINITIALIZED.
-  enum Status {
+  enum ThreadStatus {
     UNINITIALIZED,         // Pristine, link-time state before running.
     DORMANT_DURING_TESTS,  // Only used during testing.
     DEACTIVATED,           // No longer recording profiling.
     PROFILING_ACTIVE,      // Recording profiles.
     STATUS_LAST = PROFILING_ACTIVE
   };
 
   typedef base::hash_map<Location, Births*, Location::Hash> BirthMap;
   typedef std::map<const Births*, DeathData> DeathMap;
 
@@ skipping 61 matching lines @@
 
   const std::string& thread_name() const { return thread_name_; }
 
   // Initializes all statics if needed (this initialization call should be made
   // while we are single threaded).
   static void Initialize();
 
   // Sets internal status_.
   // If |status| is false, then status_ is set to DEACTIVATED.
   // If |status| is true, then status_ is set to PROFILING_ACTIVE.
-  static void InitializeAndSetTrackingStatus(Status status);
+  static void InitializeAndSetTrackingStatus(ThreadStatus status);
 
-  static Status status();
+  static ThreadStatus status();
 
   // Indicate if any sort of profiling is being done (i.e., we are more than
   // DEACTIVATED).
   static bool TrackingStatus();
 
   // Enables profiler timing.
   static void EnableProfilerTiming();
 
   // Provide a time function that does nothing (runs fast) when we don't have
   // the profiler enabled.  It will generally be optimized away when it is
@@ skipping 276 matching lines @@
   ProcessDataSnapshot(const ProcessDataSnapshot& other);
   ~ProcessDataSnapshot();
 
   PhasedProcessDataSnapshotMap phased_snapshots;
   base::ProcessId process_id;
 };
 
 }  // namespace tracked_objects
 
 #endif  // BASE_TRACKED_OBJECTS_H_