chromeos: Remove last bits of org.chromium.LibCrosService.

Remove the org.chromium.LibCrosService.conf file that
declared permissions for the now-deleted LibCrosService
D-Bus service. Also update KioskInfoServiceProvider,
ScreenLockServiceProvider, and LivenessServiceProvider to no
longer support using arbitrary interface and method names,
as we only use them in their own dedicated services now.

Bug: 692246
Change-Id: I2b31f7d599f6bc0601e5ad84071abedc2a56651c
Reviewed-on: https://chromium-review.googlesource.com/1064730
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Dan Erat <derat@chromium.org>
Cr-Commit-Position: refs/heads/master@{#559677}

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -333,22 +333,17 @@ class DBusServices {
     kiosk_info_service_ = CrosDBusService::Create(
         kKioskAppServiceName, dbus::ObjectPath(kKioskAppServicePath),
         CrosDBusService::CreateServiceProviderList(
-            std::make_unique<KioskInfoService>(
-                kKioskAppServiceInterface,
-                kKioskAppServiceGetRequiredPlatformVersionMethod)));
+            std::make_unique<KioskInfoService>()));
 
     liveness_service_ = CrosDBusService::Create(
         kLivenessServiceName, dbus::ObjectPath(kLivenessServicePath),
         CrosDBusService::CreateServiceProviderList(
-            std::make_unique<LivenessServiceProvider>(
-                kLivenessServiceInterface)));
+            std::make_unique<LivenessServiceProvider>()));
 
     screen_lock_service_ = CrosDBusService::Create(
         kScreenLockServiceName, dbus::ObjectPath(kScreenLockServicePath),
         CrosDBusService::CreateServiceProviderList(
-            std::make_unique<ScreenLockServiceProvider>(
-                kScreenLockServiceInterface,
-                kScreenLockServiceShowLockScreenMethod)));
+            std::make_unique<ScreenLockServiceProvider>()));
 
     virtual_file_request_service_ = CrosDBusService::Create(
         kVirtualFileRequestServiceName,

chrome/browser/chromeos/dbus/kiosk_info_service_provider.cc

@@ -15,18 +15,15 @@
 
 namespace chromeos {
 
-KioskInfoService::KioskInfoService(const std::string& service_interface,
-                                   const std::string& method_name)
-    : service_interface_(service_interface),
-      method_name_(method_name),
-      weak_ptr_factory_(this) {}
+KioskInfoService::KioskInfoService() : weak_ptr_factory_(this) {}
 
-KioskInfoService::~KioskInfoService() {}
+KioskInfoService::~KioskInfoService() = default;
 
 void KioskInfoService::Start(
     scoped_refptr<dbus::ExportedObject> exported_object) {
   exported_object->ExportMethod(
-      service_interface_, method_name_,
+      kKioskAppServiceInterface,
+      kKioskAppServiceGetRequiredPlatformVersionMethod,
       base::Bind(&KioskInfoService::GetKioskAppRequiredPlatformVersion,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&KioskInfoService::OnExported,

chrome/browser/chromeos/dbus/kiosk_info_service_provider.h

@@ -24,10 +24,7 @@ namespace chromeos {
 //
 class KioskInfoService : public CrosDBusService::ServiceProviderInterface {
  public:
-  // TODO(teravest): Remove these extra parameters once this interface is fully
-  // migrated off of LibCrosService.
-  KioskInfoService(const std::string& service_interface,
-                   const std::string& method_name);
+  KioskInfoService();
   ~KioskInfoService() override;
 
   // CrosDBusService::ServiceProviderInterface
@@ -45,9 +42,6 @@ class KioskInfoService : public CrosDBusService::ServiceProviderInterface {
       dbus::MethodCall* method_call,
       dbus::ExportedObject::ResponseSender response_sender);
 
-  std::string service_interface_;
-  std::string method_name_;
-
   base::WeakPtrFactory<KioskInfoService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(KioskInfoService);

chrome/browser/chromeos/dbus/screen_lock_service_provider.cc

@@ -12,19 +12,15 @@
 
 namespace chromeos {
 
-ScreenLockServiceProvider::ScreenLockServiceProvider(
-    const std::string& interface_name,
-    const std::string& method_name)
-    : interface_name_(interface_name),
-      method_name_(method_name),
-      weak_ptr_factory_(this) {}
+ScreenLockServiceProvider::ScreenLockServiceProvider()
+    : weak_ptr_factory_(this) {}
 
-ScreenLockServiceProvider::~ScreenLockServiceProvider() {}
+ScreenLockServiceProvider::~ScreenLockServiceProvider() = default;
 
 void ScreenLockServiceProvider::Start(
     scoped_refptr<dbus::ExportedObject> exported_object) {
   exported_object->ExportMethod(
-      interface_name_, method_name_,
+      kScreenLockServiceInterface, kScreenLockServiceShowLockScreenMethod,
       base::BindRepeating(&ScreenLockServiceProvider::ShowLockScreen,
                           weak_ptr_factory_.GetWeakPtr()),
       base::BindRepeating(&ScreenLockServiceProvider::OnExported,
@@ -35,8 +31,7 @@ void ScreenLockServiceProvider::OnExported(const std::string& interface_name,
                                            const std::string& method_name,
                                            bool success) {
   if (!success) {
-    LOG(ERROR) << "Failed to export " << interface_name << "."
-               << method_name;
+    LOG(ERROR) << "Failed to export " << interface_name << "." << method_name;
   }
 }
 

chrome/browser/chromeos/dbus/screen_lock_service_provider.h

@@ -25,11 +25,7 @@ namespace chromeos {
 class ScreenLockServiceProvider
     : public CrosDBusService::ServiceProviderInterface {
  public:
-  // |interface_name| and |method_name| are exposed so the method can be
-  // exported on both org.chromium.LibCrosService and
-  // org.chromium.ScreenLockService: https://crbug.com/827680
-  ScreenLockServiceProvider(const std::string& interface_name,
-                            const std::string& method_name);
+  ScreenLockServiceProvider();
   ~ScreenLockServiceProvider() override;
 
   // CrosDBusService::ServiceProviderInterface overrides:
@@ -46,12 +42,6 @@ class ScreenLockServiceProvider
   void ShowLockScreen(dbus::MethodCall* method_call,
                       dbus::ExportedObject::ResponseSender response_sender);
 
-  // D-Bus interface and method names.
-  // TODO(derat): Remove once LibCrosService support is unneeded:
-  // https://crbug.com/827680
-  const std::string interface_name_;
-  const std::string method_name_;
-
   // Keep this last so that all weak pointers will be invalidated at the
   // beginning of destruction.
   base::WeakPtrFactory<ScreenLockServiceProvider> weak_ptr_factory_;

chromeos/BUILD.gn

@@ -555,7 +555,6 @@ copy("dbus_service_files") {
     "dbus/services/org.chromium.DisplayService.conf",
     "dbus/services/org.chromium.DriveFileStreamService.conf",
     "dbus/services/org.chromium.KioskAppService.conf",
-    "dbus/services/org.chromium.LibCrosService.conf",
     "dbus/services/org.chromium.LivenessService.conf",
     "dbus/services/org.chromium.NetworkProxyService.conf",
     "dbus/services/org.chromium.VirtualFileRequestService.conf",

chromeos/dbus/services/liveness_service_provider.cc

@@ -11,16 +11,14 @@
 
 namespace chromeos {
 
-LivenessServiceProvider::LivenessServiceProvider(
-    const std::string& service_interface)
-    : service_interface_(service_interface), weak_ptr_factory_(this) {}
+LivenessServiceProvider::LivenessServiceProvider() : weak_ptr_factory_(this) {}
 
 LivenessServiceProvider::~LivenessServiceProvider() = default;
 
 void LivenessServiceProvider::Start(
     scoped_refptr<dbus::ExportedObject> exported_object) {
   exported_object->ExportMethod(
-      service_interface_, kCheckLiveness,
+      kLivenessServiceInterface, kCheckLiveness,
       base::Bind(&LivenessServiceProvider::CheckLiveness,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&LivenessServiceProvider::OnExported,

chromeos/dbus/services/liveness_service_provider.h

@@ -36,7 +36,7 @@ namespace chromeos {
 class CHROMEOS_EXPORT LivenessServiceProvider
     : public CrosDBusService::ServiceProviderInterface {
  public:
-  explicit LivenessServiceProvider(const std::string& service_interface);
+  LivenessServiceProvider();
   ~LivenessServiceProvider() override;
 
   // CrosDBusService::ServiceProviderInterface overrides:
@@ -53,11 +53,6 @@ class CHROMEOS_EXPORT LivenessServiceProvider
   void CheckLiveness(dbus::MethodCall* method_call,
                      dbus::ExportedObject::ResponseSender response_sender);
 
-  // Name of the service interface to install LivenessService on.
-  // TODO(teravest): Remove this once CheckLiveness is removed from
-  // LibCrosService.
-  const std::string service_interface_;
-
   // Keep this last so that all weak pointers will be invalidated at the
   // beginning of destruction.
   base::WeakPtrFactory<LivenessServiceProvider> weak_ptr_factory_;