| Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
|
| index 2d37097ed88473d3658bc9468cfbc08b6342906d..df51b995609883ab62b01a554c06cec375c31df8 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_2.cc
|
| @@ -4,11 +4,13 @@
|
|
|
| #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
|
|
|
| +#include <stdint.h>
|
| +
|
| #include "gpu/command_buffer/common/gles2_cmd_format.h"
|
| #include "gpu/command_buffer/common/gles2_cmd_utils.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/gles2_cmd_decoder_unittest_base.h"
|
| #include "gpu/command_buffer/service/program_manager.h"
|
| #include "gpu/command_buffer/service/test_helper.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -38,8 +40,9 @@ class GLES2DecoderTest2 : public GLES2DecoderTestBase {
|
| public:
|
| GLES2DecoderTest2() { }
|
|
|
| - void TestAcceptedUniform(
|
| - GLenum uniform_type, uint32 accepts_apis, bool es3_enabled) {
|
| + void TestAcceptedUniform(GLenum uniform_type,
|
| + uint32_t accepts_apis,
|
| + bool es3_enabled) {
|
| decoder_->set_unsafe_es3_apis_enabled(es3_enabled);
|
|
|
| SetupShaderForUniform(uniform_type);
|
|
|