Create org.chromium.KioskAppService.

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 230 matching lines @@
     }
     service_providers.push_back(base::MakeUnique<LivenessServiceProvider>());
     service_providers.push_back(base::MakeUnique<ScreenLockServiceProvider>());
     if (ash_util::IsRunningInMash()) {
       service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>(
           base::MakeUnique<MusConsoleServiceProviderDelegate>()));
     } else {
       service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>(
           base::MakeUnique<ChromeConsoleServiceProviderDelegate>()));
     }
-    service_providers.push_back(base::MakeUnique<KioskInfoService>());
+    service_providers.push_back(base::MakeUnique<KioskInfoService>(
+        kLibCrosServiceInterface,
+        kKioskAppServiceGetRequiredPlatformVersionMethod));
     cros_dbus_service_ = CrosDBusService::Create(
         kLibCrosServiceName, dbus::ObjectPath(kLibCrosServicePath),
         std::move(service_providers));
 
+    CrosDBusService::ServiceProviderList kiosk_service_providers;
+    kiosk_service_providers.push_back(base::MakeUnique<KioskInfoService>(
+        kKioskAppServiceInterface,
+        kKioskAppServiceGetRequiredPlatformVersionMethod));
+    kiosk_info_service_ = CrosDBusService::Create(
+        kKioskAppServiceName, dbus::ObjectPath(kKioskAppServicePath),
+        std::move(kiosk_service_providers));

[Daniel Erat, 2017/04/05 02:55:41]

nit: no idea how clang-format will indent it, but how do things look if you
instead create the ServiceProviderList inline in the CrosDBusService::Create()
call? it feels like most/all of these service will just have a single provider,
so it might be nice to get rid of the local list vars.

[teravest, 2017/04/05 15:58:20]

I wrestled with this, but can't figure out how to create the vector inline.
push_back() seems to behave well with unique_ptr; list initialization always
tries to make a copy of the
unique_ptr<CrosDBusService::ServiceProviderInterface>, even when I wrap it in
std::move().

[Daniel Erat, 2017/04/05 18:18:00]

hmm. i take it that just passing e.g.

  {base::MakeUnique<KioskInfoService>(...)}

doesn't work either? i don't really understand the rules for when a
std::unique_ptr can be upcast, so

  {base::WrapUnique<ServiceProviderInterface>(
      new KioskInfoService(...))}

might be worth trying too if you haven't already. sigh.

+
     // Initialize PowerDataCollector after DBusThreadManager is initialized.
     PowerDataCollector::Initialize();
 
     LoginState::Initialize();
     SystemSaltGetter::Initialize();
     TPMTokenLoader::Initialize();
     CertLoader::Initialize();
 
     disks::DiskMountManager::Initialize();
     cryptohome::AsyncMethodCaller::Initialize();
@@ skipping 29 matching lines @@
     network_connect_delegate_.reset();
     CertLibrary::Shutdown();
     NetworkHandler::Shutdown();
     cryptohome::AsyncMethodCaller::Shutdown();
     disks::DiskMountManager::Shutdown();
     SystemSaltGetter::Shutdown();
     LoginState::Shutdown();
     CertLoader::Shutdown();
     TPMTokenLoader::Shutdown();
     cros_dbus_service_.reset();
+    kiosk_info_service_.reset();
     PowerDataCollector::Shutdown();
     PowerPolicyController::Shutdown();
     device::BluetoothAdapterFactory::Shutdown();
     bluez::BluezDBusManager::Shutdown();
 
     // NOTE: This must only be called if Initialize() was called.
     DBusThreadManager::Shutdown();
   }
 
  private:
   // Hosts providers for the "org.chromium.LibCrosService" D-Bus service owned
   // by Chrome. The name of this service was chosen for historical reasons that
   // are irrelevant now.
   // TODO(derat): Move these providers into more-specific services that are
   // split between different processes: http://crbug.com/692246
   std::unique_ptr<CrosDBusService> cros_dbus_service_;
+  std::unique_ptr<CrosDBusService> kiosk_info_service_;

[Daniel Erat, 2017/04/05 02:55:41]

nit: add a blank line above this line to make it clear that the comments above
aren't referring to it

[teravest, 2017/04/05 15:58:20]

Done.

 
   std::unique_ptr<NetworkConnectDelegateChromeOS> network_connect_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(DBusServices);
 };
 
 }  //  namespace internal
 
 // ChromeBrowserMainPartsChromeos ----------------------------------------------
 
@@ skipping 626 matching lines @@
 
   ChromeBrowserMainPartsLinux::PostDestroyThreads();
 
   // Destroy DeviceSettingsService after g_browser_process.
   DeviceSettingsService::Shutdown();
 
   chromeos::ShutdownCloseTracking();
 }
 
 }  //  namespace chromeos