diff options
| author | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 18:58:29 +0000 |
|---|---|---|
| committer | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 18:58:29 +0000 |
| commit | 31c31b2bab65f6b0f87ab234aa0f253f9f55f4df (patch) | |
| tree | 4019f44e24ebd0e8284a2197f65407a971faf76d /gpu/command_buffer/service/shader_manager_unittest.cc | |
| parent | 785b6e7a46fc2e0ec1f40abd67fc5930c95094ad (diff) | |
| download | chromium_src-31c31b2bab65f6b0f87ab234aa0f253f9f55f4df.zip chromium_src-31c31b2bab65f6b0f87ab234aa0f253f9f55f4df.tar.gz chromium_src-31c31b2bab65f6b0f87ab234aa0f253f9f55f4df.tar.bz2 | |
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
Diffstat (limited to 'gpu/command_buffer/service/shader_manager_unittest.cc')
| -rw-r--r-- | gpu/command_buffer/service/shader_manager_unittest.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gpu/command_buffer/service/shader_manager_unittest.cc b/gpu/command_buffer/service/shader_manager_unittest.cc index 2aed8d9..23590b78 100644 --- a/gpu/command_buffer/service/shader_manager_unittest.cc +++ b/gpu/command_buffer/service/shader_manager_unittest.cc @@ -2,16 +2,12 @@ // 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/shader_manager.h" #include "base/memory/scoped_ptr.h" #include "gpu/command_buffer/common/gl_mock.h" #include "gpu/command_buffer/service/mocks.h" +#include "testing/gtest/include/gtest/gtest.h" using ::testing::Return; using ::testing::ReturnRef; @@ -246,3 +242,5 @@ TEST_F(ShaderManagerTest, ShaderInfoUseCount) { } // namespace gles2 } // namespace gpu + + |