Index: gpu/command_buffer/service/id_manager_unittest.cc |
diff --git a/gpu/command_buffer/service/id_manager_unittest.cc b/gpu/command_buffer/service/id_manager_unittest.cc |
index 015a44252eebd8f87a01f2d5aabe40d7b70057ff..122c064c1e5ae8194c8d39ae674eed6a63a78c56 100644 |
--- a/gpu/command_buffer/service/id_manager_unittest.cc |
+++ b/gpu/command_buffer/service/id_manager_unittest.cc |
@@ -2,8 +2,12 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "gpu/command_buffer/service/id_manager.h" |
+// Include gtest.h out of order because <X11/X.h> #define's Bool & None, which |
+// gtest uses as struct names (inside a namespace). This means that |
+// #include'ing gtest after anything that pulls in X.h fails to compile. |
+// This is http://code.google.com/p/googletest/issues/detail?id=371 |
#include "testing/gtest/include/gtest/gtest.h" |
+#include "gpu/command_buffer/service/id_manager.h" |
namespace gpu { |
namespace gles2 { |
@@ -72,5 +76,3 @@ TEST_F(IdManagerTest, Basic) { |
} // namespace gles2 |
} // namespace gpu |
- |
- |