components/resource_provider/public/cpp/resource_loader.cc - Issue 1921923002: Convert //components/[o-t]* 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: components/resource_provider/public/cpp/resource_loader.cc

Issue 1921923002: Convert //components/[o-t]* 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

« no previous file with comments | « components/resource_provider/public/cpp/resource_loader.h ('k') | components/resource_provider/resource_provider_test_app.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/resource_provider/public/cpp/resource_loader.cc

diff --git a/components/resource_provider/public/cpp/resource_loader.cc b/components/resource_provider/public/cpp/resource_loader.cc

index 32ae5ef561bf852eacb70c0514a72d70ee25956e..65685a4a9f8e5444c027db0713d73d43c16052d5 100644

--- a/components/resource_provider/public/cpp/resource_loader.cc

+++ b/components/resource_provider/public/cpp/resource_loader.cc

@@ -51,7 +51,7 @@ bool ResourceLoader::BlockUntilLoaded() {

base::File ResourceLoader::ReleaseFile(const std::string& path) {

CHECK(resource_map_.count(path));

- scoped_ptr<base::File> file_wrapper(std::move(resource_map_[path]));

+ std::unique_ptr<base::File> file_wrapper(std::move(resource_map_[path]));

resource_map_.erase(path);

return std::move(*file_wrapper);

}