Index: cc/surfaces/surface_factory_unittest.cc |
diff --git a/cc/surfaces/surface_factory_unittest.cc b/cc/surfaces/surface_factory_unittest.cc |
index 5a062c84090fd58bb2f1169fbc9c5ebe652cdf8d..89266404ef1f8668e4cbc9da947c750a55b90a96 100644 |
--- a/cc/surfaces/surface_factory_unittest.cc |
+++ b/cc/surfaces/surface_factory_unittest.cc |
@@ -94,7 +94,7 @@ class SurfaceFactoryTest : public testing::Test, public SurfaceDamageObserver { |
resource.mailbox_holder.sync_token = frame_sync_token_; |
frame_data->resource_list.push_back(resource); |
} |
- std::unique_ptr<CompositorFrame> frame(new CompositorFrame); |
+ std::unique_ptr<CompositorFrame> frame(CompositorFrame::Create()); |
frame->delegated_frame_data = std::move(frame_data); |
factory_->SubmitCompositorFrame(surface_id_, std::move(frame), |
SurfaceFactory::DrawCallback()); |
@@ -424,7 +424,7 @@ TEST_F(SurfaceFactoryTest, BlankNoIndexIncrement) { |
Surface* surface = manager_.GetSurfaceForId(surface_id); |
ASSERT_NE(nullptr, surface); |
EXPECT_EQ(2, surface->frame_index()); |
- std::unique_ptr<CompositorFrame> frame(new CompositorFrame); |
+ std::unique_ptr<CompositorFrame> frame(CompositorFrame::Create()); |
frame->delegated_frame_data.reset(new DelegatedFrameData); |
factory_->SubmitCompositorFrame(surface_id, std::move(frame), |
@@ -447,7 +447,7 @@ void CreateSurfaceDrawCallback(SurfaceFactory* factory, |
TEST_F(SurfaceFactoryTest, AddDuringDestroy) { |
SurfaceId surface_id(0, 6, 0); |
factory_->Create(surface_id); |
- std::unique_ptr<CompositorFrame> frame(new CompositorFrame); |
+ std::unique_ptr<CompositorFrame> frame(CompositorFrame::Create()); |
frame->delegated_frame_data.reset(new DelegatedFrameData); |
uint32_t execute_count = 0; |
@@ -479,7 +479,7 @@ TEST_F(SurfaceFactoryTest, DestroyAll) { |
resource.id = 1; |
resource.mailbox_holder.texture_target = GL_TEXTURE_2D; |
frame_data->resource_list.push_back(resource); |
- std::unique_ptr<CompositorFrame> frame(new CompositorFrame); |
+ std::unique_ptr<CompositorFrame> frame(CompositorFrame::Create()); |
frame->delegated_frame_data = std::move(frame_data); |
uint32_t execute_count = 0; |
SurfaceDrawStatus drawn = SurfaceDrawStatus::DRAW_SKIPPED; |
@@ -505,7 +505,7 @@ TEST_F(SurfaceFactoryTest, DestroySequence) { |
factory_->Destroy(id2); |
std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); |
- std::unique_ptr<CompositorFrame> frame(new CompositorFrame); |
+ std::unique_ptr<CompositorFrame> frame(CompositorFrame::Create()); |
frame->metadata.satisfies_sequences.push_back(6); |
frame->metadata.satisfies_sequences.push_back(4); |
frame->delegated_frame_data = std::move(frame_data); |
@@ -559,7 +559,7 @@ TEST_F(SurfaceFactoryTest, DestroyCycle) { |
std::unique_ptr<RenderPass> render_pass(RenderPass::Create()); |
std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); |
frame_data->render_pass_list.push_back(std::move(render_pass)); |
- std::unique_ptr<CompositorFrame> frame(new CompositorFrame); |
+ std::unique_ptr<CompositorFrame> frame(CompositorFrame::Create()); |
frame->metadata.referenced_surfaces.push_back(surface_id_); |
frame->delegated_frame_data = std::move(frame_data); |
factory_->SubmitCompositorFrame(id2, std::move(frame), |
@@ -572,7 +572,7 @@ TEST_F(SurfaceFactoryTest, DestroyCycle) { |
std::unique_ptr<RenderPass> render_pass(RenderPass::Create()); |
std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); |
frame_data->render_pass_list.push_back(std::move(render_pass)); |
- std::unique_ptr<CompositorFrame> frame(new CompositorFrame); |
+ std::unique_ptr<CompositorFrame> frame(CompositorFrame::Create()); |
frame->metadata.referenced_surfaces.push_back(id2); |
frame->delegated_frame_data = std::move(frame_data); |
factory_->SubmitCompositorFrame(surface_id_, std::move(frame), |
@@ -606,7 +606,7 @@ TEST_F(SurfaceFactoryTest, DuplicateCopyRequest) { |
std::unique_ptr<RenderPass> render_pass(RenderPass::Create()); |
std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData); |
frame_data->render_pass_list.push_back(std::move(render_pass)); |
- std::unique_ptr<CompositorFrame> frame(new CompositorFrame); |
+ std::unique_ptr<CompositorFrame> frame(CompositorFrame::Create()); |
frame->metadata.referenced_surfaces.push_back(surface_id_); |
frame->delegated_frame_data = std::move(frame_data); |
factory_->SubmitCompositorFrame(surface_id_, std::move(frame), |