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

Unified Diff: device/usb/usb_device_handle_impl.cc

Issue 2230083003: device: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased 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 | « device/usb/mojo/device_impl_unittest.cc ('k') | device/usb/usb_device_handle_usbfs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/usb/usb_device_handle_impl.cc
diff --git a/device/usb/usb_device_handle_impl.cc b/device/usb/usb_device_handle_impl.cc
index 0fd3958442a638d02354228964bdf4d8fdcf9551..1b7e5609d7cf011ae1b2375ef05fc962300b718e 100644
--- a/device/usb/usb_device_handle_impl.cc
+++ b/device/usb/usb_device_handle_impl.cc
@@ -612,7 +612,7 @@ void UsbDeviceHandleImpl::ClaimInterface(int interface_number,
callback.Run(false);
return;
}
- if (ContainsKey(claimed_interfaces_, interface_number)) {
+ if (base::ContainsKey(claimed_interfaces_, interface_number)) {
callback.Run(true);
return;
}
@@ -626,7 +626,7 @@ void UsbDeviceHandleImpl::ClaimInterface(int interface_number,
void UsbDeviceHandleImpl::ReleaseInterface(int interface_number,
const ResultCallback& callback) {
DCHECK(thread_checker_.CalledOnValidThread());
- if (!device_ || !ContainsKey(claimed_interfaces_, interface_number)) {
+ if (!device_ || !base::ContainsKey(claimed_interfaces_, interface_number)) {
task_runner_->PostTask(FROM_HERE, base::Bind(callback, false));
return;
}
@@ -652,7 +652,7 @@ void UsbDeviceHandleImpl::SetInterfaceAlternateSetting(
int alternate_setting,
const ResultCallback& callback) {
DCHECK(thread_checker_.CalledOnValidThread());
- if (!device_ || !ContainsKey(claimed_interfaces_, interface_number)) {
+ if (!device_ || !base::ContainsKey(claimed_interfaces_, interface_number)) {
callback.Run(false);
return;
}
@@ -1113,7 +1113,8 @@ void UsbDeviceHandleImpl::SubmitTransfer(std::unique_ptr<Transfer> transfer) {
void UsbDeviceHandleImpl::TransferComplete(Transfer* transfer,
const base::Closure& callback) {
DCHECK(thread_checker_.CalledOnValidThread());
- DCHECK(ContainsKey(transfers_, transfer)) << "Missing transfer completed";
+ DCHECK(base::ContainsKey(transfers_, transfer))
+ << "Missing transfer completed";
transfers_.erase(transfer);
if (transfer->callback_task_runner()->RunsTasksOnCurrentThread()) {
« no previous file with comments | « device/usb/mojo/device_impl_unittest.cc ('k') | device/usb/usb_device_handle_usbfs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698