Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / dbus / cros_dbus_service.cc

diff --git a/src/chrome/browser/chromeos/dbus/cros_dbus_service.cc b/src/chrome/browser/chromeos/dbus/cros_dbus_service.cc
index 3694872..aebd183 100644 (file)
--- a/src/chrome/browser/chromeos/dbus/cros_dbus_service.cc
+++ b/src/chrome/browser/chromeos/dbus/cros_dbus_service.cc
@@ -122,9 +122,13 @@ void CrosDBusService::Initialize() {
   if (base::SysInfo::IsRunningOnChromeOS() && bus) {
     CrosDBusServiceImpl* service = new CrosDBusServiceImpl(bus);
     service->RegisterServiceProvider(ProxyResolutionServiceProvider::Create());
+#if !defined(USE_ATHENA)
+    // crbug.com/413897
     service->RegisterServiceProvider(new DisplayPowerServiceProvider);
-    service->RegisterServiceProvider(new LivenessServiceProvider);
+    // crbug.com/401285
     service->RegisterServiceProvider(new PrinterServiceProvider);
+#endif
+    service->RegisterServiceProvider(new LivenessServiceProvider);
     service->RegisterServiceProvider(new ScreenLockServiceProvider);
     g_cros_dbus_service = service;
     service->Start();