From 31c31b2bab65f6b0f87ab234aa0f253f9f55f4df Mon Sep 17 00:00:00 2001 From: "dominich@chromium.org" Date: Tue, 27 Sep 2011 18:58:29 +0000 Subject: Revert 102978 - Change X11 error handler override to allow easy X11 error checking. BUG=None TEST=None Review URL: http://codereview.chromium.org/7889040 TBR=dominich@chromium.org Review URL: http://codereview.chromium.org/8052015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102985 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/command_buffer/service/program_manager_unittest.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gpu/command_buffer/service/program_manager_unittest.cc') diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc index b5f7cc3..c58cda1 100644 --- a/gpu/command_buffer/service/program_manager_unittest.cc +++ b/gpu/command_buffer/service/program_manager_unittest.cc @@ -2,11 +2,6 @@ // 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 #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/program_manager.h" #include @@ -905,3 +900,5 @@ TEST_F(ProgramManagerWithShaderTest, ProgramInfoGetProgramInfo) { } // namespace gles2 } // namespace gpu + + -- cgit v1.1