Move device opening from DeviceManager to Device.

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 39 matching lines @@
     connection_error_handler_ = error_handler;
   }
 
  private:
   class ServiceThreadHelper;
 
   // 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 OnGotDeviceInfoForOpen(mojo::InterfaceRequest<Device> device_request,
-                              const OpenDeviceCallback& callback,
-                              DeviceInfoPtr device_info);
-  void OnOpenDevicePermissionCheckComplete(
-      mojo::InterfaceRequest<Device> device_request,
-      const OpenDeviceCallback& callback,
-      mojo::Array<mojo::String> allowed_guids);
+  void GetDevice(const mojo::String& guid,
+                 mojo::InterfaceRequest<Device> device_request) override;
 
   // Callbacks to handle the async responses from the underlying UsbService.
+  void OnGetDevice(mojo::InterfaceRequest<Device> device_request,
+                   scoped_refptr<UsbDevice> device);
+  void OnGetDevicePermissionCheckComplete(
+      scoped_refptr<device::UsbDevice> device,
+      mojo::InterfaceRequest<Device> device_request,
+      mojo::Array<mojo::String> allowed_guids);
   void OnGetDevices(EnumerationOptionsPtr options,
                     const GetDevicesCallback& callback,
                     const DeviceList& devices);
 
   // Methods called by |helper_| when devices are added or removed.
   void OnDeviceAdded(scoped_refptr<device::UsbDevice> device);
   void OnDeviceRemoved(scoped_refptr<device::UsbDevice> device);
   void MaybeRunDeviceChangesCallback();
   void OnEnumerationPermissionCheckComplete(
       const DeviceMap& devices_added,
@@ skipping 23 matching lines @@
   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_