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

Unified Diff: cc/resources/video_resource_updater_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/resources/video_resource_updater.h ('k') | cc/scheduler/begin_frame_source.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/video_resource_updater_unittest.cc
diff --git a/cc/resources/video_resource_updater_unittest.cc b/cc/resources/video_resource_updater_unittest.cc
index 4adf83720fd035796b6c0876764639de79b86146..db1c4de57e52e00d828bbf6ef9fff9bb5e142b4a 100644
--- a/cc/resources/video_resource_updater_unittest.cc
+++ b/cc/resources/video_resource_updater_unittest.cc
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <stdint.h>
+#include "base/memory/ptr_util.h"
#include "cc/resources/resource_provider.h"
#include "cc/test/fake_output_surface.h"
#include "cc/test/fake_output_surface_client.h"
@@ -70,7 +71,7 @@ class WebGraphicsContext3DUploadCounter : public TestWebGraphicsContext3D {
class SharedBitmapManagerAllocationCounter : public TestSharedBitmapManager {
public:
- scoped_ptr<SharedBitmap> AllocateSharedBitmap(
+ std::unique_ptr<SharedBitmap> AllocateSharedBitmap(
const gfx::Size& size) override {
++allocation_count_;
return TestSharedBitmapManager::AllocateSharedBitmap(size);
@@ -86,7 +87,7 @@ class SharedBitmapManagerAllocationCounter : public TestSharedBitmapManager {
class VideoResourceUpdaterTest : public testing::Test {
protected:
VideoResourceUpdaterTest() {
- scoped_ptr<WebGraphicsContext3DUploadCounter> context3d(
+ std::unique_ptr<WebGraphicsContext3DUploadCounter> context3d(
new WebGraphicsContext3DUploadCounter());
context3d_ = context3d.get();
@@ -100,7 +101,7 @@ class VideoResourceUpdaterTest : public testing::Test {
testing::Test::SetUp();
output_surface_software_ = FakeOutputSurface::CreateSoftware(
- make_scoped_ptr(new SoftwareOutputDevice));
+ base::WrapUnique(new SoftwareOutputDevice));
CHECK(output_surface_software_->BindToClient(&client_));
shared_bitmap_manager_.reset(new SharedBitmapManagerAllocationCounter());
@@ -243,11 +244,11 @@ class VideoResourceUpdaterTest : public testing::Test {
WebGraphicsContext3DUploadCounter* context3d_;
FakeOutputSurfaceClient client_;
- scoped_ptr<FakeOutputSurface> output_surface3d_;
- scoped_ptr<FakeOutputSurface> output_surface_software_;
- scoped_ptr<SharedBitmapManagerAllocationCounter> shared_bitmap_manager_;
- scoped_ptr<ResourceProvider> resource_provider3d_;
- scoped_ptr<ResourceProvider> resource_provider_software_;
+ std::unique_ptr<FakeOutputSurface> output_surface3d_;
+ std::unique_ptr<FakeOutputSurface> output_surface_software_;
+ std::unique_ptr<SharedBitmapManagerAllocationCounter> shared_bitmap_manager_;
+ std::unique_ptr<ResourceProvider> resource_provider3d_;
+ std::unique_ptr<ResourceProvider> resource_provider_software_;
};
TEST_F(VideoResourceUpdaterTest, SoftwareFrame) {
« no previous file with comments | « cc/resources/video_resource_updater.h ('k') | cc/scheduler/begin_frame_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698