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

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

Issue 1859703002: convert //gpu to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo part of clang-format Created 4 years, 8 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/shader_manager.h" 5 #include "gpu/command_buffer/service/shader_manager.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include <memory>
no sievers 2016/04/05 19:02:41 unused
Mostyn Bramley-Moore 2016/04/05 21:35:31 Removed.
8
8 #include "gpu/command_buffer/service/gpu_service_test.h" 9 #include "gpu/command_buffer/service/gpu_service_test.h"
9 #include "gpu/command_buffer/service/mocks.h" 10 #include "gpu/command_buffer/service/mocks.h"
10 #include "gpu/command_buffer/service/test_helper.h" 11 #include "gpu/command_buffer/service/test_helper.h"
11 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
12 #include "ui/gl/gl_mock.h" 13 #include "ui/gl/gl_mock.h"
13 14
14 using ::testing::Return; 15 using ::testing::Return;
15 using ::testing::ReturnRef; 16 using ::testing::ReturnRef;
16 17
17 namespace gpu { 18 namespace gpu {
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 EXPECT_CALL(*gl_, DeleteShader(kService1Id)) 315 EXPECT_CALL(*gl_, DeleteShader(kService1Id))
315 .Times(1) 316 .Times(1)
316 .RetiresOnSaturation(); 317 .RetiresOnSaturation();
317 manager_.Delete(shader1); // this should delete the shader. 318 manager_.Delete(shader1); // this should delete the shader.
318 shader2 = manager_.GetShader(kClient1Id); 319 shader2 = manager_.GetShader(kClient1Id);
319 EXPECT_TRUE(shader2 == NULL); 320 EXPECT_TRUE(shader2 == NULL);
320 } 321 }
321 322
322 } // namespace gles2 323 } // namespace gles2
323 } // namespace gpu 324 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698