scanning: move lorgnette D-Bus files to their own folder

To help declutter the top-level chromeos/dbus directory, move
all of the lorgnette-related files to their own directory.

Bug: b:169573779
Change-Id: I4937b50c4ef1dffaf677c090aa4e864367555040
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2495354
Commit-Queue: Paul Moy <pmoy@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821523}

chrome/browser/chromeos/BUILD.gn

@@ -144,7 +144,6 @@ source_set("chromeos") {
     "//chromeos/crosapi/mojom",
     "//chromeos/cryptohome",
     "//chromeos/dbus",
-    "//chromeos/dbus:lorgnette_proto",
     "//chromeos/dbus:metrics_event_proto",
     "//chromeos/dbus:oobe_config_proto",
     "//chromeos/dbus:plugin_vm_service_proto",
@@ -170,6 +169,8 @@ source_set("chromeos") {
     "//chromeos/dbus/ip_peripheral",
     "//chromeos/dbus/kerberos",
     "//chromeos/dbus/kerberos:kerberos_proto",
+    "//chromeos/dbus/lorgnette_manager",
+    "//chromeos/dbus/lorgnette_manager:lorgnette_proto",
     "//chromeos/dbus/machine_learning",
     "//chromeos/dbus/media_analytics",
     "//chromeos/dbus/media_analytics:media_perception_proto",
@@ -3857,7 +3858,6 @@ source_set("unit_tests") {
     "//chromeos/components/tether:test_support",
     "//chromeos/constants",
     "//chromeos/cryptohome:test_support",
-    "//chromeos/dbus:lorgnette_proto",
     "//chromeos/dbus:test_support",
     "//chromeos/dbus/attestation",
     "//chromeos/dbus/attestation:attestation_proto",
@@ -3865,6 +3865,7 @@ source_set("unit_tests") {
     "//chromeos/dbus/cryptohome",
     "//chromeos/dbus/cryptohome:attestation_proto",
     "//chromeos/dbus/dlcservice:test_support",
+    "//chromeos/dbus/lorgnette_manager:lorgnette_proto",
     "//chromeos/dbus/power",
     "//chromeos/dbus/services:test_support",
     "//chromeos/dbus/session_manager",

chrome/browser/chromeos/scanning/fake_lorgnette_scanner_manager.h

@@ -11,7 +11,7 @@
 #include "base/optional.h"
 #include "chrome/browser/chromeos/scanning/lorgnette_scanner_manager.h"
 #include "chromeos/dbus/lorgnette/lorgnette_service.pb.h"
-#include "chromeos/dbus/lorgnette_manager_client.h"
+#include "chromeos/dbus/lorgnette_manager/lorgnette_manager_client.h"
 
 namespace chromeos {
 

chrome/browser/chromeos/scanning/lorgnette_scanner_manager.cc

@@ -21,7 +21,7 @@
 #include "chrome/browser/chromeos/scanning/zeroconf_scanner_detector.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/lorgnette/lorgnette_service.pb.h"
-#include "chromeos/dbus/lorgnette_manager_client.h"
+#include "chromeos/dbus/lorgnette_manager/lorgnette_manager_client.h"
 #include "chromeos/scanning/scanner.h"
 #include "net/base/ip_address.h"
 #include "third_party/re2/src/re2/re2.h"

chrome/browser/chromeos/scanning/lorgnette_scanner_manager.h

@@ -13,7 +13,7 @@
 #include "base/callback.h"
 #include "base/optional.h"
 #include "chromeos/dbus/lorgnette/lorgnette_service.pb.h"
-#include "chromeos/dbus/lorgnette_manager_client.h"
+#include "chromeos/dbus/lorgnette_manager/lorgnette_manager_client.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 namespace chromeos {

chrome/browser/chromeos/scanning/lorgnette_scanner_manager_unittest.cc

@@ -21,8 +21,8 @@
 #include "chrome/browser/chromeos/scanning/zeroconf_scanner_detector_utils.h"
 #include "chrome/browser/local_discovery/service_discovery_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/fake_lorgnette_manager_client.h"
 #include "chromeos/dbus/lorgnette/lorgnette_service.pb.h"
+#include "chromeos/dbus/lorgnette_manager/fake_lorgnette_manager_client.h"
 #include "chromeos/scanning/scanner.h"
 #include "net/base/ip_address.h"
 #include "testing/gmock/include/gmock/gmock-matchers.h"

chromeos/dbus/BUILD.gn

@@ -17,6 +17,7 @@ component("dbus") {
     "//chromeos/dbus/arc",
     "//chromeos/dbus/constants",
     "//chromeos/dbus/debug_daemon",
+    "//chromeos/dbus/lorgnette_manager",
     "//chromeos/dbus/shill",
     "//dbus",
   ]
@@ -25,7 +26,6 @@ component("dbus") {
     ":chunneld_proto",
     ":cicerone_proto",
     ":concierge_proto",
-    ":lorgnette_proto",
     ":metrics_event_proto",
     ":oobe_config_proto",
     ":plugin_vm_service_proto",
@@ -83,8 +83,6 @@ component("dbus") {
     "fake_image_burner_client.h",
     "fake_image_loader_client.cc",
     "fake_image_loader_client.h",
-    "fake_lorgnette_manager_client.cc",
-    "fake_lorgnette_manager_client.h",
     "fake_oobe_configuration_client.cc",
     "fake_oobe_configuration_client.h",
     "fake_runtime_probe_client.cc",
@@ -105,8 +103,6 @@ component("dbus") {
     "image_burner_client.h",
     "image_loader_client.cc",
     "image_loader_client.h",
-    "lorgnette_manager_client.cc",
-    "lorgnette_manager_client.h",
     "oobe_configuration_client.cc",
     "oobe_configuration_client.h",
     "runtime_probe_client.cc",
@@ -258,13 +254,6 @@ proto_library("concierge_proto") {
   proto_out_dir = "chromeos/dbus/concierge"
 }
 
-proto_library("lorgnette_proto") {
-  sources =
-      [ "//third_party/cros_system_api/dbus/lorgnette/lorgnette_service.proto" ]
-
-  proto_out_dir = "chromeos/dbus/lorgnette"
-}
-
 proto_library("metrics_event_proto") {
   sources =
       [ "//third_party/cros_system_api/dbus/metrics_event/metrics_event.proto" ]

chromeos/dbus/dbus_clients_browser.cc

@@ -36,7 +36,6 @@
 #include "chromeos/dbus/fake_gnubby_client.h"
 #include "chromeos/dbus/fake_image_burner_client.h"
 #include "chromeos/dbus/fake_image_loader_client.h"
-#include "chromeos/dbus/fake_lorgnette_manager_client.h"
 #include "chromeos/dbus/fake_oobe_configuration_client.h"
 #include "chromeos/dbus/fake_runtime_probe_client.h"
 #include "chromeos/dbus/fake_seneschal_client.h"
@@ -46,7 +45,8 @@
 #include "chromeos/dbus/gnubby_client.h"
 #include "chromeos/dbus/image_burner_client.h"
 #include "chromeos/dbus/image_loader_client.h"
-#include "chromeos/dbus/lorgnette_manager_client.h"
+#include "chromeos/dbus/lorgnette_manager/fake_lorgnette_manager_client.h"
+#include "chromeos/dbus/lorgnette_manager/lorgnette_manager_client.h"
 #include "chromeos/dbus/oobe_configuration_client.h"
 #include "chromeos/dbus/runtime_probe_client.h"
 #include "chromeos/dbus/seneschal_client.h"

chromeos/dbus/dbus_thread_manager.cc

@@ -30,7 +30,7 @@
 #include "chromeos/dbus/gnubby_client.h"
 #include "chromeos/dbus/image_burner_client.h"
 #include "chromeos/dbus/image_loader_client.h"
-#include "chromeos/dbus/lorgnette_manager_client.h"
+#include "chromeos/dbus/lorgnette_manager/lorgnette_manager_client.h"
 #include "chromeos/dbus/runtime_probe_client.h"
 #include "chromeos/dbus/seneschal_client.h"
 #include "chromeos/dbus/shill/modem_messaging_client.h"

chromeos/dbus/lorgnette_manager/BUILD.gn

+# Copyright 2020 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.
+
+import("//third_party/protobuf/proto_library.gni")
+
+assert(is_chromeos, "Non-Chrome-OS builds cannot depend on //chromeos")
+
+component("lorgnette_manager") {
+  defines = [ "IS_LORGNETTE_MANAGER_IMPL" ]
+
+  public_deps = [ ":lorgnette_proto" ]
+
+  deps = [
+    "//base",
+    "//chromeos/dbus:common",
+    "//dbus",
+  ]
+
+  sources = [
+    "fake_lorgnette_manager_client.cc",
+    "fake_lorgnette_manager_client.h",
+    "lorgnette_manager_client.cc",
+    "lorgnette_manager_client.h",
+  ]
+}
+
+proto_library("lorgnette_proto") {
+  sources =
+      [ "//third_party/cros_system_api/dbus/lorgnette/lorgnette_service.proto" ]
+
+  proto_out_dir = "chromeos/dbus/lorgnette"
+}

chromeos/dbus/lorgnette_manager/OWNERS

+file://chromeos/scanning/OWNERS
\ No newline at end of file

chromeos/dbus/fake_lorgnette_manager_client.cc → chromeos/dbus/lorgnette_manager/fake_lorgnette_manager_client.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/dbus/fake_lorgnette_manager_client.h"
+#include "chromeos/dbus/lorgnette_manager/fake_lorgnette_manager_client.h"
 
 #include <utility>
 

chromeos/dbus/fake_lorgnette_manager_client.h → chromeos/dbus/lorgnette_manager/fake_lorgnette_manager_client.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_DBUS_FAKE_LORGNETTE_MANAGER_CLIENT_H_
-#define CHROMEOS_DBUS_FAKE_LORGNETTE_MANAGER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_LORGNETTE_MANAGER_FAKE_LORGNETTE_MANAGER_CLIENT_H_
+#define CHROMEOS_DBUS_LORGNETTE_MANAGER_FAKE_LORGNETTE_MANAGER_CLIENT_H_
 
 #include <cstdint>
 #include <string>
@@ -11,11 +11,11 @@
 
 #include "base/optional.h"
 #include "chromeos/dbus/lorgnette/lorgnette_service.pb.h"
-#include "chromeos/dbus/lorgnette_manager_client.h"
+#include "chromeos/dbus/lorgnette_manager/lorgnette_manager_client.h"
 
 namespace chromeos {
 
-class COMPONENT_EXPORT(CHROMEOS_DBUS) FakeLorgnetteManagerClient
+class COMPONENT_EXPORT(LORGNETTE_MANAGER) FakeLorgnetteManagerClient
     : public LorgnetteManagerClient {
  public:
   FakeLorgnetteManagerClient();
@@ -60,4 +60,4 @@ class COMPONENT_EXPORT(CHROMEOS_DBUS) FakeLorgnetteManagerClient
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_FAKE_LORGNETTE_MANAGER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_LORGNETTE_MANAGER_FAKE_LORGNETTE_MANAGER_CLIENT_H_

chromeos/dbus/lorgnette_manager_client.cc → chromeos/dbus/lorgnette_manager/lorgnette_manager_client.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromeos/dbus/lorgnette_manager_client.h"
+#include "chromeos/dbus/lorgnette_manager/lorgnette_manager_client.h"
 
 #include <memory>
 #include <string>

chromeos/dbus/lorgnette_manager_client.h → chromeos/dbus/lorgnette_manager/lorgnette_manager_client.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMEOS_DBUS_LORGNETTE_MANAGER_CLIENT_H_
-#define CHROMEOS_DBUS_LORGNETTE_MANAGER_CLIENT_H_
+#ifndef CHROMEOS_DBUS_LORGNETTE_MANAGER_LORGNETTE_MANAGER_CLIENT_H_
+#define CHROMEOS_DBUS_LORGNETTE_MANAGER_LORGNETTE_MANAGER_CLIENT_H_
 
 #include <cstdint>
 #include <map>
@@ -20,7 +20,7 @@ namespace chromeos {
 
 // LorgnetteManagerClient is used to communicate with the lorgnette
 // document scanning daemon.
-class COMPONENT_EXPORT(CHROMEOS_DBUS) LorgnetteManagerClient
+class COMPONENT_EXPORT(LORGNETTE_MANAGER) LorgnetteManagerClient
     : public DBusClient {
  public:
   // Attributes provided to a scan request.
@@ -68,4 +68,4 @@ class COMPONENT_EXPORT(CHROMEOS_DBUS) LorgnetteManagerClient
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_DBUS_LORGNETTE_MANAGER_CLIENT_H_
+#endif  // CHROMEOS_DBUS_LORGNETTE_MANAGER_LORGNETTE_MANAGER_CLIENT_H_