chrome/browser/sync_file_system/subtree_set.cc - Issue 2230203002: chrome: Use stl utilities from the base namespace

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync_file_system/subtree_set.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:

Index: chrome/browser/sync_file_system/subtree_set.cc

diff --git a/chrome/browser/sync_file_system/subtree_set.cc b/chrome/browser/sync_file_system/subtree_set.cc

index 6d135e59fb6bae8c085dc07181c031f030f99a62..19a64f38d038f392ebebc6b848deb89b266a0c32 100644

--- a/chrome/browser/sync_file_system/subtree_set.cc

+++ b/chrome/browser/sync_file_system/subtree_set.cc

@@ -30,8 +30,8 @@ bool SubtreeSet::IsDisjointWith(const base::FilePath& subtree_root) const {

storage::VirtualPath::GetNormalizedFilePath(subtree_root);

// Check if |subtree_root| contains any of subtrees in the container.

- if (ContainsKey(inclusive_ancestors_of_subtree_roots_,

- normalized_subtree_root))

+ if (base::ContainsKey(inclusive_ancestors_of_subtree_roots_,

+ normalized_subtree_root))

return false;

base::FilePath path(normalized_subtree_root);