| Index: content/test/test_render_view_host.cc
|
| diff --git a/content/test/test_render_view_host.cc b/content/test/test_render_view_host.cc
|
| index cce3414cb2f6fdc9bf8a03806718bdbbd8dff291..f459aa3b682a11b5d3b9b4d471b405b8f8c3bc19 100644
|
| --- a/content/test/test_render_view_host.cc
|
| +++ b/content/test/test_render_view_host.cc
|
| @@ -4,7 +4,8 @@
|
|
|
| #include "content/test/test_render_view_host.h"
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "build/build_config.h"
|
| #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
|
| @@ -188,7 +189,7 @@ gfx::Rect TestRenderWidgetHostView::GetBoundsInRootWindow() {
|
|
|
| void TestRenderWidgetHostView::OnSwapCompositorFrame(
|
| uint32_t output_surface_id,
|
| - scoped_ptr<cc::CompositorFrame> frame) {
|
| + std::unique_ptr<cc::CompositorFrame> frame) {
|
| did_swap_compositor_frame_ = true;
|
| }
|
|
|
| @@ -199,11 +200,12 @@ bool TestRenderWidgetHostView::LockMouse() {
|
| void TestRenderWidgetHostView::UnlockMouse() {
|
| }
|
|
|
| -TestRenderViewHost::TestRenderViewHost(SiteInstance* instance,
|
| - scoped_ptr<RenderWidgetHostImpl> widget,
|
| - RenderViewHostDelegate* delegate,
|
| - int32_t main_frame_routing_id,
|
| - bool swapped_out)
|
| +TestRenderViewHost::TestRenderViewHost(
|
| + SiteInstance* instance,
|
| + std::unique_ptr<RenderWidgetHostImpl> widget,
|
| + RenderViewHostDelegate* delegate,
|
| + int32_t main_frame_routing_id,
|
| + bool swapped_out)
|
| : RenderViewHostImpl(instance,
|
| std::move(widget),
|
| delegate,
|
|
|