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

Unified Diff: cc/test/pixel_test.h

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/test/ordered_simple_task_runner_unittest.cc ('k') | cc/test/pixel_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/pixel_test.h
diff --git a/cc/test/pixel_test.h b/cc/test/pixel_test.h
index 08bad36932889f364be924095b51a28ef07a7422..5a8afcd74cd19a4fac4b8b0788738236464a04f9 100644
--- a/cc/test/pixel_test.h
+++ b/cc/test/pixel_test.h
@@ -50,15 +50,15 @@ class PixelTest : public testing::Test, RendererClient {
gfx::Size device_viewport_size_;
bool disable_picture_quad_image_filtering_;
class PixelTestRendererClient;
- scoped_ptr<FakeOutputSurfaceClient> output_surface_client_;
- scoped_ptr<OutputSurface> output_surface_;
- scoped_ptr<TestSharedBitmapManager> shared_bitmap_manager_;
- scoped_ptr<TestGpuMemoryBufferManager> gpu_memory_buffer_manager_;
- scoped_ptr<BlockingTaskRunner> main_thread_task_runner_;
- scoped_ptr<ResourceProvider> resource_provider_;
- scoped_ptr<TextureMailboxDeleter> texture_mailbox_deleter_;
- scoped_ptr<DirectRenderer> renderer_;
- scoped_ptr<SkBitmap> result_bitmap_;
+ std::unique_ptr<FakeOutputSurfaceClient> output_surface_client_;
+ std::unique_ptr<OutputSurface> output_surface_;
+ std::unique_ptr<TestSharedBitmapManager> shared_bitmap_manager_;
+ std::unique_ptr<TestGpuMemoryBufferManager> gpu_memory_buffer_manager_;
+ std::unique_ptr<BlockingTaskRunner> main_thread_task_runner_;
+ std::unique_ptr<ResourceProvider> resource_provider_;
+ std::unique_ptr<TextureMailboxDeleter> texture_mailbox_deleter_;
+ std::unique_ptr<DirectRenderer> renderer_;
+ std::unique_ptr<SkBitmap> result_bitmap_;
gfx::Vector2d external_device_viewport_offset_;
gfx::Rect external_device_clip_rect_;
@@ -75,12 +75,12 @@ class PixelTest : public testing::Test, RendererClient {
private:
void ReadbackResult(base::Closure quit_run_loop,
- scoped_ptr<CopyOutputResult> result);
+ std::unique_ptr<CopyOutputResult> result);
bool PixelsMatchReference(const base::FilePath& ref_file,
const PixelComparator& comparator);
- scoped_ptr<gfx::DisableNullDrawGLBindings> enable_pixel_output_;
+ std::unique_ptr<gfx::DisableNullDrawGLBindings> enable_pixel_output_;
};
template<typename RendererType>
« no previous file with comments | « cc/test/ordered_simple_task_runner_unittest.cc ('k') | cc/test/pixel_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698