device/test/usb_test_gadget_impl.cc - Issue 497363004: Merge components/usb_service into device/usb.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: device/test/usb_test_gadget_impl.cc

Issue 497363004: Merge components/usb_service into device/usb. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased. Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: device/test/usb_test_gadget_impl.cc

diff --git a/device/test/usb_test_gadget_impl.cc b/device/test/usb_test_gadget_impl.cc

index e95188b9789b134b8b5188176ec6b20959e98233..5450b9e31e4c64add1db09243afb1404a5cea08e 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 {

« no previous file with comments | « device/test/usb_test_gadget.h ('k') | device/usb/BUILD.gn » ('j') | no next file with comments »