Move classes in the device.usb Mojo namespace to device.mojom

device/usb/mojo/device_manager_impl.h

Index: device/usb/mojo/device_manager_impl.h
diff --git a/device/usb/mojo/device_manager_impl.h b/device/usb/mojo/device_manager_impl.h
index 9bb75492114d24ce558038ed26e7f207bee199e4..52c73a93ebdf9fa7e68a5ba3b57f2952815b2cbb 100644
--- a/device/usb/mojo/device_manager_impl.h
+++ b/device/usb/mojo/device_manager_impl.h
@@ -28,10 +28,11 @@ class PermissionProvider;
 
 // Implementation of the public DeviceManager interface. This interface can be
 // requested from the devices app located at "devices", if available.
-class DeviceManagerImpl : public DeviceManager, public UsbService::Observer {
+class DeviceManagerImpl : public mojom::UsbDeviceManager,
+                          public UsbService::Observer {
  public:
   static void Create(base::WeakPtr<PermissionProvider> permission_provider,
-                     DeviceManagerRequest request);
+                     mojom::UsbDeviceManagerRequest request);
 
   ~DeviceManagerImpl() override;
 
@@ -40,14 +41,14 @@ class DeviceManagerImpl : public DeviceManager, public UsbService::Observer {
                     UsbService* usb_service);
 
   // DeviceManager implementation:
-  void GetDevices(EnumerationOptionsPtr options,
+  void GetDevices(mojom::UsbEnumerationOptionsPtr options,
                   const GetDevicesCallback& callback) override;
   void GetDevice(const std::string& guid,
-                 DeviceRequest device_request) override;
-  void SetClient(DeviceManagerClientPtr client) override;
+                 mojom::UsbDeviceRequest device_request) override;
+  void SetClient(mojom::UsbDeviceManagerClientPtr client) override;
 
   // Callbacks to handle the async responses from the underlying UsbService.
-  void OnGetDevices(EnumerationOptionsPtr options,
+  void OnGetDevices(mojom::UsbEnumerationOptionsPtr options,
                     const GetDevicesCallback& callback,
                     const std::vector<scoped_refptr<UsbDevice>>& devices);
 
@@ -58,12 +59,12 @@ class DeviceManagerImpl : public DeviceManager, public UsbService::Observer {
 
   void MaybeRunDeviceChangesCallback();
 
-  mojo::StrongBindingPtr<DeviceManager> binding_;
+  mojo::StrongBindingPtr<mojom::UsbDeviceManager> binding_;
   base::WeakPtr<PermissionProvider> permission_provider_;
 
   UsbService* usb_service_;
   ScopedObserver<UsbService, UsbService::Observer> observer_;
-  DeviceManagerClientPtr client_;
+  mojom::UsbDeviceManagerClientPtr client_;
 
   base::WeakPtrFactory<DeviceManagerImpl> weak_factory_;