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

Unified Diff: content/browser/compositor/software_browser_compositor_output_surface_unittest.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: content/browser/compositor/software_browser_compositor_output_surface_unittest.cc
diff --git a/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc b/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc
index 51a2c777910488bba44a68ff85e39251fb8242ca..7dd77075c70c68d71d46336ce02a13b07cae881e 100644
--- a/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc
+++ b/content/browser/compositor/software_browser_compositor_output_surface_unittest.cc
@@ -51,7 +51,7 @@ class FakeSoftwareOutputDevice : public cc::SoftwareOutputDevice {
}
private:
- scoped_ptr<gfx::VSyncProvider> vsync_provider_;
+ std::unique_ptr<gfx::VSyncProvider> vsync_provider_;
DISALLOW_COPY_AND_ASSIGN(FakeSoftwareOutputDevice);
};
@@ -66,14 +66,14 @@ class SoftwareBrowserCompositorOutputSurfaceTest : public testing::Test {
void SetUp() override;
void TearDown() override;
- scoped_ptr<content::BrowserCompositorOutputSurface> CreateSurface(
- scoped_ptr<cc::SoftwareOutputDevice> device);
+ std::unique_ptr<content::BrowserCompositorOutputSurface> CreateSurface(
+ std::unique_ptr<cc::SoftwareOutputDevice> device);
protected:
- scoped_ptr<content::BrowserCompositorOutputSurface> output_surface_;
+ std::unique_ptr<content::BrowserCompositorOutputSurface> output_surface_;
- scoped_ptr<base::MessageLoop> message_loop_;
- scoped_ptr<ui::Compositor> compositor_;
+ std::unique_ptr<base::MessageLoop> message_loop_;
+ std::unique_ptr<ui::Compositor> compositor_;
DISALLOW_COPY_AND_ASSIGN(SoftwareBrowserCompositorOutputSurfaceTest);
};
@@ -104,17 +104,17 @@ void SoftwareBrowserCompositorOutputSurfaceTest::TearDown() {
ui::TerminateContextFactoryForTests();
}
-scoped_ptr<content::BrowserCompositorOutputSurface>
+std::unique_ptr<content::BrowserCompositorOutputSurface>
SoftwareBrowserCompositorOutputSurfaceTest::CreateSurface(
- scoped_ptr<cc::SoftwareOutputDevice> device) {
- return scoped_ptr<content::BrowserCompositorOutputSurface>(
+ std::unique_ptr<cc::SoftwareOutputDevice> device) {
+ return std::unique_ptr<content::BrowserCompositorOutputSurface>(
new content::SoftwareBrowserCompositorOutputSurface(
std::move(device), compositor_->vsync_manager()));
}
TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, NoVSyncProvider) {
cc::FakeOutputSurfaceClient output_surface_client;
- scoped_ptr<cc::SoftwareOutputDevice> software_device(
+ std::unique_ptr<cc::SoftwareOutputDevice> software_device(
new cc::SoftwareOutputDevice());
output_surface_ = CreateSurface(std::move(software_device));
CHECK(output_surface_->BindToClient(&output_surface_client));
@@ -128,7 +128,7 @@ TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, NoVSyncProvider) {
TEST_F(SoftwareBrowserCompositorOutputSurfaceTest, VSyncProviderUpdates) {
cc::FakeOutputSurfaceClient output_surface_client;
- scoped_ptr<cc::SoftwareOutputDevice> software_device(
+ std::unique_ptr<cc::SoftwareOutputDevice> software_device(
new FakeSoftwareOutputDevice());
output_surface_ = CreateSurface(std::move(software_device));
CHECK(output_surface_->BindToClient(&output_surface_client));

Powered by Google App Engine
This is Rietveld 408576698