Merge ChooserService mojom interface into WebUsbService.
BUG=699790
Change-Id: I4f1d5d6815a2c5cf220c6ee556ba068e03e3b90d
Reviewed-on: https://chromium-review.googlesource.com/1164639
Commit-Queue: Donna Wu <[email protected]>
Reviewed-by: Reilly Grant <[email protected]>
Reviewed-by: Lei Zhang <[email protected]>
Reviewed-by: Kinuko Yasuda <[email protected]>
Cr-Commit-Position: refs/heads/master@{#583574}diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 51effba..0f4b800e 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1582,8 +1582,8 @@
"usb/usb_chooser_controller.h",
"usb/usb_tab_helper.cc",
"usb/usb_tab_helper.h",
- "usb/web_usb_chooser_service.cc",
- "usb/web_usb_chooser_service.h",
+ "usb/web_usb_chooser.cc",
+ "usb/web_usb_chooser.h",
"usb/web_usb_histograms.cc",
"usb/web_usb_histograms.h",
"usb/web_usb_permission_provider.cc",
@@ -2294,8 +2294,8 @@
"android/trusted_cdn.cc",
"android/trusted_cdn.h",
"android/url_utilities.cc",
- "android/usb/web_usb_chooser_service_android.cc",
- "android/usb/web_usb_chooser_service_android.h",
+ "android/usb/web_usb_chooser_android.cc",
+ "android/usb/web_usb_chooser_android.h",
"android/warmup_manager.cc",
"android/web_contents_factory.cc",
"android/webapk/chrome_webapk_host.cc",
@@ -2961,8 +2961,8 @@
"upgrade_detector/upgrade_detector.cc",
"upgrade_detector/upgrade_detector.h",
"upgrade_detector/upgrade_observer.h",
- "usb/web_usb_chooser_service_desktop.cc",
- "usb/web_usb_chooser_service_desktop.h",
+ "usb/web_usb_chooser_desktop.cc",
+ "usb/web_usb_chooser_desktop.h",
"usb/web_usb_detector.cc",
"usb/web_usb_detector.h",
]
