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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc

Issue 610223002: [SyncFS] Use nullptr instead of NULL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/metadata_database_index. h" 5 #include "chrome/browser/sync_file_system/drive_backend/metadata_database_index. h"
6 6
7 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/threading/thread_restrictions.h" 10 #include "base/threading/thread_restrictions.h"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 LookUpMap(trackers_by_parent, tracker_id, std::set<int64>()), 163 LookUpMap(trackers_by_parent, tracker_id, std::set<int64>()),
164 &pending); 164 &pending);
165 } 165 }
166 166
167 // Delete all unreachable trackers. 167 // Delete all unreachable trackers.
168 ScopedVector<FileTracker> reachable_trackers; 168 ScopedVector<FileTracker> reachable_trackers;
169 for (size_t i = 0; i < contents->file_trackers.size(); ++i) { 169 for (size_t i = 0; i < contents->file_trackers.size(); ++i) {
170 FileTracker* tracker = contents->file_trackers[i]; 170 FileTracker* tracker = contents->file_trackers[i];
171 if (ContainsKey(visited_trackers, tracker->tracker_id())) { 171 if (ContainsKey(visited_trackers, tracker->tracker_id())) {
172 reachable_trackers.push_back(tracker); 172 reachable_trackers.push_back(tracker);
173 contents->file_trackers[i] = NULL; 173 contents->file_trackers[i] = nullptr;
174 } else { 174 } else {
175 PutFileTrackerDeletionToDB(tracker->tracker_id(), db); 175 PutFileTrackerDeletionToDB(tracker->tracker_id(), db);
176 } 176 }
177 } 177 }
178 contents->file_trackers = reachable_trackers.Pass(); 178 contents->file_trackers = reachable_trackers.Pass();
179 179
180 // List all |file_id| referred by a tracker. 180 // List all |file_id| referred by a tracker.
181 base::hash_set<std::string> referred_file_ids; 181 base::hash_set<std::string> referred_file_ids;
182 for (size_t i = 0; i < contents->file_trackers.size(); ++i) 182 for (size_t i = 0; i < contents->file_trackers.size(); ++i)
183 referred_file_ids.insert(contents->file_trackers[i]->file_id()); 183 referred_file_ids.insert(contents->file_trackers[i]->file_id());
184 184
185 // Delete all unreferred metadata. 185 // Delete all unreferred metadata.
186 ScopedVector<FileMetadata> referred_file_metadata; 186 ScopedVector<FileMetadata> referred_file_metadata;
187 for (size_t i = 0; i < contents->file_metadata.size(); ++i) { 187 for (size_t i = 0; i < contents->file_metadata.size(); ++i) {
188 FileMetadata* metadata = contents->file_metadata[i]; 188 FileMetadata* metadata = contents->file_metadata[i];
189 if (ContainsKey(referred_file_ids, metadata->file_id())) { 189 if (ContainsKey(referred_file_ids, metadata->file_id())) {
190 referred_file_metadata.push_back(metadata); 190 referred_file_metadata.push_back(metadata);
191 contents->file_metadata[i] = NULL; 191 contents->file_metadata[i] = nullptr;
192 } else { 192 } else {
193 PutFileMetadataDeletionToDB(metadata->file_id(), db); 193 PutFileMetadataDeletionToDB(metadata->file_id(), db);
194 } 194 }
195 } 195 }
196 contents->file_metadata = referred_file_metadata.Pass(); 196 contents->file_metadata = referred_file_metadata.Pass();
197 } 197 }
198 198
199 } // namespace 199 } // namespace
200 200
201 // static 201 // static
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 743
744 DVLOG(3) << " Remove from dirty_trackers_: " << tracker_id; 744 DVLOG(3) << " Remove from dirty_trackers_: " << tracker_id;
745 dirty_trackers_.erase(tracker_id); 745 dirty_trackers_.erase(tracker_id);
746 746
747 demoted_dirty_trackers_.erase(tracker_id); 747 demoted_dirty_trackers_.erase(tracker_id);
748 } 748 }
749 } 749 }
750 750
751 } // namespace drive_backend 751 } // namespace drive_backend
752 } // namespace sync_file_system 752 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698