Pass full Mojo USB DeviceInfo object with removal notifications.

device/devices_app/usb/device_manager_impl.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef DEVICE_USB_DEVICE_MANAGER_IMPL_H_
 #define DEVICE_USB_DEVICE_MANAGER_IMPL_H_
 
 #include <queue>
 #include <set>
 
@@ skipping 32 matching lines @@
       scoped_refptr<base::SequencedTaskRunner> service_task_runner);
   ~DeviceManagerImpl() override;
 
   void set_connection_error_handler(const mojo::Closure& error_handler) {
     connection_error_handler_ = error_handler;
   }
 
  private:
   class ServiceThreadHelper;
 
+  typedef std::vector<scoped_refptr<UsbDevice>> DeviceList;

[Ken Rockot(use gerrit already), 2015/09/15 18:09:25]

nit: using instead of typedef

[Reilly Grant (use Gerrit), 2015/09/15 19:46:48]

Done.

+  typedef std::map<std::string, scoped_refptr<device::UsbDevice>> DeviceMap;
+
   // DeviceManager implementation:
   void GetDevices(EnumerationOptionsPtr options,
                   const GetDevicesCallback& callback) override;
   void GetDeviceChanges(const GetDeviceChangesCallback& callback) override;
   void OpenDevice(const mojo::String& guid,
                   mojo::InterfaceRequest<Device> device_request,
                   const OpenDeviceCallback& callback) override;
 
   void OnOpenDevicePermissionCheckComplete(
       mojo::InterfaceRequest<Device> device_request,
       const OpenDeviceCallback& callback,
       mojo::Array<mojo::String> allowed_guids);
 
   // Callbacks to handle the async responses from the underlying UsbService.
-  void OnGetDevices(const GetDevicesCallback& callback,
-                    mojo::Array<DeviceInfoPtr> devices);
+  void OnGetDevices(EnumerationOptionsPtr options,
+                    const GetDevicesCallback& callback,
+                    const DeviceList& devices);
 
   // Methods called by |helper_| when devices are added or removed.
-  void OnDeviceAdded(DeviceInfoPtr device);
-  void OnDeviceRemoved(std::string device_guid);
+  void OnDeviceAdded(scoped_refptr<device::UsbDevice> device);
+  void OnDeviceRemoved(scoped_refptr<device::UsbDevice> device);
   void MaybeRunDeviceChangesCallback();
   void OnEnumerationPermissionCheckComplete(
-      mojo::Array<DeviceInfoPtr> devices_added,
-      const std::set<std::string>& devices_removed,
+      const DeviceMap& devices_added,
+      const DeviceMap& devices_removed,
       mojo::Array<mojo::String> allowed_guids);
 
   PermissionProviderPtr permission_provider_;
   scoped_refptr<base::SequencedTaskRunner> service_task_runner_;
 
   // If there are unfinished calls to GetDeviceChanges their callbacks
   // are stored in |device_change_callbacks_|. Otherwise device changes
   // are collected in |devices_added_| and |devices_removed_| until the
   // next call to GetDeviceChanges.
   std::queue<GetDeviceChangesCallback> device_change_callbacks_;
-  mojo::Array<DeviceInfoPtr> devices_added_;
-  std::set<std::string> devices_removed_;
+  DeviceMap devices_added_;
+  DeviceMap devices_removed_;
   // To ensure that GetDeviceChangesCallbacks are called in the correct order
   // only perform a single request to |permission_provider_| at a time.
   bool permission_request_pending_ = false;
 
   // |helper_| is owned by the service thread and holds a weak reference
   // back to the device manager that created it.
   ServiceThreadHelper* helper_;
 
   mojo::Closure connection_error_handler_;
 
   mojo::Binding<DeviceManager> binding_;
   base::WeakPtrFactory<DeviceManagerImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceManagerImpl);
 };
 
 }  // namespace usb
 }  // namespace device
 
 #endif  // DEVICE_USB_DEVICE_MANAGER_IMPL_H_