Index: gpu/command_buffer/service/renderbuffer_manager_unittest.cc |
diff --git a/gpu/command_buffer/service/renderbuffer_manager_unittest.cc b/gpu/command_buffer/service/renderbuffer_manager_unittest.cc |
index c68b59900423d1177361335e3cb80d2d8fa0229f..0108afdf22aacfa11ec4183916478bde9032884f 100644 |
--- a/gpu/command_buffer/service/renderbuffer_manager_unittest.cc |
+++ b/gpu/command_buffer/service/renderbuffer_manager_unittest.cc |
@@ -2,6 +2,11 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+// 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/renderbuffer_manager.h" |
#include "gpu/command_buffer/common/gl_mock.h" |
@@ -117,5 +122,3 @@ TEST_F(RenderbufferManagerTest, RenderbufferInfo) { |
} // namespace gles2 |
} // namespace gpu |
- |
- |