Consume Mojo services directly in Blink's WebUSB implementation.

content/renderer/usb/web_usb_client_impl.h

Index: content/renderer/usb/web_usb_client_impl.h
diff --git a/content/renderer/usb/web_usb_client_impl.h b/content/renderer/usb/web_usb_client_impl.h
deleted file mode 100644
index 10fe314447ebaa5bb95a2a7102d5d9bec4a81696..0000000000000000000000000000000000000000
--- a/content/renderer/usb/web_usb_client_impl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// 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 CONTENT_RENDERER_USB_WEB_USB_CLIENT_IMPL_H_
-#define CONTENT_RENDERER_USB_WEB_USB_CLIENT_IMPL_H_
-
-#include "base/macros.h"
-#include "device/usb/public/interfaces/chooser_service.mojom.h"
-#include "device/usb/public/interfaces/device_manager.mojom.h"
-#include "third_party/WebKit/public/platform/modules/webusb/WebUSBClient.h"
-
-namespace content {
-
-class ServiceRegistry;
-
-class WebUSBClientImpl : public blink::WebUSBClient {
- public:
-  explicit WebUSBClientImpl(ServiceRegistry* service_registry);
-  ~WebUSBClientImpl() override;
-
- private:
-  // blink::WebUSBClient implementation:
-  void getDevices(blink::WebUSBClientGetDevicesCallbacks* callbacks) override;
-  void requestDevice(
-      const blink::WebUSBDeviceRequestOptions& options,
-      blink::WebUSBClientRequestDeviceCallbacks* callbacks) override;
-  void addObserver(Observer* observer) override;
-  void removeObserver(Observer* observer) override;
-
-  device::usb::DeviceManager* GetDeviceManager();
-  void OnDeviceChangeNotification(
-      device::usb::DeviceChangeNotificationPtr notification);
-
-  ServiceRegistry* const service_registry_;
-  device::usb::DeviceManagerPtr device_manager_;
-  device::usb::ChooserServicePtr chooser_service_;
-  std::set<Observer*> observers_;
-
-  DISALLOW_COPY_AND_ASSIGN(WebUSBClientImpl);
-};
-
-}  // namespace content
-
-#endif  // CONTENT_RENDERER_USB_WEB_USB_CLIENT_IMPL_H_