chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.cc - Issue 1873683002: Convert //chrome/browser/sync_file_system 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/sync_file_system/drive_backend/callback_tracker_internal.cc

Issue 1873683002: Convert //chrome/browser/sync_file_system 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 | « chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h ('k') | chrome/browser/sync_file_system/drive_backend/conflict_resolver.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.cc

diff --git a/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.cc b/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.cc

index 09ef3403d0c8e9aba770c66aff357f31dad1f9ea..c8687a02882affdbb407b27fa635934863fd83d6 100644

--- a/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.cc

+++ b/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.cc

@@ -21,11 +21,11 @@ base::WeakPtr<AbortHelper> AbortHelper::AsWeakPtr() {

}

// static

-scoped_ptr<AbortHelper> AbortHelper::TakeOwnership(

+std::unique_ptr<AbortHelper> AbortHelper::TakeOwnership(

const base::WeakPtr<AbortHelper>& abort_helper) {

if (!abort_helper)

return nullptr;

- scoped_ptr<AbortHelper> result =

+ std::unique_ptr<AbortHelper> result =

abort_helper->tracker_->PassAbortHelper(abort_helper.get());

abort_helper->weak_ptr_factory_.InvalidateWeakPtrs();

return result;