diff options
Diffstat (limited to 'gpu/command_buffer/service')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc | 6 | ||||
| -rw-r--r-- | gpu/command_buffer/service/program_manager_unittest.cc | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc index 51e666e..a157de9 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc @@ -3,10 +3,12 @@ // found in the LICENSE file. #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" + #include <algorithm> #include <string> + #include "app/gfx/gl/gl_mock.h" -#include "base/string_util.h" +#include "base/string_number_conversions.h" #include "gpu/command_buffer/common/gles2_cmd_format.h" #include "gpu/command_buffer/common/gles2_cmd_utils.h" #include "gpu/command_buffer/service/cmd_buffer_engine.h" @@ -531,7 +533,7 @@ void GLES2DecoderTestBase::SetupShader( } for (GLsizei jj = 1; jj < info.size; ++jj) { std::string element_name( - std::string(base_name) + "[" + IntToString(jj) + "]"); + std::string(base_name) + "[" + base::IntToString(jj) + "]"); EXPECT_CALL(*gl_, GetUniformLocation(program_service_id, StrEq(element_name))) .WillOnce(Return(info.location + jj * 2)) diff --git a/gpu/command_buffer/service/program_manager_unittest.cc b/gpu/command_buffer/service/program_manager_unittest.cc index 4acb7b1..a6b5614 100644 --- a/gpu/command_buffer/service/program_manager_unittest.cc +++ b/gpu/command_buffer/service/program_manager_unittest.cc @@ -3,9 +3,12 @@ // found in the LICENSE file. #include "gpu/command_buffer/service/program_manager.h" + #include <algorithm> + #include "app/gfx/gl/gl_mock.h" #include "base/scoped_ptr.h" +#include "base/string_number_conversions.h" #include "base/string_util.h" #include "testing/gtest/include/gtest/gtest.h" @@ -245,7 +248,7 @@ class ProgramManagerWithShaderTest : public testing::Test { } for (GLsizei jj = 1; jj < info.size; ++jj) { std::string element_name( - std::string(base_name) + "[" + IntToString(jj) + "]"); + std::string(base_name) + "[" + base::IntToString(jj) + "]"); EXPECT_CALL(*gl_, GetUniformLocation(service_id, StrEq(element_name))) .WillOnce(Return(info.location + jj * 2)) |