dbus: Provide LivenessService.CheckLiveness

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 435157dc78acfc12455faeafe953dd2e9347d3b3..354d48d156a89b04f55ce68acf44f164f4a85e67 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -288,7 +288,10 @@ class DBusServices {
       service_providers.push_back(base::MakeUnique<DisplayPowerServiceProvider>(
           base::MakeUnique<ChromeDisplayPowerServiceProviderDelegate>()));
     }
-    service_providers.push_back(base::MakeUnique<LivenessServiceProvider>());
+    // TODO(teravest): Remove this provider once all callers are using
+    // |liveness_service_| instead: http://crbug.com/644322
+    service_providers.push_back(
+        base::MakeUnique<LivenessServiceProvider>(kLibCrosServiceInterface));
     service_providers.push_back(base::MakeUnique<ScreenLockServiceProvider>());
     // TODO(sky): once mash supports simplified display mode we should always
     // use ChromeConsoleServiceProviderDelegate.
@@ -323,6 +326,12 @@ class DBusServices {
                 kKioskAppServiceInterface,
                 kKioskAppServiceGetRequiredPlatformVersionMethod)));
 
+    liveness_service_ = CrosDBusService::Create(
+        kLivenessServiceName, dbus::ObjectPath(kLivenessServicePath),
+        CrosDBusService::CreateServiceProviderList(
+            base::MakeUnique<LivenessServiceProvider>(
+                kLivenessServiceInterface)));
+
     // Initialize PowerDataCollector after DBusThreadManager is initialized.
     PowerDataCollector::Initialize();
 
@@ -374,6 +383,7 @@ class DBusServices {
     cros_dbus_service_.reset();
     proxy_resolution_service_.reset();
     kiosk_info_service_.reset();
+    liveness_service_.reset();
     PowerDataCollector::Shutdown();
     PowerPolicyController::Shutdown();
     device::BluetoothAdapterFactory::Shutdown();
@@ -393,6 +403,7 @@ class DBusServices {
 
   std::unique_ptr<CrosDBusService> proxy_resolution_service_;
   std::unique_ptr<CrosDBusService> kiosk_info_service_;
+  std::unique_ptr<CrosDBusService> liveness_service_;
 
   std::unique_ptr<NetworkConnectDelegateChromeOS> network_connect_delegate_;