Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder_unittest_1.cc

Issue 1302233003: Replace gmock's deprecated SetArgumentPointee with SetArgPointee. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 2017 Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "gpu/command_buffer/common/gles2_cmd_format.h" 8 #include "gpu/command_buffer/common/gles2_cmd_format.h"
9 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 9 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
10 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h" 10 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h"
11 #include "gpu/command_buffer/service/cmd_buffer_engine.h" 11 #include "gpu/command_buffer/service/cmd_buffer_engine.h"
12 #include "gpu/command_buffer/service/context_group.h" 12 #include "gpu/command_buffer/service/context_group.h"
13 #include "gpu/command_buffer/service/program_manager.h" 13 #include "gpu/command_buffer/service/program_manager.h"
14 #include "gpu/command_buffer/service/test_helper.h" 14 #include "gpu/command_buffer/service/test_helper.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 #include "ui/gl/gl_mock.h" 16 #include "ui/gl/gl_mock.h"
17 17
18 using ::gl::MockGLInterface; 18 using ::gl::MockGLInterface;
19 using ::testing::_; 19 using ::testing::_;
20 using ::testing::DoAll; 20 using ::testing::DoAll;
21 using ::testing::InSequence; 21 using ::testing::InSequence;
22 using ::testing::MatcherCast; 22 using ::testing::MatcherCast;
23 using ::testing::Pointee; 23 using ::testing::Pointee;
24 using ::testing::Return; 24 using ::testing::Return;
25 using ::testing::SetArrayArgument; 25 using ::testing::SetArrayArgument;
26 using ::testing::SetArgumentPointee; 26 using ::testing::SetArgPointee;
27 using ::testing::StrEq; 27 using ::testing::StrEq;
28 28
29 namespace gpu { 29 namespace gpu {
30 namespace gles2 { 30 namespace gles2 {
31 31
32 class GLES2DecoderTest1 : public GLES2DecoderTestBase { 32 class GLES2DecoderTest1 : public GLES2DecoderTestBase {
33 public: 33 public:
34 GLES2DecoderTest1() { } 34 GLES2DecoderTest1() { }
35 }; 35 };
36 36
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 .Times(1) 201 .Times(1)
202 .RetiresOnSaturation(); 202 .RetiresOnSaturation();
203 } 203 }
204 } 204 }
205 205
206 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h" 206 #include "gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h"
207 207
208 } // namespace gles2 208 } // namespace gles2
209 } // namespace gpu 209 } // namespace gpu
210 210
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/feature_info_unittest.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_1_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698