Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3622)

Unified Diff: device/usb/usb_context_unittest.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/usb/usb_context.cc ('k') | device/usb/usb_device.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/usb/usb_context_unittest.cc
diff --git a/components/usb_service/usb_context_unittest.cc b/device/usb/usb_context_unittest.cc
similarity index 92%
rename from components/usb_service/usb_context_unittest.cc
rename to device/usb/usb_context_unittest.cc
index 2722cc563c154d05d00dd09b2349fd59e206c720..e00062ccad616b35e072510f240869253fdd00fd 100644
--- a/components/usb_service/usb_context_unittest.cc
+++ b/device/usb/usb_context_unittest.cc
@@ -4,12 +4,11 @@
#include "base/threading/platform_thread.h"
#include "build/build_config.h"
-#include "components/usb_service/usb_context.h"
+#include "device/usb/usb_context.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/libusb/src/libusb/libusb.h"
-using usb_service::UsbContext;
-using usb_service::PlatformUsbContext;
+namespace device {
namespace {
@@ -51,3 +50,5 @@ TEST_F(UsbContextTest, MAYBE_GracefulShutdown) {
FAIL();
}
}
+
+} // namespace device
« no previous file with comments | « device/usb/usb_context.cc ('k') | device/usb/usb_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698