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

chrome/browser/usb/usb_chooser_controller.cc

 // 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.
 
 #include "chrome/browser/usb/usb_chooser_controller.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 58 matching lines @@
   }
 
   return device_name;
 }
 
 }  // namespace
 
 UsbChooserController::UsbChooserController(
     RenderFrameHost* render_frame_host,
     const std::vector<UsbDeviceFilter>& device_filters,
-    const device::usb::ChooserService::GetPermissionCallback& callback)
+    const device::mojom::UsbChooserService::GetPermissionCallback& callback)
     : ChooserController(render_frame_host,
                         IDS_USB_DEVICE_CHOOSER_PROMPT_ORIGIN,
                         IDS_USB_DEVICE_CHOOSER_PROMPT_EXTENSION_NAME),
       filters_(device_filters),
       callback_(callback),
       usb_service_observer_(this),
       weak_factory_(this) {
   device::UsbService* usb_service =
       device::DeviceClient::Get()->GetUsbService();
   if (usb_service) {
@@ skipping 63 matching lines @@
 void UsbChooserController::Select(const std::vector<size_t>& indices) {
   DCHECK_EQ(1u, indices.size());
   size_t index = indices[0];
   DCHECK_LT(index, devices_.size());
 
   if (chooser_context_) {
     chooser_context_->GrantDevicePermission(
         requesting_origin_, embedding_origin_, devices_[index].first->guid());
   }
 
-  device::usb::DeviceInfoPtr device_info_ptr =
-      device::usb::DeviceInfo::From(*devices_[index].first);
+  auto device_info_ptr =
+      device::mojom::UsbDeviceInfo::From(*devices_[index].first);
   callback_.Run(std::move(device_info_ptr));

[mcasas, 2017/04/14 22:00:46]

nit:
  callback_.Run(device::mojom::UsbDeviceInfo::From(*devices_[index].first));
?
(under 80 chars, yay!)

[Reilly Grant (use Gerrit), 2017/04/14 22:15:30]

Done.

   callback_.Reset();  // Reset |callback_| so that it is only run once.
 
   RecordWebUsbChooserClosure(
       devices_[index].first->serial_number().empty()
           ? WEBUSB_CHOOSER_CLOSED_EPHEMERAL_PERMISSION_GRANTED
           : WEBUSB_CHOOSER_CLOSED_PERMISSION_GRANTED);
 }
 
 void UsbChooserController::Cancel() {
   RecordWebUsbChooserClosure(devices_.size() == 0
@@ skipping 60 matching lines @@
 
   // Embedded frames must have their origin in the list provided by the device.
   if (is_embedded_frame_) {
     return device::FindInWebUsbAllowedOrigins(device->webusb_allowed_origins(),
                                               requesting_origin_, base::nullopt,
                                               base::nullopt);
   }
 
   return true;
 }