Remove //device/devices_app.
This change removes the code to create a Mojo app containing device
services (currently only USB) and instead makes the Mojo bindings for
//device/usb part of that directory.
The Mojo service implementation is still in a separate //device/usb/mojo
target but this will eventually merge into its parent directory as the
Mojo interface becomes the only public interface for //device/usb.
BUG=None
Review URL: https://codereview.chromium.org/1682363002
Cr-Commit-Position: refs/heads/master@{#374778}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 7cfd4d932..cd5004b 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -357,10 +357,8 @@
"//components/webusb",
"//content/app/resources",
"//device/core",
- "//device/devices_app/public/cpp",
- "//device/devices_app/public/cpp:factory",
- "//device/devices_app/usb/public/interfaces",
- "//device/usb",
+ "//device/usb/mojo",
+ "//device/usb/public/interfaces",
"//media",
"//media/midi",
"//mojo/common",
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index cfa2432c..e2e64e8 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -16,7 +16,6 @@
"+courgette",
"+device/bluetooth",
"+device/core",
- "+device/devices_app/usb",
"+device/hid",
"+device/usb",
"+device/media_transfer_protocol",
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 6e7a230..819c6d7 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -151,7 +151,7 @@
#include "content/public/common/service_registry.h"
#include "content/public/common/url_utils.h"
#include "content/public/common/web_preferences.h"
-#include "device/devices_app/usb/public/interfaces/device_manager.mojom.h"
+#include "device/usb/public/interfaces/device_manager.mojom.h"
#include "gin/v8_initializer.h"
#include "mojo/shell/public/cpp/shell_client.h"
#include "net/base/mime_util.h"
diff --git a/chrome/browser/usb/DEPS b/chrome/browser/usb/DEPS
index 1e0f248..a41ab27 100644
--- a/chrome/browser/usb/DEPS
+++ b/chrome/browser/usb/DEPS
@@ -2,6 +2,5 @@
"+chrome/browser/ui",
"+components/bubble",
"+device/core",
- "+device/devices_app/usb/public",
"+device/usb",
]
diff --git a/chrome/browser/usb/usb_chooser_bubble_delegate.cc b/chrome/browser/usb/usb_chooser_bubble_delegate.cc
index 7ef9ea5..61549c4 100644
--- a/chrome/browser/usb/usb_chooser_bubble_delegate.cc
+++ b/chrome/browser/usb/usb_chooser_bubble_delegate.cc
@@ -17,7 +17,7 @@
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
#include "device/core/device_client.h"
-#include "device/devices_app/usb/type_converters.h"
+#include "device/usb/mojo/type_converters.h"
#include "device/usb/usb_device.h"
#include "device/usb/usb_device_filter.h"
#include "url/gurl.h"
diff --git a/chrome/browser/usb/usb_tab_helper.cc b/chrome/browser/usb/usb_tab_helper.cc
index dd2fd846..8e235e4 100644
--- a/chrome/browser/usb/usb_tab_helper.cc
+++ b/chrome/browser/usb/usb_tab_helper.cc
@@ -9,7 +9,7 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/usb/web_usb_permission_bubble.h"
#include "chrome/browser/usb/web_usb_permission_provider.h"
-#include "device/devices_app/usb/device_manager_impl.h"
+#include "device/usb/mojo/device_manager_impl.h"
using content::RenderFrameHost;
using content::WebContents;
diff --git a/chrome/browser/usb/web_usb_permission_provider.h b/chrome/browser/usb/web_usb_permission_provider.h
index f8578e1..37889e0 100644
--- a/chrome/browser/usb/web_usb_permission_provider.h
+++ b/chrome/browser/usb/web_usb_permission_provider.h
@@ -7,7 +7,7 @@
#include <stdint.h>
-#include "device/devices_app/usb/public/interfaces/permission_provider.mojom.h"
+#include "device/usb/public/interfaces/permission_provider.mojom.h"
#include "mojo/common/weak_binding_set.h"
#include "mojo/public/cpp/bindings/array.h"
#include "mojo/public/cpp/bindings/interface_request.h"
