commit 3686f3192def5015d68e59b64799cf68dbc2fc08
author Eric Caruso <ejcaruso@chromium.org> Wed Jan 31 12:27:18 2018 -0800
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Wed Feb 14 20:00:31 2018 +0000
tree 13229455359216f8d405a7093e93651ceecfb710
parent fd648a8c90a8397db6b7d48c4088ea745e23db1a

permission_broker: fix wrong #define

USE_DEVICE_JAIL was deprecated a long time ago. Change it to
USE_CONTAINERS which we should actually be using now.

BUG=chromium:798260
TEST=grab usb devices from vont

Change-Id: I097932612894fae37aae3836acf5e18657236e4b
Reviewed-on: https://chromium-review.googlesource.com/896113
Commit-Ready: Eric Caruso <ejcaruso@chromium.org>
Tested-by: Eric Caruso <ejcaruso@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
(cherry picked from commit ded807e3150d4fdc16b37b674fe7f3faa0875759)
Reviewed-on: https://chromium-review.googlesource.com/919582
Reviewed-by: Eric Caruso <ejcaruso@chromium.org>
Commit-Queue: Eric Caruso <ejcaruso@chromium.org>

permission_broker/permission_broker.cc

diff --git a/permission_broker/permission_broker.cc b/permission_broker/permission_broker.cc
index 2831ee8..edd4ca9 100644
--- a/permission_broker/permission_broker.cc
+++ b/permission_broker/permission_broker.cc
@@ -119,13 +119,15 @@
   rule_engine_.AddRule(new DenyClaimedHidrawDeviceRule());
   rule_engine_.AddRule(new DenyUnsafeHidrawDeviceRule());
 
-#if USE_DEVICE_JAIL
+#if USE_CONTAINERS
   // Try to serve device_jail requests. If we can't, it's not a huge deal.
   jail_server_ = device_jail::DeviceJailServer::CreateAndListen(
       std::make_unique<JailRequestHandler>(&rule_engine_),
       base::MessageLoopForIO::current());
   if (!jail_server_)
     LOG(WARNING) << "Jail server failed to start";
+#else
+  DLOG(INFO) << "Device jail support is turned off";
 #endif
 }