ui/snapshot/snapshot_mac_unittest.mm - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/snapshot/snapshot_mac_unittest.mm

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc

Patch Set: scopedptrui: rebase-make_scoped_ptr 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: ui/snapshot/snapshot_mac_unittest.mm

diff --git a/ui/snapshot/snapshot_mac_unittest.mm b/ui/snapshot/snapshot_mac_unittest.mm

index 7387d6e27be883420d99497756300f90947e157f..d1d9250464012794bb20f25093d7326d35136a89 100644

--- a/ui/snapshot/snapshot_mac_unittest.mm

+++ b/ui/snapshot/snapshot_mac_unittest.mm

@@ -6,9 +6,10 @@

#import <Cocoa/Cocoa.h>

+#include <memory>

#include "base/mac/scoped_nsobject.h"

#include "base/mac/sdk_forward_declarations.h"

-#include "base/memory/scoped_ptr.h"

#include "testing/platform_test.h"

#include "ui/gfx/geometry/rect.h"

@@ -28,7 +29,7 @@ TEST_F(GrabWindowSnapshotTest, TestGrabWindowSnapshot) {

[window setBackgroundColor:[NSColor whiteColor]];

[window makeKeyAndOrderFront:NSApp];

- scoped_ptr<std::vector<unsigned char> > png_representation(

+ std::unique_ptr<std::vector<unsigned char>> png_representation(

new std::vector<unsigned char>);

gfx::Rect bounds = gfx::Rect(0, 0, frame.size.width, frame.size.height);

EXPECT_TRUE(ui::GrabWindowSnapshot(window, png_representation.get(),

« no previous file with comments | « ui/snapshot/snapshot_aura_unittest.cc ('k') | ui/surface/transport_dib_posix.cc » ('j') | no next file with comments »