Index: gpu/command_buffer/service/texture_manager_unittest.cc |
diff --git a/gpu/command_buffer/service/texture_manager_unittest.cc b/gpu/command_buffer/service/texture_manager_unittest.cc |
index 680048124b6773c471ace555060b19a41939b122..352d893038b8049d4d250f46ebf524f418db31d2 100644 |
--- a/gpu/command_buffer/service/texture_manager_unittest.cc |
+++ b/gpu/command_buffer/service/texture_manager_unittest.cc |
@@ -2,13 +2,17 @@ |
// 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/texture_manager.h" |
#include "base/memory/scoped_ptr.h" |
#include "gpu/command_buffer/common/gl_mock.h" |
#include "gpu/command_buffer/service/feature_info.h" |
#include "gpu/command_buffer/service/test_helper.h" |
-#include "testing/gtest/include/gtest/gtest.h" |
using ::testing::Pointee; |
using ::testing::_; |
@@ -699,5 +703,3 @@ TEST_F(TextureInfoTest, EGLImageExternal) { |
} // namespace gles2 |
} // namespace gpu |
- |
- |