Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc |
=================================================================== |
--- gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc (revision 49195) |
+++ gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc (working copy) |
@@ -2,18 +2,18 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "app/gfx/gl/gl_mock.h" |
#include "gpu/command_buffer/service/gles2_cmd_decoder.h" |
#include "gpu/command_buffer/common/gles2_cmd_format.h" |
#include "gpu/command_buffer/common/gles2_cmd_utils.h" |
#include "gpu/command_buffer/common/id_allocator.h" |
-#include "gpu/command_buffer/service/gl_mock.h" |
#include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" |
#include "gpu/command_buffer/service/cmd_buffer_engine.h" |
#include "gpu/command_buffer/service/context_group.h" |
#include "gpu/command_buffer/service/program_manager.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-using ::gles2::MockGLInterface; |
+using ::gfx::MockGLInterface; |
using ::testing::_; |
using ::testing::DoAll; |
using ::testing::InSequence; |
@@ -1466,6 +1466,8 @@ |
31, 34, 39, 37, 32, 37, 32, 31, 34, 39, 37, 32, 37, 32, 34, |
}; |
+ context_->SetSize(gfx::Size(INT_MAX, INT_MAX)); |
+ |
ReadPixelsEmulator emu( |
kWidth, kHeight, kBytesPerPixel, kSrcPixels, kPackAlignment); |
typedef ReadPixels::Result Result; |