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

Unified Diff: chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.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
Index: chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc
index 234465ddf6b0a99803a7fb9e7f3ef6c124d7c32e..97d7a63fe843d031d9063159874f0fbe3f5e1363 100644
--- a/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc
+++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.cc
@@ -57,40 +57,40 @@ void ExpectEquivalentTrackers(const FileTracker& left,
EXPECT_EQ(left.needs_folder_listing(), right.needs_folder_listing());
}
-scoped_ptr<FileMetadata> CreateFolderMetadata(const std::string& file_id,
- const std::string& title) {
+std::unique_ptr<FileMetadata> CreateFolderMetadata(const std::string& file_id,
+ const std::string& title) {
FileDetails details;
details.set_title(title);
details.set_file_kind(FILE_KIND_FOLDER);
details.set_missing(false);
- scoped_ptr<FileMetadata> metadata(new FileMetadata);
+ std::unique_ptr<FileMetadata> metadata(new FileMetadata);
metadata->set_file_id(file_id);
*metadata->mutable_details() = details;
return metadata;
}
-scoped_ptr<FileMetadata> CreateFileMetadata(const std::string& file_id,
- const std::string& title,
- const std::string& md5) {
+std::unique_ptr<FileMetadata> CreateFileMetadata(const std::string& file_id,
+ const std::string& title,
+ const std::string& md5) {
FileDetails details;
details.set_title(title);
details.set_file_kind(FILE_KIND_FILE);
details.set_missing(false);
details.set_md5(md5);
- scoped_ptr<FileMetadata> metadata(new FileMetadata);
+ std::unique_ptr<FileMetadata> metadata(new FileMetadata);
metadata->set_file_id(file_id);
*metadata->mutable_details() = details;
return metadata;
}
-scoped_ptr<FileTracker> CreateTracker(const FileMetadata& metadata,
- int64_t tracker_id,
- const FileTracker* parent_tracker) {
- scoped_ptr<FileTracker> tracker(new FileTracker);
+std::unique_ptr<FileTracker> CreateTracker(const FileMetadata& metadata,
+ int64_t tracker_id,
+ const FileTracker* parent_tracker) {
+ std::unique_ptr<FileTracker> tracker(new FileTracker);
tracker->set_tracker_id(tracker_id);
int64_t parent_id =
parent_tracker ? parent_tracker->tracker_id() : kInvalidTrackerID;
@@ -106,11 +106,11 @@ scoped_ptr<FileTracker> CreateTracker(const FileMetadata& metadata,
return tracker;
}
-scoped_ptr<FileTracker> CreatePlaceholderTracker(
+std::unique_ptr<FileTracker> CreatePlaceholderTracker(
const std::string& file_id,
int64_t tracker_id,
const FileTracker* parent_tracker) {
- scoped_ptr<FileTracker> tracker(new FileTracker);
+ std::unique_ptr<FileTracker> tracker(new FileTracker);
tracker->set_tracker_id(tracker_id);
if (parent_tracker)
tracker->set_parent_tracker_id(parent_tracker->tracker_id());

Powered by Google App Engine
This is Rietveld 408576698