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

Unified Diff: chrome/browser/extensions/api/image_writer_private/removable_storage_provider_win.cc

Issue 266363006: Adds API tests for listRemovableStorageDevices (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resync. Created 6 years, 7 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
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 cfd232431dc0b9eda5b3fcaca4f9e3876fc2ac51..ffac02d3b772fa6eaa24f9b2ad207b51a3498c47 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
@@ -18,7 +18,7 @@ namespace {
bool AddDeviceInfo(HANDLE interface_enumerator,
SP_DEVICE_INTERFACE_DATA* interface_data,
- StorageDeviceList* device_list) {
+ scoped_refptr<StorageDeviceList> device_list) {
// Get the required buffer size by calling with a null output buffer.
DWORD interface_detail_data_size;
BOOL status = SetupDiGetDeviceInterfaceDetail(
@@ -149,7 +149,10 @@ bool AddDeviceInfo(HANDLE interface_enumerator,
return true;
}
-bool PopulateList(StorageDeviceList* device_list) {
+} // namespace
+
+bool RemovableStorageProvider::PopulateDeviceList(
+ scoped_refptr<StorageDeviceList> device_list) {
HDEVINFO interface_enumerator = SetupDiGetClassDevs(
&DiskClassGuid,
NULL, // Enumerator.
@@ -188,16 +191,4 @@ bool PopulateList(StorageDeviceList* device_list) {
return true;
}
-} // namespace
-
-void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) {
- scoped_refptr<StorageDeviceList> device_list(new StorageDeviceList());
-
- if (PopulateList(device_list.get())) {
- callback.Run(device_list, true);
- } else {
- callback.Run(device_list, false);
- }
-}
-
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698