Index: content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc |
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc |
index c395fa5377fa691423b8e1398f02075f99aebf75..ca5d43677e80b3340f98a5eb5fc55432093e6c61 100644 |
--- a/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc |
+++ b/content/browser/frame_host/render_widget_host_view_child_frame_unittest.cc |
@@ -123,18 +123,17 @@ class RenderWidgetHostViewChildFrameTest : public testing::Test { |
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewChildFrameTest); |
}; |
-std::unique_ptr<cc::CompositorFrame> CreateDelegatedFrame( |
- float scale_factor, |
- gfx::Size size, |
- const gfx::Rect& damage) { |
- std::unique_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame); |
- frame->metadata.device_scale_factor = scale_factor; |
- frame->delegated_frame_data.reset(new cc::DelegatedFrameData); |
+cc::CompositorFrame CreateDelegatedFrame(float scale_factor, |
+ gfx::Size size, |
+ const gfx::Rect& damage) { |
+ cc::CompositorFrame frame; |
+ frame.metadata.device_scale_factor = scale_factor; |
+ frame.delegated_frame_data.reset(new cc::DelegatedFrameData); |
std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create(); |
pass->SetNew(cc::RenderPassId(1, 1), gfx::Rect(size), damage, |
gfx::Transform()); |
- frame->delegated_frame_data->render_pass_list.push_back(std::move(pass)); |
+ frame.delegated_frame_data->render_pass_list.push_back(std::move(pass)); |
return frame; |
} |