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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed accidental components/ change Created 4 years, 4 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 | « chrome/browser/sync_file_system/drive_backend/metadata_database.cc ('k') | chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.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/metadata_database_index.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc
index f3cd15aaacab18b96aa83f608527d4f0fb0849f7..22820e36af7c475608cd8d0fd24a04865e64d046 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc
@@ -170,7 +170,7 @@ void RemoveUnreachableItemsFromDB(DatabaseContents* contents,
ScopedVector<FileTracker> reachable_trackers;
for (size_t i = 0; i < contents->file_trackers.size(); ++i) {
FileTracker* tracker = contents->file_trackers[i];
- if (ContainsKey(visited_trackers, tracker->tracker_id())) {
+ if (base::ContainsKey(visited_trackers, tracker->tracker_id())) {
reachable_trackers.push_back(tracker);
contents->file_trackers[i] = nullptr;
} else {
@@ -188,7 +188,7 @@ void RemoveUnreachableItemsFromDB(DatabaseContents* contents,
ScopedVector<FileMetadata> referred_file_metadata;
for (size_t i = 0; i < contents->file_metadata.size(); ++i) {
FileMetadata* metadata = contents->file_metadata[i];
- if (ContainsKey(referred_file_ids, metadata->file_id())) {
+ if (base::ContainsKey(referred_file_ids, metadata->file_id())) {
referred_file_metadata.push_back(metadata);
contents->file_metadata[i] = nullptr;
} else {
@@ -522,7 +522,7 @@ void MetadataDatabaseIndex::AddToAppIDIndex(
DVLOG(3) << " Add to app_root_by_app_id_: " << new_tracker.app_id();
DCHECK(new_tracker.active());
- DCHECK(!ContainsKey(app_root_by_app_id_, new_tracker.app_id()));
+ DCHECK(!base::ContainsKey(app_root_by_app_id_, new_tracker.app_id()));
app_root_by_app_id_[new_tracker.app_id()] = new_tracker.tracker_id();
}
@@ -534,7 +534,7 @@ void MetadataDatabaseIndex::UpdateInAppIDIndex(
if (IsAppRoot(old_tracker) && !IsAppRoot(new_tracker)) {
DCHECK(old_tracker.active());
DCHECK(!new_tracker.active());
- DCHECK(ContainsKey(app_root_by_app_id_, old_tracker.app_id()));
+ DCHECK(base::ContainsKey(app_root_by_app_id_, old_tracker.app_id()));
DVLOG(3) << " Remove from app_root_by_app_id_: " << old_tracker.app_id();
@@ -542,7 +542,7 @@ void MetadataDatabaseIndex::UpdateInAppIDIndex(
} else if (!IsAppRoot(old_tracker) && IsAppRoot(new_tracker)) {
DCHECK(!old_tracker.active());
DCHECK(new_tracker.active());
- DCHECK(!ContainsKey(app_root_by_app_id_, new_tracker.app_id()));
+ DCHECK(!base::ContainsKey(app_root_by_app_id_, new_tracker.app_id()));
DVLOG(3) << " Add to app_root_by_app_id_: " << new_tracker.app_id();
@@ -554,7 +554,7 @@ void MetadataDatabaseIndex::RemoveFromAppIDIndex(
const FileTracker& tracker) {
if (IsAppRoot(tracker)) {
DCHECK(tracker.active());
- DCHECK(ContainsKey(app_root_by_app_id_, tracker.app_id()));
+ DCHECK(base::ContainsKey(app_root_by_app_id_, tracker.app_id()));
DVLOG(3) << " Remove from app_root_by_app_id_: " << tracker.app_id();
@@ -569,7 +569,8 @@ void MetadataDatabaseIndex::AddToFileIDIndexes(
trackers_by_file_id_[new_tracker.file_id()].Insert(new_tracker);
if (trackers_by_file_id_[new_tracker.file_id()].size() > 1) {
- DVLOG_IF(3, !ContainsKey(multi_tracker_file_ids_, new_tracker.file_id()))
+ DVLOG_IF(3,
+ !base::ContainsKey(multi_tracker_file_ids_, new_tracker.file_id()))
<< " Add to multi_tracker_file_ids_: " << new_tracker.file_id();
multi_tracker_file_ids_.insert(new_tracker.file_id());
}
@@ -582,7 +583,7 @@ void MetadataDatabaseIndex::UpdateInFileIDIndexes(
DCHECK_EQ(old_tracker.file_id(), new_tracker.file_id());
std::string file_id = new_tracker.file_id();
- DCHECK(ContainsKey(trackers_by_file_id_, file_id));
+ DCHECK(base::ContainsKey(trackers_by_file_id_, file_id));
if (old_tracker.active() && !new_tracker.active())
trackers_by_file_id_[file_id].Deactivate(new_tracker.tracker_id());
@@ -604,7 +605,7 @@ void MetadataDatabaseIndex::RemoveFromFileIDIndexes(
found->second.Erase(tracker.tracker_id());
if (trackers_by_file_id_[tracker.file_id()].size() <= 1) {
- DVLOG_IF(3, ContainsKey(multi_tracker_file_ids_, tracker.file_id()))
+ DVLOG_IF(3, base::ContainsKey(multi_tracker_file_ids_, tracker.file_id()))
<< " Remove from multi_tracker_file_ids_: " << tracker.file_id();
multi_tracker_file_ids_.erase(tracker.file_id());
}
@@ -625,8 +626,8 @@ void MetadataDatabaseIndex::AddToPathIndexes(
if (trackers_by_parent_and_title_[parent][title].size() > 1 &&
!title.empty()) {
- DVLOG_IF(3, !ContainsKey(multi_backing_file_paths_,
- ParentIDAndTitle(parent, title)))
+ DVLOG_IF(3, !base::ContainsKey(multi_backing_file_paths_,
+ ParentIDAndTitle(parent, title)))
<< " Add to multi_backing_file_paths_: " << parent << " " << title;
multi_backing_file_paths_.insert(ParentIDAndTitle(parent, title));
}
@@ -667,17 +668,17 @@ void MetadataDatabaseIndex::UpdateInPathIndexes(
if (trackers_by_parent_and_title_[parent][old_title].size() <= 1 &&
!old_title.empty()) {
- DVLOG_IF(3, ContainsKey(multi_backing_file_paths_,
- ParentIDAndTitle(parent, old_title)))
- << " Remove from multi_backing_file_paths_: "
- << parent << " " << old_title;
+ DVLOG_IF(3, base::ContainsKey(multi_backing_file_paths_,
+ ParentIDAndTitle(parent, old_title)))
+ << " Remove from multi_backing_file_paths_: " << parent << " "
+ << old_title;
multi_backing_file_paths_.erase(ParentIDAndTitle(parent, old_title));
}
if (trackers_by_parent_and_title_[parent][title].size() > 1 &&
!title.empty()) {
- DVLOG_IF(3, !ContainsKey(multi_backing_file_paths_,
- ParentIDAndTitle(parent, title)))
+ DVLOG_IF(3, !base::ContainsKey(multi_backing_file_paths_,
+ ParentIDAndTitle(parent, title)))
<< " Add to multi_backing_file_paths_: " << parent << " " << title;
multi_backing_file_paths_.insert(ParentIDAndTitle(parent, title));
}
@@ -697,8 +698,8 @@ void MetadataDatabaseIndex::RemoveFromPathIndexes(
int64_t parent = tracker.parent_tracker_id();
std::string title = GetTrackerTitle(tracker);
- DCHECK(ContainsKey(trackers_by_parent_and_title_, parent));
- DCHECK(ContainsKey(trackers_by_parent_and_title_[parent], title));
+ DCHECK(base::ContainsKey(trackers_by_parent_and_title_, parent));
+ DCHECK(base::ContainsKey(trackers_by_parent_and_title_[parent], title));
DVLOG(3) << " Remove from trackers_by_parent_and_title_: "
<< parent << " " << title;
@@ -707,10 +708,10 @@ void MetadataDatabaseIndex::RemoveFromPathIndexes(
if (trackers_by_parent_and_title_[parent][title].size() <= 1 &&
!title.empty()) {
- DVLOG_IF(3, ContainsKey(multi_backing_file_paths_,
- ParentIDAndTitle(parent, title)))
- << " Remove from multi_backing_file_paths_: "
- << parent << " " << title;
+ DVLOG_IF(3, base::ContainsKey(multi_backing_file_paths_,
+ ParentIDAndTitle(parent, title)))
+ << " Remove from multi_backing_file_paths_: " << parent << " "
+ << title;
multi_backing_file_paths_.erase(ParentIDAndTitle(parent, title));
}
@@ -723,8 +724,8 @@ void MetadataDatabaseIndex::RemoveFromPathIndexes(
void MetadataDatabaseIndex::AddToDirtyTrackerIndexes(
const FileTracker& new_tracker) {
- DCHECK(!ContainsKey(dirty_trackers_, new_tracker.tracker_id()));
- DCHECK(!ContainsKey(demoted_dirty_trackers_, new_tracker.tracker_id()));
+ DCHECK(!base::ContainsKey(dirty_trackers_, new_tracker.tracker_id()));
+ DCHECK(!base::ContainsKey(demoted_dirty_trackers_, new_tracker.tracker_id()));
if (new_tracker.dirty()) {
DVLOG(3) << " Add to dirty_trackers_: " << new_tracker.tracker_id();
@@ -739,16 +740,16 @@ void MetadataDatabaseIndex::UpdateInDirtyTrackerIndexes(
int64_t tracker_id = new_tracker.tracker_id();
if (old_tracker.dirty() && !new_tracker.dirty()) {
- DCHECK(ContainsKey(dirty_trackers_, tracker_id) ||
- ContainsKey(demoted_dirty_trackers_, tracker_id));
+ DCHECK(base::ContainsKey(dirty_trackers_, tracker_id) ||
+ base::ContainsKey(demoted_dirty_trackers_, tracker_id));
DVLOG(3) << " Remove from dirty_trackers_: " << tracker_id;
dirty_trackers_.erase(tracker_id);
demoted_dirty_trackers_.erase(tracker_id);
} else if (!old_tracker.dirty() && new_tracker.dirty()) {
- DCHECK(!ContainsKey(dirty_trackers_, tracker_id));
- DCHECK(!ContainsKey(demoted_dirty_trackers_, tracker_id));
+ DCHECK(!base::ContainsKey(dirty_trackers_, tracker_id));
+ DCHECK(!base::ContainsKey(demoted_dirty_trackers_, tracker_id));
DVLOG(3) << " Add to dirty_trackers_: " << tracker_id;
@@ -760,8 +761,8 @@ void MetadataDatabaseIndex::RemoveFromDirtyTrackerIndexes(
const FileTracker& tracker) {
if (tracker.dirty()) {
int64_t tracker_id = tracker.tracker_id();
- DCHECK(ContainsKey(dirty_trackers_, tracker_id) ||
- ContainsKey(demoted_dirty_trackers_, tracker_id));
+ DCHECK(base::ContainsKey(dirty_trackers_, tracker_id) ||
+ base::ContainsKey(demoted_dirty_trackers_, tracker_id));
DVLOG(3) << " Remove from dirty_trackers_: " << tracker_id;
dirty_trackers_.erase(tracker_id);
« no previous file with comments | « chrome/browser/sync_file_system/drive_backend/metadata_database.cc ('k') | chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698