Convert //content/browser from scoped_ptr to std::unique_ptr

content/browser/compositor/buffer_queue_unittest.cc

Index: content/browser/compositor/buffer_queue_unittest.cc
diff --git a/content/browser/compositor/buffer_queue_unittest.cc b/content/browser/compositor/buffer_queue_unittest.cc
index 6e1dc9f05aff2cfd59761c787dd3063f9d80b87e..96dec641f9e337ac4682bfa02905275592a90fb5 100644
--- a/content/browser/compositor/buffer_queue_unittest.cc
+++ b/content/browser/compositor/buffer_queue_unittest.cc
@@ -6,9 +6,11 @@
 
 #include <stddef.h>
 #include <stdint.h>
+
 #include <set>
 #include <utility>
 
+#include "base/memory/ptr_util.h"
 #include "cc/test/test_context_provider.h"
 #include "cc/test/test_web_graphics_context_3d.h"
 #include "content/browser/compositor/gl_helper.h"
@@ -57,7 +59,7 @@ class StubBrowserGpuMemoryBufferManager : public BrowserGpuMemoryBufferManager {
 
   void set_allocate_succeeds(bool value) { allocate_succeeds_ = value; }
 
-  scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
+  std::unique_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
       const gfx::Size& size,
       gfx::BufferFormat format,
       gfx::BufferUsage usage,
@@ -67,7 +69,8 @@ class StubBrowserGpuMemoryBufferManager : public BrowserGpuMemoryBufferManager {
           size, format, usage, surface_id);
     }
     if (allocate_succeeds_)
-      return make_scoped_ptr<gfx::GpuMemoryBuffer>(new StubGpuMemoryBufferImpl);
+      return base::WrapUnique<gfx::GpuMemoryBuffer>(
+          new StubGpuMemoryBufferImpl);
     return nullptr;
   }
 
@@ -99,7 +102,7 @@ class BufferQueueTest : public ::testing::Test {
     InitWithContext(cc::TestWebGraphicsContext3D::Create());
   }
 
