Index: content/browser/compositor/offscreen_browser_compositor_output_surface.h |
diff --git a/content/browser/compositor/offscreen_browser_compositor_output_surface.h b/content/browser/compositor/offscreen_browser_compositor_output_surface.h |
index abbb20c065d5e53d5172d0c731a3a325f2ce58ca..3af0c85659a7ef468cc5cb9788f6bffe01323b07 100644 |
--- a/content/browser/compositor/offscreen_browser_compositor_output_surface.h |
+++ b/content/browser/compositor/offscreen_browser_compositor_output_surface.h |
@@ -7,9 +7,10 @@ |
#include <stdint.h> |
+#include <memory> |
+ |
#include "base/cancelable_callback.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "build/build_config.h" |
#include "content/browser/compositor/browser_compositor_output_surface.h" |
@@ -29,7 +30,7 @@ class OffscreenBrowserCompositorOutputSurface |
const scoped_refptr<ContextProviderCommandBuffer>& context, |
const scoped_refptr<ContextProviderCommandBuffer>& worker_context, |
const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, |
- scoped_ptr<BrowserCompositorOverlayCandidateValidator> |
+ std::unique_ptr<BrowserCompositorOverlayCandidateValidator> |
overlay_candidate_validator); |
~OffscreenBrowserCompositorOutputSurface() override; |
@@ -55,7 +56,7 @@ class OffscreenBrowserCompositorOutputSurface |
uint32_t fbo_; |
bool is_backbuffer_discarded_; |
- scoped_ptr<ReflectorTexture> reflector_texture_; |
+ std::unique_ptr<ReflectorTexture> reflector_texture_; |
base::WeakPtrFactory<OffscreenBrowserCompositorOutputSurface> |
weak_ptr_factory_; |