Revert of Build a basic Mojo service framework for device/usb (patchset

chromium#4 id:60001 of https://codereview.chromium.org/1155163008/) Reason for revert: Broken Win8 GN build http://build.chromium.org/p/chromium.win/builders/Win8%20GN%20%28dbg%29/builds/6609 Original issue's description: > Build a basic Mojo service framework for device/usb > > BUG=492805 > R=reillyg@chromium.org > > Committed: https://crrev.com/249cc25c5e0a2e338cd3efec6e1a3964e7c983e9 > Cr-Commit-Position: refs/heads/master@{#331707} TBR=reillyg@chromium.org,sky@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=492805 Review URL: https://codereview.chromium.org/1158323002 Cr-Commit-Position: refs/heads/master@{#331709}
Denger-Network · May 28, 2015 · c710e98 · c710e98
1 parent 618db46
commit c710e98
Show file tree

Hide file tree

Showing 26 changed files with 4 additions and 970 deletions.
diff --git a/chrome/browser/OWNERS b/chrome/browser/OWNERS
@@ -10,9 +10,6 @@ per-file chrome_content_browser_client_unittest.cc=*
 per-file chrome_browser_field_trials*=asvitkine@chromium.org
 per-file chrome_browser_field_trials*=stevet@chromium.org
 
-per-file chrome_device_client*=reillyg@chromium.org
-per-file chrome_device_client*=rockot@chromium.org
-
 per-file chrome_elf_init_*=csharp@chromium.org
 per-file chrome_elf_init_*=robertshield@chromium.org
 

diff --git a/chrome/browser/chrome_device_client.cc b/chrome/browser/chrome_device_client.cc
@@ -5,34 +5,12 @@
 #include "chrome/browser/chrome_device_client.h"
 
 #include "base/logging.h"
-#include "base/macros.h"
 #include "content/public/browser/browser_thread.h"
 #include "device/hid/hid_service.h"
-#include "device/usb/public/cpp/device_manager_delegate.h"
-#include "device/usb/public/cpp/device_manager_factory.h"
-#include "device/usb/public/interfaces/device.mojom.h"
 #include "device/usb/usb_service.h"
 
 using content::BrowserThread;
 
-namespace {
-
-// DeviceManagerDelegate implementation which allows access to all devices.
-class BrowserDeviceManagerDelegate : public device::usb::DeviceManagerDelegate {
- public:
-  BrowserDeviceManagerDelegate() {}
-  ~BrowserDeviceManagerDelegate() override {}
-
- private:
-  bool IsDeviceAllowed(const device::usb::DeviceInfo& device) override {
-    return true;
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(BrowserDeviceManagerDelegate);
-};
-
-}  // namespace
-
 ChromeDeviceClient::ChromeDeviceClient() {}
 
 ChromeDeviceClient::~ChromeDeviceClient() {}
@@ -43,14 +21,6 @@ device::UsbService* ChromeDeviceClient::GetUsbService() {
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
 }
 
-void ChromeDeviceClient::ConnectToUSBDeviceManager(
-    mojo::InterfaceRequest<device::usb::DeviceManager> request) {
-  device::usb::DeviceManagerFactory::Build(
-      request.Pass(),
-      scoped_ptr<device::usb::DeviceManagerDelegate>(
-          new BrowserDeviceManagerDelegate));
-}
-
 device::HidService* ChromeDeviceClient::GetHidService() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return device::HidService::GetInstance(

diff --git a/chrome/browser/chrome_device_client.h b/chrome/browser/chrome_device_client.h
@@ -15,12 +15,10 @@
 class ChromeDeviceClient : device::DeviceClient {
  public:
   ChromeDeviceClient();
-  ~ChromeDeviceClient() override;
+  virtual ~ChromeDeviceClient();
 
   // device::DeviceClient implementation
   device::UsbService* GetUsbService() override;
-  void ConnectToUSBDeviceManager(
-      mojo::InterfaceRequest<device::usb::DeviceManager> request) override;
   device::HidService* GetHidService() override;
 
  private:

diff --git a/device/BUILD.gn b/device/BUILD.gn
@@ -91,18 +91,13 @@ test("device_unittests") {
   if (!is_android && !is_ios) {
     sources += [
       "test/usb_test_gadget_impl.cc",
-      "usb/device_impl_unittest.cc",
-      "usb/device_manager_impl_unittest.cc",
       "usb/usb_context_unittest.cc",
       "usb/usb_device_filter_unittest.cc",
       "usb/usb_device_handle_unittest.cc",
       "usb/usb_ids_unittest.cc",
       "usb/usb_service_unittest.cc",
     ]
     deps += [
-      "//device/core",
-      "//device/usb/public/cpp",
-      "//device/usb/public/interfaces",
       "//device/usb",
       "//device/usb:mocks",
       "//third_party/libusb",

diff --git a/device/core/BUILD.gn b/device/core/BUILD.gn
@@ -10,8 +10,7 @@ source_set("core") {
     "device_monitor_win.h",
   ]
 
-  public_deps = [
+  deps = [
     "//base",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
   ]
 }
diff --git a/device/core/core.gyp b/device/core/core.gyp
@@ -19,9 +19,6 @@
         'device_monitor_win.cc',
         'device_monitor_win.h',
       ],
-      'dependencies': [
-        '<(DEPTH)/third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
-      ],
     },
   ],
 }
diff --git a/device/core/device_client.cc b/device/core/device_client.cc
@@ -35,10 +35,6 @@ UsbService* DeviceClient::GetUsbService() {
   return NULL;
 }
 
-void DeviceClient::ConnectToUSBDeviceManager(
-    mojo::InterfaceRequest<usb::DeviceManager> request) {
-}
-
 HidService* DeviceClient::GetHidService() {
   // This should never be called by clients which do not support the HID API.
   NOTREACHED();

diff --git a/device/core/device_client.h b/device/core/device_client.h
@@ -6,17 +6,12 @@
 #define DEVICE_CORE_DEVICE_CLIENT_H_
 
 #include "base/macros.h"
-#include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 
 namespace device {
 
 class HidService;
 class UsbService;
 
-namespace usb {
-class DeviceManager;
-}
-
 // Interface used by consumers of //device APIs to get pointers to the service
 // singletons appropriate for a given embedding application. For an example see
 // //chrome/browser/chrome_device_client.h.
@@ -26,19 +21,14 @@ class DeviceClient {
   DeviceClient();
 
   // Destruction clears the single instance.
-  virtual ~DeviceClient();
+  ~DeviceClient();
 
   // Returns the single instance of |this|.
   static DeviceClient* Get();
 
   // Returns the UsbService instance for this embedder.
   virtual UsbService* GetUsbService();
 
-  // Connects a USB DeviceManager client to a concrete implementation. If
-  // no such implementation is available the request is dropped.
-  virtual void ConnectToUSBDeviceManager(
-      mojo::InterfaceRequest<usb::DeviceManager> request);
-
   // Returns the HidService instance for this embedder.
   virtual HidService* GetHidService();
 

diff --git a/device/device_tests.gyp b/device/device_tests.gyp
@@ -66,8 +66,6 @@
         'serial/serial_service_unittest.cc',
         'test/run_all_unittests.cc',
         'test/usb_test_gadget_impl.cc',
-        'usb/device_impl_unittest.cc',
-        'usb/device_manager_impl_unittest.cc',
         'usb/usb_context_unittest.cc',
         'usb/usb_device_filter_unittest.cc',
         'usb/usb_device_handle_unittest.cc',

diff --git a/device/usb/BUILD.gn b/device/usb/BUILD.gn
@@ -9,12 +9,6 @@ generated_ids = "$target_gen_dir/usb_ids_gen.cc"
 
 source_set("usb") {
   sources = [
-    "device_impl.cc",
-    "device_impl.h",
-    "device_manager_impl.cc",
-    "device_manager_impl.h",
-    "type_converters.cc",
-    "type_converters.h",
     "usb_context.cc",
     "usb_context.h",
     "usb_descriptors.cc",
@@ -45,8 +39,6 @@ source_set("usb") {
     "//base/third_party/dynamic_annotations",
     "//components/device_event_log",
     "//device/core",
-    "//device/usb/public/cpp",
-    "//device/usb/public/interfaces",
     "//net",
     "//third_party/libusb",
   ]

diff --git a/device/usb/device_impl.cc b/device/usb/device_impl.cc
diff --git a/device/usb/device_impl.h b/device/usb/device_impl.h
diff --git a/device/usb/device_impl_unittest.cc b/device/usb/device_impl_unittest.cc