chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc - Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr

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: chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 | « chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.h ('k') | chrome/browser/chromeos/login/users/avatar/user_image_sync_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc

diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc

index 06ad4380088214555881973df9753059eb3242c8..e38e40db1718461f138b385a7b1f209621fa2a82 100644

--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc

+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_test_util.cc

@@ -53,7 +53,7 @@ ImageLoader::ImageLoader(const base::FilePath& path) : path_(path) {

ImageLoader::~ImageLoader() {

}

-scoped_ptr<gfx::ImageSkia> ImageLoader::Load() {

+std::unique_ptr<gfx::ImageSkia> ImageLoader::Load() {

std::string image_data;

ReadFileToString(path_, &image_data);

ImageDecoder::StartWithOptions(this, image_data,