Split LivenessService out from LibCrosService.

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 1ee08dfe0278ba9a54298574e5e001efd9f3d5eb..7f859b95637d3b84d84a1fc54d9a1a1397534b36 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -238,7 +238,10 @@ class DBusServices {
       service_providers.push_back(base::MakeUnique<DisplayPowerServiceProvider>(
           base::MakeUnique<ChromeDisplayPowerServiceProviderDelegate>()));
     }
-    service_providers.push_back(base::MakeUnique<LivenessServiceProvider>());
+    // TODO(teravest): Remove this service provider once clients use
+    // LivenessService instead of LibCrosService.
+    service_providers.push_back(
+        base::MakeUnique<LivenessServiceProvider>(kLibCrosServiceInterface));
     service_providers.push_back(base::MakeUnique<ScreenLockServiceProvider>());
     if (ash_util::IsRunningInMash()) {
       service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>(
@@ -252,6 +255,13 @@ class DBusServices {
         kLibCrosServiceName, dbus::ObjectPath(kLibCrosServicePath),
         std::move(service_providers));
 
+    CrosDBusService::ServiceProviderList liveness_service_providers;
+    liveness_service_providers.push_back(
+        base::MakeUnique<LivenessServiceProvider>(kLivenessServiceInterface));
+    liveness_service_ = CrosDBusService::Create(
+        kLivenessServiceName, dbus::ObjectPath(kLivenessServicePath),
+        std::move(liveness_service_providers));
+
     // Initialize PowerDataCollector after DBusThreadManager is initialized.
     PowerDataCollector::Initialize();
 
@@ -301,6 +311,7 @@ class DBusServices {
     CertLoader::Shutdown();
     TPMTokenLoader::Shutdown();
     cros_dbus_service_.reset();
+    liveness_service_.reset();
     PowerDataCollector::Shutdown();
     PowerPolicyController::Shutdown();
     device::BluetoothAdapterFactory::Shutdown();
@@ -318,6 +329,8 @@ class DBusServices {
   // split between different processes: http://crbug.com/692246
   std::unique_ptr<CrosDBusService> cros_dbus_service_;
 
+  std::unique_ptr<CrosDBusService> liveness_service_;
+
   std::unique_ptr<NetworkConnectDelegateChromeOS> network_connect_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(DBusServices);