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

Unified Diff: extensions/common/permissions/usb_device_permission_unittest.cc

Issue 672403002: Cleanup: Remove most enable_extensions logic in extensions code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android Created 6 years, 2 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 | « extensions/common/permissions/usb_device_permission.cc ('k') | extensions/extensions.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/permissions/usb_device_permission_unittest.cc
diff --git a/extensions/common/permissions/usb_device_permission_unittest.cc b/extensions/common/permissions/usb_device_permission_unittest.cc
index ee929326046cce45af29dd510d4e84b338fcdab2..25d3137e061deea589f9e362fa276671fe687f29 100644
--- a/extensions/common/permissions/usb_device_permission_unittest.cc
+++ b/extensions/common/permissions/usb_device_permission_unittest.cc
@@ -27,13 +27,7 @@ TEST(USBDevicePermissionTest, PermissionDataOrder) {
UsbDevicePermissionData(0x02ad, 0x138c, 0));
}
-#if defined(ENABLE_EXTENSIONS)
-#define MAYBE_PermissionMessage PermissionMessage
-#else
-#define MAYBE_PermissionMessage DISABLED_PermissionMessage
-#endif // defined(ENABLE_EXTENSIONS)
-
-TEST(USBDevicePermissionTest, MAYBE_PermissionMessage) {
+TEST(USBDevicePermissionTest, PermissionMessage) {
const char* const kMessages[] = {
"Access the USB device PVR Mass Storage from HUMAX Co., Ltd.",
"Access the USB device from HUMAX Co., Ltd.",
« no previous file with comments | « extensions/common/permissions/usb_device_permission.cc ('k') | extensions/extensions.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698