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

Unified Diff: chrome/browser/sync_file_system/drive_backend/callback_helper.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
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/callback_helper_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/drive_backend/callback_helper.h
diff --git a/chrome/browser/sync_file_system/drive_backend/callback_helper.h b/chrome/browser/sync_file_system/drive_backend/callback_helper.h
index 440a6d6e17c51f9671e90971f52a07de7f03837b..e2b0db0634d70d9fcaf13f90840d60c1ce8f754f 100644
--- a/chrome/browser/sync_file_system/drive_backend/callback_helper.h
+++ b/chrome/browser/sync_file_system/drive_backend/callback_helper.h
@@ -5,13 +5,13 @@
#ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CALLBACK_HELPER_H_
#define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_CALLBACK_HELPER_H_
+#include <memory>
#include <type_traits>
#include "base/bind.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/sequenced_task_runner.h"
#include "base/thread_task_runner_handle.h"
@@ -23,7 +23,8 @@ namespace drive_backend {
namespace internal {
template <typename T>
-base::internal::PassedWrapper<scoped_ptr<T>> RebindForward(scoped_ptr<T>& t) {
+base::internal::PassedWrapper<std::unique_ptr<T>> RebindForward(
+ std::unique_ptr<T>& t) {
return base::Passed(&t);
}
@@ -57,7 +58,7 @@ class CallbackHolder {
private:
scoped_refptr<base::SequencedTaskRunner> task_runner_;
const tracked_objects::Location from_here_;
- scoped_ptr<base::Callback<T> > callback_;
+ std::unique_ptr<base::Callback<T>> callback_;
DISALLOW_COPY_AND_ASSIGN(CallbackHolder);
};
« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/callback_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698