-  void InitWithContext(scoped_ptr<cc::TestWebGraphicsContext3D> context) {
+  void InitWithContext(std::unique_ptr<cc::TestWebGraphicsContext3D> context) {
     scoped_refptr<cc::TestContextProvider> context_provider =
         cc::TestContextProvider::Create(std::move(context));
     context_provider->BindToCurrentThread();
@@ -116,11 +119,12 @@ class BufferQueueTest : public ::testing::Test {
                ? output_surface_->current_surface_->image
                : 0;
   }
-  const std::vector<scoped_ptr<BufferQueue::AllocatedSurface>>&
+  const std::vector<std::unique_ptr<BufferQueue::AllocatedSurface>>&
   available_surfaces() {
     return output_surface_->available_surfaces_;
   }
-  std::deque<scoped_ptr<BufferQueue::AllocatedSurface>>& in_flight_surfaces() {
+  std::deque<std::unique_ptr<BufferQueue::AllocatedSurface>>&
+  in_flight_surfaces() {
     return output_surface_->in_flight_surfaces_;
   }
 
@@ -183,8 +187,8 @@ class BufferQueueTest : public ::testing::Test {
     return true;
   }
 
-  scoped_ptr<StubBrowserGpuMemoryBufferManager> gpu_memory_buffer_manager_;
-  scoped_ptr<BufferQueue> output_surface_;
+  std::unique_ptr<StubBrowserGpuMemoryBufferManager> gpu_memory_buffer_manager_;
+  std::unique_ptr<BufferQueue> output_surface_;
   MockBufferQueue* mock_output_surface_;
   bool doublebuffering_;
   bool first_frame_;
@@ -222,23 +226,23 @@ class BufferQueueMockedContextTest : public BufferQueueTest {
  public:
   void SetUp() override {
     context_ = new MockedContext();
-    InitWithContext(scoped_ptr<cc::TestWebGraphicsContext3D>(context_));
+    InitWithContext(std::unique_ptr<cc::TestWebGraphicsContext3D>(context_));
   }
 
  protected:
   MockedContext* context_;
 };
 
-scoped_ptr<BufferQueue> CreateOutputSurfaceWithMock(
+std::unique_ptr<BufferQueue> CreateOutputSurfaceWithMock(
     unsigned int target,
     MockedContext** context,
     BrowserGpuMemoryBufferManager* gpu_memory_buffer_manager) {
   *context = new MockedContext();
   scoped_refptr<cc::TestContextProvider> context_provider =
       cc::TestContextProvider::Create(
-          scoped_ptr<cc::TestWebGraphicsContext3D>(*context));
+          std::unique_ptr<cc::TestWebGraphicsContext3D>(*context));
   context_provider->BindToCurrentThread();
-  scoped_ptr<BufferQueue> buffer_queue(
+  std::unique_ptr<BufferQueue> buffer_queue(
       new BufferQueue(context_provider, target, GL_RGBA, nullptr,
                       gpu_memory_buffer_manager, 1));
   buffer_queue->Initialize();
@@ -247,9 +251,9 @@ scoped_ptr<BufferQueue> CreateOutputSurfaceWithMock(
 
 TEST(BufferQueueStandaloneTest, FboInitialization) {
   MockedContext* context;
-  scoped_ptr<BrowserGpuMemoryBufferManager> gpu_memory_buffer_manager(
+  std::unique_ptr<BrowserGpuMemoryBufferManager> gpu_memory_buffer_manager(
       new StubBrowserGpuMemoryBufferManager);
-  scoped_ptr<BufferQueue> output_surface = CreateOutputSurfaceWithMock(
+  std::unique_ptr<BufferQueue> output_surface = CreateOutputSurfaceWithMock(
       GL_TEXTURE_2D, &context, gpu_memory_buffer_manager.get());
 
   EXPECT_CALL(*context, bindFramebuffer(GL_FRAMEBUFFER, Ne(0U)));
@@ -264,9 +268,9 @@ TEST(BufferQueueStandaloneTest, FboBinding) {
   for (size_t i = 0; i < 2; ++i) {
     GLenum target = targets[i];
     MockedContext* context;
-    scoped_ptr<BrowserGpuMemoryBufferManager> gpu_memory_buffer_manager(
+    std::unique_ptr<BrowserGpuMemoryBufferManager> gpu_memory_buffer_manager(
         new StubBrowserGpuMemoryBufferManager);
-    scoped_ptr<BufferQueue> output_surface = CreateOutputSurfaceWithMock(
+    std::unique_ptr<BufferQueue> output_surface = CreateOutputSurfaceWithMock(
         target, &context, gpu_memory_buffer_manager.get());
     EXPECT_CALL(*context, bindTexture(target, Ne(0U)));
     EXPECT_CALL(*context, destroyImageCHROMIUM(1));
@@ -290,14 +294,14 @@ TEST(BufferQueueStandaloneTest, FboBinding) {
 }
 
 TEST(BufferQueueStandaloneTest, CheckBoundFramebuffer) {
-  scoped_ptr<BrowserGpuMemoryBufferManager> gpu_memory_buffer_manager;
-  scoped_ptr<BufferQueue> output_surface;
+  std::unique_ptr<BrowserGpuMemoryBufferManager> gpu_memory_buffer_manager;
+  std::unique_ptr<BufferQueue> output_surface;
   scoped_refptr<cc::TestContextProvider> context_provider =
       cc::TestContextProvider::Create(cc::TestWebGraphicsContext3D::Create());
   context_provider->BindToCurrentThread();
   gpu_memory_buffer_manager.reset(new StubBrowserGpuMemoryBufferManager);
 
-  scoped_ptr<GLHelper> gl_helper;
+  std::unique_ptr<GLHelper> gl_helper;
   gl_helper.reset(new GLHelper(context_provider->ContextGL(),
                                context_provider->ContextSupport()));