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

Unified Diff: chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.cc

Issue 608133002: [SyncFS] Use nullptr for scoped_ptr initialization (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nullptr
Patch Set: Created 6 years, 3 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: 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 016424f1a4c8e02b5a011a861aa2052412a36e4d..96276a991235347213b9d9ab25243675e8db238a 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
@@ -24,7 +24,7 @@ base::WeakPtr<AbortHelper> AbortHelper::AsWeakPtr() {
scoped_ptr<AbortHelper> AbortHelper::TakeOwnership(
const base::WeakPtr<AbortHelper>& abort_helper) {
if (!abort_helper)
- return scoped_ptr<AbortHelper>();
+ return nullptr;
scoped_ptr<AbortHelper> result =
abort_helper->tracker_->PassAbortHelper(abort_helper.get());
abort_helper->weak_ptr_factory_.InvalidateWeakPtrs();

Powered by Google App Engine
This is Rietveld 408576698