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

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

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
Index: chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h
diff --git a/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h b/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h
index 4f8e445860940adfe56861401a1d0d5f43848790..e68c3d6efc09a330a156536c3fd586ba9e875457 100644
--- a/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h
+++ b/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h
@@ -5,11 +5,11 @@
#ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CALLBACK_TRACKER_INTERNAL_H_
#define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CALLBACK_TRACKER_INTERNAL_H_
+#include <memory>
#include <utility>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
namespace sync_file_system {
@@ -25,7 +25,7 @@ class AbortHelper {
~AbortHelper();
base::WeakPtr<AbortHelper> AsWeakPtr();
- static scoped_ptr<AbortHelper> TakeOwnership(
+ static std::unique_ptr<AbortHelper> TakeOwnership(
const base::WeakPtr<AbortHelper>& abort_helper);
private:
@@ -43,7 +43,8 @@ struct InvokeAndInvalidateHelper<void(Args...)> {
static void Run(const base::WeakPtr<AbortHelper>& abort_helper,
const base::Callback<void(Args...)>& callback,
Args... args) {
- scoped_ptr<AbortHelper> deleter = AbortHelper::TakeOwnership(abort_helper);
+ std::unique_ptr<AbortHelper> deleter =
+ AbortHelper::TakeOwnership(abort_helper);
if (deleter) {
callback.Run(std::forward<Args>(args)...);
}

Powered by Google App Engine
This is Rietveld 408576698