diff options
| author | reillyg <reillyg@chromium.org> | 2014-09-03 17:57:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-04 01:03:27 +0000 |
| commit | d77718de5c3963cf0fe31e59c27c3e2aebfb26cb (patch) | |
| tree | 65a996cddf74653fa2b4d1c3d583110eaa8132cf /device/test | |
| parent | 6b0fbe4cbbdd357a17c8a72f92535403fa50515a (diff) | |
| download | chromium_src-d77718de5c3963cf0fe31e59c27c3e2aebfb26cb.zip chromium_src-d77718de5c3963cf0fe31e59c27c3e2aebfb26cb.tar.gz chromium_src-d77718de5c3963cf0fe31e59c27c3e2aebfb26cb.tar.bz2 | |
Merge components/usb_service into device/usb.
Unify these two parts of out USB device support. The //device tree is
the cannonical location for hardware device APIs.
BUG=
Review URL: https://codereview.chromium.org/497363004
Cr-Commit-Position: refs/heads/master@{#293246}
Diffstat (limited to 'device/test')
| -rw-r--r-- | device/test/DEPS | 1 | ||||
| -rw-r--r-- | device/test/usb_test_gadget.h | 8 | ||||
| -rw-r--r-- | device/test/usb_test_gadget_impl.cc | 9 |
3 files changed, 6 insertions, 12 deletions
diff --git a/device/test/DEPS b/device/test/DEPS index 9b323d8..a29f20f 100644 --- a/device/test/DEPS +++ b/device/test/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+components/usb_service", "+mojo/embedder", "+net/proxy", "+net/url_request", diff --git a/device/test/usb_test_gadget.h b/device/test/usb_test_gadget.h index 1c835e2..1433bf8 100644 --- a/device/test/usb_test_gadget.h +++ b/device/test/usb_test_gadget.h @@ -10,12 +10,10 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -namespace usb_service { -class UsbDevice; -} // namespace usb_service - namespace device { +class UsbDevice; + class UsbTestGadget { public: enum Type { @@ -35,7 +33,7 @@ class UsbTestGadget { virtual bool Reconnect() = 0; virtual bool SetType(Type type) = 0; - virtual usb_service::UsbDevice* GetDevice() const = 0; + virtual UsbDevice* GetDevice() const = 0; virtual std::string GetSerial() const = 0; protected: diff --git a/device/test/usb_test_gadget_impl.cc b/device/test/usb_test_gadget_impl.cc index e95188b..5450b9e 100644 --- a/device/test/usb_test_gadget_impl.cc +++ b/device/test/usb_test_gadget_impl.cc @@ -23,9 +23,9 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/platform_thread.h" #include "base/time/time.h" -#include "components/usb_service/usb_device.h" -#include "components/usb_service/usb_device_handle.h" -#include "components/usb_service/usb_service.h" +#include "device/usb/usb_device.h" +#include "device/usb/usb_device_handle.h" +#include "device/usb/usb_service.h" #include "net/proxy/proxy_service.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" @@ -36,9 +36,6 @@ using ::base::PlatformThread; using ::base::TimeDelta; -using ::usb_service::UsbDevice; -using ::usb_service::UsbDeviceHandle; -using ::usb_service::UsbService; namespace device { |