Usb backend refactor step 2: Separate Usb Device Handle and Usb Device (deprecate)

chrome/browser/devtools/adb/android_usb_device.cc

 // Copyright (c) 2013 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.
 
 #include "chrome/browser/devtools/adb/android_usb_device.h"
 
 #include "base/base64.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/devtools/adb/android_rsa.h"
@@ skipping 185 matching lines @@
 
 AdbMessage::~AdbMessage() {
 }
 
 // static
 void AndroidUsbDevice::Enumerate(Profile* profile, Devices* devices) {
   UsbService* service =
       UsbServiceFactory::GetInstance()->GetForProfile(profile);
 
   // Enumerate usb devices.
-  std::vector<scoped_refptr<UsbDevice> > usb_devices;
-  service->EnumerateDevices(&usb_devices);
+  std::vector<int> usb_devices;
+  service->GetDevices(&usb_devices);
   for (size_t i = 0; i < usb_devices.size(); ++i) {
-    scoped_refptr<UsbDevice> usb_device = usb_devices[i];
-
+    int usb_device_id = usb_devices[i];
+    scoped_refptr<UsbDevice> usb_device = service->OpenDevice(usb_device_id);
     // Enumerate device interfaces.
     scoped_refptr<UsbConfigDescriptor> config = new UsbConfigDescriptor();
     usb_device->ListInterfaces(config.get(), base::Bind(&BoolNoop));
     for (size_t i = 0; i < config->GetNumInterfaces(); ++i)
       ClaimInterface(profile, usb_device, config->GetInterface(i), devices);
   }
 }
 
 AndroidUsbDevice::AndroidUsbDevice(Profile* profile,
                                    scoped_refptr<UsbDevice> usb_device,
@@ skipping 247 matching lines @@
        it != sockets_.end(); ++it) {
     it->second->Terminated();
   }
   usb_device_->ReleaseInterface(1, base::Bind(&BoolNoop));
   usb_device_->Close(base::Bind(&Noop));
 }
 
 void AndroidUsbDevice::SocketDeleted(uint32 socket_id) {
   sockets_.erase(socket_id);
 }