Fix gpu_video_decode_accelerator include order by renaming enum with X11 name collision

base/tracked_objects.cc

Index: base/tracked_objects.cc
diff --git a/base/tracked_objects.cc b/base/tracked_objects.cc
index d24cedf159241d58a92909650de374f187dd85ae..9f953ca36a545b6b7650c8e2a73a53b21606a9eb 100644
--- a/base/tracked_objects.cc
+++ b/base/tracked_objects.cc
@@ -34,7 +34,8 @@ namespace {
 // Note that the flag may force either state, so this really controls only the
 // period of time up until that flag is parsed.  If there is no flag seen, then
 // this state may prevail for much or all of the process lifetime.
-const ThreadData::Status kInitialStartupState = ThreadData::PROFILING_ACTIVE;
+const ThreadData::ThreadStatus kInitialStartupState =
+    ThreadData::PROFILING_ACTIVE;
 
 // Possible states of the profiler timing enabledness.
 enum {
@@ -705,7 +706,7 @@ void ThreadData::Initialize() {
 }
 
 // static
-void ThreadData::InitializeAndSetTrackingStatus(Status status) {
+void ThreadData::InitializeAndSetTrackingStatus(ThreadStatus status) {
   DCHECK_GE(status, DEACTIVATED);
   DCHECK_LE(status, PROFILING_ACTIVE);
 
@@ -717,8 +718,9 @@ void ThreadData::InitializeAndSetTrackingStatus(Status status) {
 }
 
 // static
-ThreadData::Status ThreadData::status() {
-  return static_cast<ThreadData::Status>(base::subtle::Acquire_Load(&status_));
+ThreadData::ThreadStatus ThreadData::status() {
+  return static_cast<ThreadData::ThreadStatus>(
+      base::subtle::Acquire_Load(&status_));
 }
 
 // static