Index: chrome/browser/extensions/api/image_writer_private/removable_storage_provider_win.cc |
diff --git a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_win.cc b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_win.cc |
index e65f6e93ad42f2fb4a36ad86ba675159476767d6..6dd0e745de4c2dcc8a646d31d218fa5c5d7a3b58 100644 |
--- a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_win.cc |
+++ b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_win.cc |
@@ -69,7 +69,7 @@ bool AddDeviceInfo(HANDLE interface_enumerator, |
0, // No optional flags. |
NULL)); // No template file. |
- if (!device_handle) { |
+ if (!device_handle.IsValid()) { |
PLOG(ERROR) << "Opening device handle failed."; |
return false; |
} |
@@ -77,7 +77,7 @@ bool AddDeviceInfo(HANDLE interface_enumerator, |
DISK_GEOMETRY geometry; |
DWORD bytes_returned; |
status = DeviceIoControl( |
- device_handle, // Device handle. |
+ device_handle.Get(), // Device handle. |
IOCTL_DISK_GET_DRIVE_GEOMETRY, // Flag to request disk size. |
NULL, // Optional additional parameters. |
0, // Optional parameter size. |
@@ -103,7 +103,7 @@ bool AddDeviceInfo(HANDLE interface_enumerator, |
scoped_ptr<char[]> output_buf(new char[1024]); |
status = DeviceIoControl( |
- device_handle, // Device handle. |
+ device_handle.Get(), // Device handle. |
IOCTL_STORAGE_QUERY_PROPERTY, // Flag to request device properties. |
&query, // Query parameters. |
sizeof(STORAGE_PROPERTY_QUERY), // query parameters size. |
@@ -131,7 +131,7 @@ bool AddDeviceInfo(HANDLE interface_enumerator, |
// Create a drive identifier from the drive number. |
STORAGE_DEVICE_NUMBER device_number = {0}; |
status = DeviceIoControl( |
- device_handle, // Device handle. |
+ device_handle.Get(), // Device handle. |
IOCTL_STORAGE_GET_DEVICE_NUMBER,// Flag to request device number. |
NULL, // Query parameters, should be NULL. |
0, // Query parameters size, should be 0. |