Rename bio_* files to reduce naming redundancy

Change-Id: Ie2414402ecceb3d51d39a1f57a5dfc901b31300e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1636454
Commit-Queue: Matthew Webb <noviv@google.com>
Commit-Queue: Kim Paulhamus <kpaulhamus@chromium.org>
Commit-Queue: Martin Kreichgauer <martinkr@google.com>
Auto-Submit: Matthew Webb <noviv@google.com>
Reviewed-by: Kim Paulhamus <kpaulhamus@chromium.org>
Reviewed-by: Martin Kreichgauer <martinkr@google.com>
Cr-Commit-Position: refs/heads/master@{#664599}

device/BUILD.gn

@@ -71,7 +71,7 @@ test("device_unittests") {
     "bluetooth/test/test_pairing_delegate.h",
     "bluetooth/uribeacon/uri_encoder_unittest.cc",
     "fido/attestation_statement_formats_unittest.cc",
-    "fido/bio/bio_enrollment_handler_unittest.cc",
+    "fido/bio/enrollment_handler_unittest.cc",
     "fido/ble/fido_ble_connection_unittest.cc",
     "fido/ble/fido_ble_device_unittest.cc",
     "fido/ble/fido_ble_frames_unittest.cc",

device/fido/BUILD.gn

@@ -27,10 +27,10 @@ component("fido") {
     "authenticator_selection_criteria.h",
     "authenticator_supported_options.cc",
     "authenticator_supported_options.h",
-    "bio/bio_enrollment.cc",
-    "bio/bio_enrollment.h",
-    "bio/bio_enrollment_handler.cc",
-    "bio/bio_enrollment_handler.h",
+    "bio/enrollment.cc",
+    "bio/enrollment.h",
+    "bio/enrollment_handler.cc",
+    "bio/enrollment_handler.h",
     "ble/fido_ble_connection.cc",
     "ble/fido_ble_connection.h",
     "ble/fido_ble_device.cc",

device/fido/bio/bio_enrollment.cc → device/fido/bio/enrollment.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 "device/fido/bio/bio_enrollment.h"
+#include "device/fido/bio/enrollment.h"
 
 #include "components/cbor/diagnostic_writer.h"
 #include "components/device_event_log/device_event_log.h"

device/fido/bio/bio_enrollment.h → device/fido/bio/enrollment.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 DEVICE_FIDO_BIO_BIO_ENROLLMENT_H_
-#define DEVICE_FIDO_BIO_BIO_ENROLLMENT_H_
+#ifndef DEVICE_FIDO_BIO_ENROLLMENT_H_
+#define DEVICE_FIDO_BIO_ENROLLMENT_H_
 
 #include "base/component_export.h"
 #include "base/optional.h"
@@ -122,4 +122,4 @@ AsCTAPRequestValuePair(const BioEnrollmentRequest& request);
 
 }  // namespace device
 
-#endif  // DEVICE_FIDO_BIO_BIO_ENROLLMENT_H_
+#endif  // DEVICE_FIDO_BIO_ENROLLMENT_H_

device/fido/bio/bio_enrollment_handler.cc → device/fido/bio/enrollment_handler.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "device/fido/bio/bio_enrollment_handler.h"
+#include "device/fido/bio/enrollment_handler.h"
 
 #include "base/bind.h"
-#include "device/fido/bio/bio_enrollment.h"
+#include "device/fido/bio/enrollment.h"
 #include "device/fido/fido_authenticator.h"
 #include "device/fido/fido_constants.h"
 

device/fido/bio/bio_enrollment_handler.h → device/fido/bio/enrollment_handler.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DEVICE_FIDO_BIO_BIO_ENROLLMENT_HANDLER_H_
-#define DEVICE_FIDO_BIO_BIO_ENROLLMENT_HANDLER_H_
+#ifndef DEVICE_FIDO_BIO_ENROLLMENT_HANDLER_H_
+#define DEVICE_FIDO_BIO_ENROLLMENT_HANDLER_H_
 
 #include "base/component_export.h"
 #include "base/containers/flat_set.h"
-#include "device/fido/bio/bio_enrollment.h"
+#include "device/fido/bio/enrollment.h"
 #include "device/fido/fido_constants.h"
 #include "device/fido/fido_discovery_factory.h"
 #include "device/fido/fido_request_handler_base.h"
@@ -56,4 +56,4 @@ class COMPONENT_EXPORT(DEVICE_FIDO) BioEnrollmentHandler
 
 }  // namespace device
 
-#endif  // DEVICE_FIDO_BIO_BIO_ENROLLMENT_HANDLER_H_
+#endif  // DEVICE_FIDO_BIO_ENROLLMENT_HANDLER_H_

device/fido/bio/bio_enrollment_handler_unittest.cc → device/fido/bio/enrollment_handler_unittest.cc

@@ -9,7 +9,7 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/test/scoped_task_environment.h"
-#include "device/fido/bio/bio_enrollment_handler.h"
+#include "device/fido/bio/enrollment_handler.h"
 #include "device/fido/fido_transport_protocol.h"
 #include "device/fido/test_callback_receiver.h"
 #include "device/fido/virtual_fido_device_factory.h"

device/fido/fido_authenticator.h

@@ -17,7 +17,7 @@
 #include "device/fido/authenticator_get_assertion_response.h"
 #include "device/fido/authenticator_make_credential_response.h"
 #include "device/fido/authenticator_supported_options.h"
-#include "device/fido/bio/bio_enrollment.h"
+#include "device/fido/bio/enrollment.h"
 #include "device/fido/credential_management.h"
 #include "device/fido/fido_request_handler_base.h"
 #include "device/fido/fido_transport_protocol.h"

device/fido/virtual_ctap2_device.cc

@@ -19,7 +19,7 @@
 #include "crypto/ec_private_key.h"
 #include "device/fido/authenticator_get_assertion_response.h"
 #include "device/fido/authenticator_make_credential_response.h"
-#include "device/fido/bio/bio_enrollment.h"
+#include "device/fido/bio/enrollment.h"
 #include "device/fido/credential_management.h"
 #include "device/fido/ctap_get_assertion_request.h"
 #include "device/fido/ctap_make_credential_request.h"