components/usb_service/usb_device_impl.cc - Issue 500383003: Remove implicit conversions from scoped_refptr to T* in components/

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: components/usb_service/usb_device_impl.cc

Issue 500383003: Remove implicit conversions from scoped_refptr to T* in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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 | « components/usb_service/usb_device_handle_impl.cc ('k') | components/webdata/common/web_database_service.cc » ('j') | components/webdata/common/web_database_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/usb_service/usb_device_impl.cc

diff --git a/components/usb_service/usb_device_impl.cc b/components/usb_service/usb_device_impl.cc

index aaba7e34f09440ca455f991c2e6c3aae6d598c23..243d25d39e187f3102b0194768294419e117baa8 100644

--- a/components/usb_service/usb_device_impl.cc

+++ b/components/usb_service/usb_device_impl.cc

@@ -97,7 +97,7 @@ scoped_refptr<UsbDeviceHandle> UsbDeviceImpl::Open() {

const int rv = libusb_open(platform_device_, &handle);

if (LIBUSB_SUCCESS == rv) {

scoped_refptr<UsbConfigDescriptor> interfaces = ListInterfaces();

- if (!interfaces)

+ if (!interfaces.get())

return NULL;

scoped_refptr<UsbDeviceHandleImpl> device_handle =

new UsbDeviceHandleImpl(context_, this, handle, interfaces);

@@ -114,7 +114,7 @@ bool UsbDeviceImpl::Close(scoped_refptr<UsbDeviceHandle> handle) {

for (HandlesVector::iterator it = handles_.begin(); it != handles_.end();

++it) {

- if (*it == handle) {

+ if (it->get() == handle.get()) {

(*it)->InternalClose();

handles_.erase(it);

return true;