Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(205)

Unified Diff: cc/surfaces/surface_factory_unittest.cc

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/surfaces/surface_factory.cc ('k') | cc/surfaces/surface_hittest_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface_factory_unittest.cc
diff --git a/cc/surfaces/surface_factory_unittest.cc b/cc/surfaces/surface_factory_unittest.cc
index a48d6699d2942917c656d948ded5c3f54f595a7b..1d7a8b92d669b85612df04d8fcce3d0b19bb5f4d 100644
--- a/cc/surfaces/surface_factory_unittest.cc
+++ b/cc/surfaces/surface_factory_unittest.cc
@@ -69,14 +69,14 @@ class SurfaceFactoryTest : public testing::Test {
void SubmitCompositorFrameWithResources(ResourceId* resource_ids,
size_t num_resource_ids) {
- scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
+ std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
for (size_t i = 0u; i < num_resource_ids; ++i) {
TransferableResource resource;
resource.id = resource_ids[i];
resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
frame_data->resource_list.push_back(resource);
}
- scoped_ptr<CompositorFrame> frame(new CompositorFrame);
+ std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
frame->delegated_frame_data = std::move(frame_data);
factory_->SubmitCompositorFrame(surface_id_, std::move(frame),
SurfaceFactory::DrawCallback());
@@ -118,7 +118,7 @@ class SurfaceFactoryTest : public testing::Test {
protected:
SurfaceManager manager_;
TestSurfaceFactoryClient client_;
- scoped_ptr<SurfaceFactory> factory_;
+ std::unique_ptr<SurfaceFactory> factory_;
SurfaceId surface_id_;
};
@@ -394,7 +394,7 @@ TEST_F(SurfaceFactoryTest, BlankNoIndexIncrement) {
Surface* surface = manager_.GetSurfaceForId(surface_id);
ASSERT_NE(nullptr, surface);
EXPECT_EQ(2, surface->frame_index());
- scoped_ptr<CompositorFrame> frame(new CompositorFrame);
+ std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
frame->delegated_frame_data.reset(new DelegatedFrameData);
factory_->SubmitCompositorFrame(surface_id, std::move(frame),
@@ -415,12 +415,12 @@ TEST_F(SurfaceFactoryTest, DestroyAll) {
SurfaceId id(7);
factory_->Create(id);
- scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
+ std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
TransferableResource resource;
resource.id = 1;
resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
frame_data->resource_list.push_back(resource);
- scoped_ptr<CompositorFrame> frame(new CompositorFrame);
+ std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
frame->delegated_frame_data = std::move(frame_data);
uint32_t execute_count = 0;
SurfaceDrawStatus drawn = SurfaceDrawStatus::DRAW_SKIPPED;
@@ -445,8 +445,8 @@ TEST_F(SurfaceFactoryTest, DestroySequence) {
->AddDestructionDependency(SurfaceSequence(0, 4));
factory_->Destroy(id2);
- scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
- scoped_ptr<CompositorFrame> frame(new CompositorFrame);
+ std::unique_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
+ std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
frame->metadata.satisfies_sequences.push_back(6);
frame->metadata.satisfies_sequences.push_back(4);
frame->delegated_frame_data = std::move(frame_data);
@@ -497,10 +497,10 @@ TEST_F(SurfaceFactoryTest, DestroyCycle) {
// Give id2 a frame that references surface_id_.
{
- scoped_ptr<RenderPass> render_pass(RenderPass::Create());
- scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
+ 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));
- scoped_ptr<CompositorFrame> frame(new CompositorFrame);
+ std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
frame->metadata.referenced_surfaces.push_back(surface_id_);
frame->delegated_frame_data = std::move(frame_data);
factory_->SubmitCompositorFrame(id2, std::move(frame),
@@ -510,10 +510,10 @@ TEST_F(SurfaceFactoryTest, DestroyCycle) {
// Give surface_id_ a frame that references id2.
{
- scoped_ptr<RenderPass> render_pass(RenderPass::Create());
- scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
+ 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));
- scoped_ptr<CompositorFrame> frame(new CompositorFrame);
+ std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
frame->metadata.referenced_surfaces.push_back(id2);
frame->delegated_frame_data = std::move(frame_data);
factory_->SubmitCompositorFrame(surface_id_, std::move(frame),
@@ -538,16 +538,16 @@ TEST_F(SurfaceFactoryTest, DestroyCycle) {
}
void CopyRequestTestCallback(bool* called,
- scoped_ptr<CopyOutputResult> result) {
+ std::unique_ptr<CopyOutputResult> result) {
*called = true;
}
TEST_F(SurfaceFactoryTest, DuplicateCopyRequest) {
{
- scoped_ptr<RenderPass> render_pass(RenderPass::Create());
- scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
+ 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));
- scoped_ptr<CompositorFrame> frame(new CompositorFrame);
+ std::unique_ptr<CompositorFrame> frame(new CompositorFrame);
frame->metadata.referenced_surfaces.push_back(surface_id_);
frame->delegated_frame_data = std::move(frame_data);
factory_->SubmitCompositorFrame(surface_id_, std::move(frame),
@@ -557,7 +557,7 @@ TEST_F(SurfaceFactoryTest, DuplicateCopyRequest) {
void* source2 = &source2;
bool called1 = false;
- scoped_ptr<CopyOutputRequest> request;
+ std::unique_ptr<CopyOutputRequest> request;
request = CopyOutputRequest::CreateRequest(
base::Bind(&CopyRequestTestCallback, &called1));
request->set_source(source1);
« no previous file with comments | « cc/surfaces/surface_factory.cc ('k') | cc/surfaces/surface_hittest_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698