Move all cable-related fido classes to a cable/ subdirectory

Change-Id: I56db43cb851f267b50664702943614bcc9b25e0d
Reviewed-on: https://chromium-review.googlesource.com/1145957Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
Reviewed-by: Mike West <mkwst@chromium.org>
Commit-Queue: Kim Paulhamus <kpaulhamus@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577900}

content/browser/webauth/authenticator_type_converters.h

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "device/fido/authenticator_selection_criteria.h"
-#include "device/fido/fido_cable_discovery.h"
+#include "device/fido/cable/fido_cable_discovery.h"
 #include "device/fido/fido_transport_protocol.h"
 #include "device/fido/public_key_credential_descriptor.h"
 #include "device/fido/public_key_credential_params.h"

device/BUILD.gn

@@ -67,12 +67,12 @@ test("device_unittests") {
     "fido/ble/fido_ble_connection_unittest.cc",
     "fido/ble/fido_ble_device_unittest.cc",
     "fido/ble/fido_ble_frames_unittest.cc",
+    "fido/cable/fido_cable_device_unittest.cc",
+    "fido/cable/fido_cable_discovery_unittest.cc",
+    "fido/cable/fido_cable_handshake_handler_unittest.cc",
     "fido/ctap_request_unittest.cc",
     "fido/ctap_response_unittest.cc",
     "fido/fake_fido_discovery_unittest.cc",
-    "fido/fido_cable_device_unittest.cc",
-    "fido/fido_cable_discovery_unittest.cc",
-    "fido/fido_cable_handshake_handler_unittest.cc",
     "fido/fido_discovery_unittest.cc",
     "fido/fido_parsing_utils_unittest.cc",
     "fido/fido_request_handler_unittest.cc",

device/fido/BUILD.gn

@@ -39,6 +39,12 @@ component("fido") {
     "ble/fido_ble_transaction.h",
     "ble/fido_ble_uuids.cc",
     "ble/fido_ble_uuids.h",
+    "cable/fido_cable_device.cc",
+    "cable/fido_cable_device.h",
+    "cable/fido_cable_discovery.cc",
+    "cable/fido_cable_discovery.h",
+    "cable/fido_cable_handshake_handler.cc",
+    "cable/fido_cable_handshake_handler.h",
     "ctap2_device_operation.h",
     "ctap_empty_authenticator_request.cc",
     "ctap_empty_authenticator_request.h",
@@ -54,12 +60,6 @@ component("fido") {
     "fido_attestation_statement.cc",
     "fido_attestation_statement.h",
     "fido_authenticator.h",
-    "fido_cable_device.cc",
-    "fido_cable_device.h",
-    "fido_cable_discovery.cc",
-    "fido_cable_discovery.h",
-    "fido_cable_handshake_handler.cc",
-    "fido_cable_handshake_handler.h",
     "fido_constants.cc",
     "fido_constants.h",
     "fido_device.cc",
@@ -239,7 +239,7 @@ fuzzer_test("ctap_response_fuzzer") {
 
 fuzzer_test("fido_cable_handshake_handler_fuzzer") {
   sources = [
-    "fido_cable_handshake_handler_fuzzer.cc",
+    "cable/fido_cable_handshake_handler_fuzzer.cc",
   ]
   deps = [
     ":fido",

device/fido/fido_cable_device.cc → device/fido/cable/fido_cable_device.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/fido_cable_device.h"
+#include "device/fido/cable/fido_cable_device.h"
 
 #include <utility>
 
@@ -128,9 +128,9 @@ void FidoCableDevice::DeviceTransact(std::vector<uint8_t> command,
         FROM_HERE, base::BindOnce(std::move(callback), base::nullopt));
     state_ = State::kDeviceError;
     return;
-    }
+  }
 
-    ++encryption_data_->write_sequence_num;
+  ++encryption_data_->write_sequence_num;
 
   AddToPendingFrames(FidoBleDeviceCommand::kMsg, std::move(command),
                      std::move(callback));

device/fido/fido_cable_device.h → device/fido/cable/fido_cable_device.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_FIDO_CABLE_DEVICE_H_
-#define DEVICE_FIDO_FIDO_CABLE_DEVICE_H_
+#ifndef DEVICE_FIDO_CABLE_FIDO_CABLE_DEVICE_H_
+#define DEVICE_FIDO_CABLE_FIDO_CABLE_DEVICE_H_
 
 #include <array>
 #include <memory>
@@ -76,4 +76,4 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoCableDevice : public FidoBleDevice {
 
 }  // namespace device
 
-#endif  // DEVICE_FIDO_FIDO_CABLE_DEVICE_H_
+#endif  // DEVICE_FIDO_CABLE_FIDO_CABLE_DEVICE_H_

device/fido/fido_cable_device_unittest.cc → device/fido/cable/fido_cable_device_unittest.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/fido_cable_device.h"
+#include "device/fido/cable/fido_cable_device.h"
 
 #include <array>
 #include <limits>

device/fido/fido_cable_discovery.cc → device/fido/cable/fido_cable_discovery.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/fido_cable_discovery.h"
+#include "device/fido/cable/fido_cable_discovery.h"
 
 #include <algorithm>
 #include <memory>
@@ -18,8 +18,8 @@
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 #include "device/fido/ble/fido_ble_uuids.h"
-#include "device/fido/fido_cable_device.h"
-#include "device/fido/fido_cable_handshake_handler.h"
+#include "device/fido/cable/fido_cable_device.h"
+#include "device/fido/cable/fido_cable_handshake_handler.h"
 #include "device/fido/fido_parsing_utils.h"
 
 namespace device {

device/fido/fido_cable_discovery.h → device/fido/cable/fido_cable_discovery.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_FIDO_CABLE_DISCOVERY_H_
-#define DEVICE_FIDO_FIDO_CABLE_DISCOVERY_H_
+#ifndef DEVICE_FIDO_CABLE_FIDO_CABLE_DISCOVERY_H_
+#define DEVICE_FIDO_CABLE_FIDO_CABLE_DISCOVERY_H_
 
 #include <stdint.h>
 
@@ -117,4 +117,4 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoCableDiscovery
 
 }  // namespace device
 
-#endif  // DEVICE_FIDO_FIDO_CABLE_DISCOVERY_H_
+#endif  // DEVICE_FIDO_CABLE_FIDO_CABLE_DISCOVERY_H_

device/fido/fido_cable_discovery_unittest.cc → device/fido/cable/fido_cable_discovery_unittest.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/fido_cable_discovery.h"
+#include "device/fido/cable/fido_cable_discovery.h"
 
 #include <algorithm>
 #include <memory>
@@ -17,7 +17,7 @@
 #include "device/bluetooth/test/mock_bluetooth_adapter.h"
 #include "device/fido/ble/fido_ble_device.h"
 #include "device/fido/ble/fido_ble_uuids.h"
-#include "device/fido/fido_cable_handshake_handler.h"
+#include "device/fido/cable/fido_cable_handshake_handler.h"
 #include "device/fido/fido_parsing_utils.h"
 #include "device/fido/mock_fido_discovery_observer.h"
 #include "testing/gmock/include/gmock/gmock.h"

device/fido/fido_cable_handshake_handler.cc → device/fido/cable/fido_cable_handshake_handler.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/fido_cable_handshake_handler.h"
+#include "device/fido/cable/fido_cable_handshake_handler.h"
 
 #include <algorithm>
 #include <utility>
@@ -14,7 +14,7 @@
 #include "crypto/hkdf.h"
 #include "crypto/hmac.h"
 #include "crypto/random.h"
-#include "device/fido/fido_cable_device.h"
+#include "device/fido/cable/fido_cable_device.h"
 #include "device/fido/fido_constants.h"
 #include "device/fido/fido_parsing_utils.h"
 

device/fido/fido_cable_handshake_handler.h → device/fido/cable/fido_cable_handshake_handler.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_FIDO_CABLE_HANDSHAKE_HANDLER_H_
-#define DEVICE_FIDO_FIDO_CABLE_HANDSHAKE_HANDLER_H_
+#ifndef DEVICE_FIDO_CABLE_FIDO_CABLE_HANDSHAKE_HANDLER_H_
+#define DEVICE_FIDO_CABLE_FIDO_CABLE_HANDSHAKE_HANDLER_H_
 
 #include <stdint.h>
 
@@ -59,4 +59,4 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoCableHandshakeHandler {
 
 }  // namespace device
 
-#endif  // DEVICE_FIDO_FIDO_CABLE_HANDSHAKE_HANDLER_H_
+#endif  // DEVICE_FIDO_CABLE_FIDO_CABLE_HANDSHAKE_HANDLER_H_

device/fido/fido_cable_handshake_handler_fuzzer.cc → device/fido/cable/fido_cable_handshake_handler_fuzzer.cc

@@ -8,8 +8,8 @@
 #include <array>
 
 #include "base/containers/span.h"
-#include "device/fido/fido_cable_device.h"
-#include "device/fido/fido_cable_handshake_handler.h"
+#include "device/fido/cable/fido_cable_device.h"
+#include "device/fido/cable/fido_cable_handshake_handler.h"
 #include "device/fido/fido_constants.h"
 
 namespace {

device/fido/fido_cable_handshake_handler_unittest.cc → device/fido/cable/fido_cable_handshake_handler_unittest.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/fido_cable_handshake_handler.h"
+#include "device/fido/cable/fido_cable_handshake_handler.h"
 
 #include <array>
 #include <limits>
@@ -21,7 +21,7 @@
 #include "device/bluetooth/test/bluetooth_test.h"
 #include "device/fido/ble/fido_ble_frames.h"
 #include "device/fido/ble/mock_fido_ble_connection.h"
-#include "device/fido/fido_cable_device.h"
+#include "device/fido/cable/fido_cable_device.h"
 #include "device/fido/fido_constants.h"
 #include "device/fido/fido_parsing_utils.h"
 #include "device/fido/test_callback_receiver.h"

device/fido/ctap_get_assertion_request.h

@@ -14,7 +14,7 @@
 #include "base/containers/span.h"
 #include "base/macros.h"
 #include "base/optional.h"
-#include "device/fido/fido_cable_discovery.h"
+#include "device/fido/cable/fido_cable_discovery.h"
 #include "device/fido/fido_constants.h"
 #include "device/fido/public_key_credential_descriptor.h"
 

device/fido/get_assertion_request_handler.cc

@@ -9,8 +9,8 @@
 
 #include "base/bind.h"
 #include "device/fido/authenticator_get_assertion_response.h"
+#include "device/fido/cable/fido_cable_discovery.h"
 #include "device/fido/fido_authenticator.h"
-#include "device/fido/fido_cable_discovery.h"
 #include "device/fido/get_assertion_task.h"
 
 namespace device {