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 415 matching lines @@
 
 struct ProcessDataPhaseSnapshot;
 struct ProcessDataSnapshot;
 class BASE_EXPORT TaskStopwatch;
 
 // 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;
 
+#ifdef Status
+#undef Status  // Xlib.h #defines this, which conflicts with enum Status below.

[danakj, 2016/05/02 20:12:54]

Do this at the places that include Xlib.h

[Mark Dittmer, 2016/05/04 14:00:07]

This seems less useful to me. Here, we are in the context where having #define'd
Status matters, and can explain (in context) why it should be #undef'd. Xlib.h
is included in >200 files and defines >50 unprefixed defines. If we are not
going to wrap it in a header that #undef's all of these, then I think putting
the #undef's in the place they're needed makes more sense than putting htem in
the, potentially unrelated, Chromium header that happens to precipitate the
issue.

Thoughts?

[danakj, 2016/05/04 20:17:57]

Conversely this code has no idea about Xlib.h so putting it in here is strange.

If I was to do this from scratch I'd probably wrap Xlib.h in a header of our own
which undefs things, and ban including Xlib.h directly. Do you have some
pointers to context on why we don't do that?

+#endif
+
 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 {
     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
@@ skipping 365 matching lines @@
   ProcessDataSnapshot(const ProcessDataSnapshot& other);
   ~ProcessDataSnapshot();
 
   PhasedProcessDataSnapshotMap phased_snapshots;
   base::ProcessId process_id;
 };
 
 }  // namespace tracked_objects
 
 #endif  // BASE_TRACKED_OBJECTS_H_