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

Unified Diff: cc/test/test_web_graphics_context_3d_unittest.cc

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/test/test_web_graphics_context_3d.cc ('k') | cc/test/threaded_channel_for_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/test_web_graphics_context_3d_unittest.cc
diff --git a/cc/test/test_web_graphics_context_3d_unittest.cc b/cc/test/test_web_graphics_context_3d_unittest.cc
index 45766ad174cb4abbac2f43f5c733e91c5eb10aef..cc2a8ed16d1e065abac0aab8b8a612237d1499b2 100644
--- a/cc/test/test_web_graphics_context_3d_unittest.cc
+++ b/cc/test/test_web_graphics_context_3d_unittest.cc
@@ -2,8 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/memory/scoped_ptr.h"
#include "cc/test/test_web_graphics_context_3d.h"
+
+#include <memory>
+
#include "gpu/GLES2/gl2extchromium.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -32,7 +34,7 @@ static void expect_default_parameter_values(TestWebGraphicsContext3D* context) {
}
TEST(TestWebGraphicsContext3DTest, GetDefaultTextureParameterValues) {
- scoped_ptr<TestWebGraphicsContext3D> context(
+ std::unique_ptr<TestWebGraphicsContext3D> context(
TestWebGraphicsContext3D::Create());
GLuint texture = context->createTexture();
@@ -42,7 +44,7 @@ TEST(TestWebGraphicsContext3DTest, GetDefaultTextureParameterValues) {
}
TEST(TestWebGraphicsContext3DTest, SetAndGetTextureParameter) {
- scoped_ptr<TestWebGraphicsContext3D> context(
+ std::unique_ptr<TestWebGraphicsContext3D> context(
TestWebGraphicsContext3D::Create());
GLuint texture = context->createTexture();
@@ -55,7 +57,7 @@ TEST(TestWebGraphicsContext3DTest, SetAndGetTextureParameter) {
TEST(TestWebGraphicsContext3DTest,
SetAndGetMultipleTextureParametersOnMultipleTextures) {
- scoped_ptr<TestWebGraphicsContext3D> context(
+ std::unique_ptr<TestWebGraphicsContext3D> context(
TestWebGraphicsContext3D::Create());
// Set and get non-default texture parameters on the first texture.
@@ -94,7 +96,7 @@ TEST(TestWebGraphicsContext3DTest,
}
TEST(TestWebGraphicsContext3DTest, UseMultipleRenderAndFramebuffers) {
- scoped_ptr<TestWebGraphicsContext3D> context(
+ std::unique_ptr<TestWebGraphicsContext3D> context(
TestWebGraphicsContext3D::Create());
GLuint ids[2];
« no previous file with comments | « cc/test/test_web_graphics_context_3d.cc ('k') | cc/test/threaded_channel_for_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698