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

content/browser/compositor/buffer_queue.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_COMPOSITOR_BUFFER_QUEUE_H_
 #define CONTENT_BROWSER_COMPOSITOR_BUFFER_QUEUE_H_
 
 #include <stddef.h>
 
 #include <deque>
+#include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace cc {
 class ContextProvider;
 }
 
 namespace gfx {
 class GpuMemoryBuffer;
@@ skipping 34 matching lines @@
     return current_surface_ ? current_surface_->texture : 0;
   }
   unsigned int fbo() const { return fbo_; }
 
  private:
   friend class BufferQueueTest;
   friend class AllocatedSurface;
 
   struct CONTENT_EXPORT AllocatedSurface {
     AllocatedSurface(BufferQueue* buffer_queue,
-                     scoped_ptr<gfx::GpuMemoryBuffer> buffer,
+                     std::unique_ptr<gfx::GpuMemoryBuffer> buffer,
                      unsigned int texture,
                      unsigned int image,
                      const gfx::Rect& rect);
     ~AllocatedSurface();
     BufferQueue* const buffer_queue;
-    scoped_ptr<gfx::GpuMemoryBuffer> buffer;
+    std::unique_ptr<gfx::GpuMemoryBuffer> buffer;
     const unsigned int texture;
     const unsigned int image;
     gfx::Rect damage;  // This is the damage for this frame from the previous.
   };
 
   void FreeAllSurfaces();
 
   void FreeSurfaceResources(AllocatedSurface* surface);
 
   // Copy everything that is in |copy_rect|, except for what is in
   // |exclude_rect| from |source_texture| to |texture|.
   virtual void CopyBufferDamage(int texture,
                                 int source_texture,
                                 const gfx::Rect& new_damage,
                                 const gfx::Rect& old_damage);
 
   void UpdateBufferDamage(const gfx::Rect& damage);
 
   // Return a surface, available to be drawn into.
-  scoped_ptr<AllocatedSurface> GetNextSurface();
+  std::unique_ptr<AllocatedSurface> GetNextSurface();
 
-  scoped_ptr<AllocatedSurface> RecreateBuffer(
-      scoped_ptr<AllocatedSurface> surface);
+  std::unique_ptr<AllocatedSurface> RecreateBuffer(
+      std::unique_ptr<AllocatedSurface> surface);
 
   gfx::Size size_;
   scoped_refptr<cc::ContextProvider> context_provider_;
   unsigned int fbo_;
   size_t allocated_count_;
   unsigned int texture_target_;
   unsigned int internal_format_;
   // This surface is currently bound. This may be nullptr if no surface has
   // been bound, or if allocation failed at bind.
-  scoped_ptr<AllocatedSurface> current_surface_;
+  std::unique_ptr<AllocatedSurface> current_surface_;
   // The surface currently on the screen, if any.
-  scoped_ptr<AllocatedSurface> displayed_surface_;
+  std::unique_ptr<AllocatedSurface> displayed_surface_;
   // These are free for use, and are not nullptr.
-  std::vector<scoped_ptr<AllocatedSurface>> available_surfaces_;
+  std::vector<std::unique_ptr<AllocatedSurface>> available_surfaces_;
   // These have been swapped but are not displayed yet. Entries of this deque
   // may be nullptr, if they represent frames that have been destroyed.
-  std::deque<scoped_ptr<AllocatedSurface>> in_flight_surfaces_;
+  std::deque<std::unique_ptr<AllocatedSurface>> in_flight_surfaces_;
   GLHelper* gl_helper_;
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager_;
   int surface_id_;
 
   DISALLOW_COPY_AND_ASSIGN(BufferQueue);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_COMPOSITOR_BUFFER_QUEUE_H_