Fix gpu_video_decode_accelerator include order by renaming enum with X11 name collision

base/tracked_objects.h

Index: base/tracked_objects.h
diff --git a/base/tracked_objects.h b/base/tracked_objects.h
index 168b17db045a429234c3ae403622a9217adf3ad8..7bccd37c2fa4be1485db477fedb2a0738ca08585 100644
--- a/base/tracked_objects.h
+++ b/base/tracked_objects.h
@@ -433,6 +433,10 @@ class BASE_EXPORT TaskStopwatch;
 // 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