commit c9faddb4a9c94f7ec477fea7f32ce9c4fa34c8d0
author Ben Chan <benchan@chromium.org> Thu Dec 08 21:21:16 2016 -0800
committer chrome-bot <chrome-bot@chromium.org> Fri Dec 09 18:25:15 2016 -0800
tree 228cce227022d52d7eb95d27ce349c4e84188761
parent bb4ef4d1e84c7a3eb3a197e2aafa08eab43210c1

glbench: replace scoped_ptr with std::unique_ptr

scoped_ptr from libchrome has been deprecated in favor of C++11
std::unique_ptr.

BUG=chromium:672314
TEST=Run unit tests.

Change-Id: I0f71641e2be379c2a0efe80e1b4e7b303610bf20
Reviewed-on: https://chromium-review.googlesource.com/418397
Commit-Ready: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>

client/deps/glbench/src/yuvtest.cc

diff --git a/client/deps/glbench/src/yuvtest.cc b/client/deps/glbench/src/yuvtest.cc
index 2fcab13..c372712 100644
--- a/client/deps/glbench/src/yuvtest.cc
+++ b/client/deps/glbench/src/yuvtest.cc
@@ -5,8 +5,9 @@
 #include <stdio.h>
 #include <sys/mman.h>
 
+#include <memory>
+
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 
 #include "main.h"
 #include "testbase.h"
@@ -179,7 +180,7 @@
                0, GL_LUMINANCE, GL_UNSIGNED_BYTE, v_plane);
 
   {
-    scoped_ptr<char[]> buf_uv(new char[chroma_size * 2]);
+    std::unique_ptr<char[]> buf_uv(new char[chroma_size * 2]);
     char* buf_uv_ptr = buf_uv.get();
     for (int i = 0; i < chroma_size; i++) {
         *buf_uv_ptr++ = u_plane[i];