chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.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/media_galleries/linux/mtp_device_delegate_impl_linux.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/media_galleries/gallery_watch_manager_unittest.cc ('k') | chrome/browser/media_galleries/linux/mtp_device_task_helper_map_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc

diff --git a/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc b/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc

index 2f4172231ed64923f3a15e2a253d151f79ff2398..1c6b4b5ae3486c6553078b8d931860a01f0d47d8 100644

--- a/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc

+++ b/chrome/browser/media_galleries/linux/mtp_device_delegate_impl_linux.cc

@@ -426,7 +426,7 @@ MTPDeviceDelegateImplLinux::MTPFileNode::MTPFileNode(

file_id_to_node_map_(file_id_to_node_map) {

DCHECK_CURRENTLY_ON(content::BrowserThread::IO);

DCHECK(file_id_to_node_map_);

- DCHECK(!ContainsKey(*file_id_to_node_map_, file_id_));

+ DCHECK(!base::ContainsKey(*file_id_to_node_map_, file_id_));

(*file_id_to_node_map_)[file_id_] = this;

}

@@ -461,7 +461,7 @@ void MTPDeviceDelegateImplLinux::MTPFileNode::ClearNonexistentChildren(

std::set<std::string> children_to_erase;

for (ChildNodes::const_iterator it = children_.begin();

it != children_.end(); ++it) {

- if (ContainsKey(children_to_keep, it->first))

+ if (base::ContainsKey(children_to_keep, it->first))

continue;

children_to_erase.insert(it->first);

}