Index: android_webview/browser/browser_view_renderer.h |
diff --git a/android_webview/browser/browser_view_renderer.h b/android_webview/browser/browser_view_renderer.h |
index c3c530f4307222721031c165bd1a22ad59f2bc31..60fc097d4b0098b637ba9968a5cf4165d33679a3 100644 |
--- a/android_webview/browser/browser_view_renderer.h |
+++ b/android_webview/browser/browser_view_renderer.h |
@@ -128,11 +128,11 @@ class BrowserViewRenderer : public content::SynchronousCompositorClient { |
bool CanOnDraw(); |
void UpdateCompositorIsActive(); |
bool CompositeSW(SkCanvas* canvas); |
- scoped_ptr<base::trace_event::ConvertableToTraceFormat> RootLayerStateAsValue( |
- const gfx::Vector2dF& total_scroll_offset_dip, |
- const gfx::SizeF& scrollable_size_dip); |
+ std::unique_ptr<base::trace_event::ConvertableToTraceFormat> |
+ RootLayerStateAsValue(const gfx::Vector2dF& total_scroll_offset_dip, |
+ const gfx::SizeF& scrollable_size_dip); |
- void ReturnUnusedResource(scoped_ptr<ChildFrame> frame); |
+ void ReturnUnusedResource(std::unique_ptr<ChildFrame> frame); |
void ReturnResourceFromParent(); |
gfx::Vector2d max_scroll_offset() const; |