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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/register_app_task.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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync_file_system/drive_backend/register_app_task.h" 5 #include "chrome/browser/sync_file_system/drive_backend/register_app_task.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 sync_root_tracker.file_id(), app_id_)); 98 sync_root_tracker.file_id(), app_id_));
99 folder_creator_->Run(base::Bind( 99 folder_creator_->Run(base::Bind(
100 &RegisterAppTask::DidCreateAppRootFolder, 100 &RegisterAppTask::DidCreateAppRootFolder,
101 weak_ptr_factory_.GetWeakPtr(), callback)); 101 weak_ptr_factory_.GetWeakPtr(), callback));
102 } 102 }
103 103
104 void RegisterAppTask::DidCreateAppRootFolder( 104 void RegisterAppTask::DidCreateAppRootFolder(
105 const SyncStatusCallback& callback, 105 const SyncStatusCallback& callback,
106 const std::string& folder_id, 106 const std::string& folder_id,
107 SyncStatusCode status) { 107 SyncStatusCode status) {
108 scoped_ptr<FolderCreator> deleter = std::move(folder_creator_); 108 std::unique_ptr<FolderCreator> deleter = std::move(folder_creator_);
109 if (status != SYNC_STATUS_OK) { 109 if (status != SYNC_STATUS_OK) {
110 callback.Run(status); 110 callback.Run(status);
111 return; 111 return;
112 } 112 }
113 113
114 RunExclusive(callback); 114 RunExclusive(callback);
115 } 115 }
116 116
117 bool RegisterAppTask::FilterCandidates(const TrackerIDSet& trackers, 117 bool RegisterAppTask::FilterCandidates(const TrackerIDSet& trackers,
118 FileTracker* candidate) { 118 FileTracker* candidate) {
119 DCHECK(candidate); 119 DCHECK(candidate);
120 if (trackers.has_active()) { 120 if (trackers.has_active()) {
121 if (metadata_database()->FindTrackerByTrackerID( 121 if (metadata_database()->FindTrackerByTrackerID(
122 trackers.active_tracker(), candidate)) { 122 trackers.active_tracker(), candidate)) {
123 return true; 123 return true;
124 } 124 }
125 NOTREACHED(); 125 NOTREACHED();
126 } 126 }
127 127
128 scoped_ptr<FileTracker> oldest_tracker; 128 std::unique_ptr<FileTracker> oldest_tracker;
129 for (TrackerIDSet::const_iterator itr = trackers.begin(); 129 for (TrackerIDSet::const_iterator itr = trackers.begin();
130 itr != trackers.end(); ++itr) { 130 itr != trackers.end(); ++itr) {
131 scoped_ptr<FileTracker> tracker(new FileTracker); 131 std::unique_ptr<FileTracker> tracker(new FileTracker);
132 if (!metadata_database()->FindTrackerByTrackerID( 132 if (!metadata_database()->FindTrackerByTrackerID(
133 *itr, tracker.get())) { 133 *itr, tracker.get())) {
134 NOTREACHED(); 134 NOTREACHED();
135 continue; 135 continue;
136 } 136 }
137 137
138 FileMetadata file; 138 FileMetadata file;
139 DCHECK(!tracker->active()); 139 DCHECK(!tracker->active());
140 DCHECK(tracker->has_synced_details()); 140 DCHECK(tracker->has_synced_details());
141 141
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 MetadataDatabase* RegisterAppTask::metadata_database() { 178 MetadataDatabase* RegisterAppTask::metadata_database() {
179 return sync_context_->GetMetadataDatabase(); 179 return sync_context_->GetMetadataDatabase();
180 } 180 }
181 181
182 drive::DriveServiceInterface* RegisterAppTask::drive_service() { 182 drive::DriveServiceInterface* RegisterAppTask::drive_service() {
183 return sync_context_->GetDriveService(); 183 return sync_context_->GetDriveService();
184 } 184 }
185 185
186 } // namespace drive_backend 186 } // namespace drive_backend
187 } // namespace sync_file_system 187 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698