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

Change-Id: I951cea4684a12284b2861b1bc4fc3771db637b32
Reviewed-on: https://chromium-review.googlesource.com/1145955Reviewed-by: Jun Choi <hongjunchoi@chromium.org>
Commit-Queue: Kim Paulhamus <kpaulhamus@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577339}

device/BUILD.gn

@@ -64,12 +64,12 @@ test("device_unittests") {
     "bluetooth/test/test_bluetooth_local_gatt_service_delegate.cc",
     "bluetooth/test/test_bluetooth_local_gatt_service_delegate.h",
     "bluetooth/uribeacon/uri_encoder_unittest.cc",
+    "fido/ble/fido_ble_connection_unittest.cc",
+    "fido/ble/fido_ble_device_unittest.cc",
+    "fido/ble/fido_ble_frames_unittest.cc",
     "fido/ctap_request_unittest.cc",
     "fido/ctap_response_unittest.cc",
     "fido/fake_fido_discovery_unittest.cc",
-    "fido/fido_ble_connection_unittest.cc",
-    "fido/fido_ble_device_unittest.cc",
-    "fido/fido_ble_frames_unittest.cc",
     "fido/fido_cable_device_unittest.cc",
     "fido/fido_cable_discovery_unittest.cc",
     "fido/fido_cable_handshake_handler_unittest.cc",
@@ -253,7 +253,7 @@ test("device_unittests") {
       ]
     } else {
       # BLE discovery: works on Linux.
-      sources += [ "fido/fido_ble_discovery_unittest.cc" ]
+      sources += [ "fido/ble/fido_ble_discovery_unittest.cc" ]
     }
   }
 

device/fido/BUILD.gn

@@ -25,6 +25,20 @@ component("fido") {
     "authenticator_selection_criteria.h",
     "authenticator_supported_options.cc",
     "authenticator_supported_options.h",
+    "ble/fido_ble_connection.cc",
+    "ble/fido_ble_connection.h",
+    "ble/fido_ble_device.cc",
+    "ble/fido_ble_device.h",
+    "ble/fido_ble_discovery.cc",
+    "ble/fido_ble_discovery.h",
+    "ble/fido_ble_discovery_base.cc",
+    "ble/fido_ble_discovery_base.h",
+    "ble/fido_ble_frames.cc",
+    "ble/fido_ble_frames.h",
+    "ble/fido_ble_transaction.cc",
+    "ble/fido_ble_transaction.h",
+    "ble/fido_ble_uuids.cc",
+    "ble/fido_ble_uuids.h",
     "ctap2_device_operation.h",
     "ctap_empty_authenticator_request.cc",
     "ctap_empty_authenticator_request.h",
@@ -40,20 +54,6 @@ component("fido") {
     "fido_attestation_statement.cc",
     "fido_attestation_statement.h",
     "fido_authenticator.h",
-    "fido_ble_connection.cc",
-    "fido_ble_connection.h",
-    "fido_ble_device.cc",
-    "fido_ble_device.h",
-    "fido_ble_discovery.cc",
-    "fido_ble_discovery.h",
-    "fido_ble_discovery_base.cc",
-    "fido_ble_discovery_base.h",
-    "fido_ble_frames.cc",
-    "fido_ble_frames.h",
-    "fido_ble_transaction.cc",
-    "fido_ble_transaction.h",
-    "fido_ble_uuids.cc",
-    "fido_ble_uuids.h",
     "fido_cable_device.cc",
     "fido_cable_device.h",
     "fido_cable_discovery.cc",
@@ -187,8 +187,8 @@ source_set("mocks") {
   testonly = true
 
   sources = [
-    "mock_fido_ble_connection.cc",
-    "mock_fido_ble_connection.h",
+    "ble/mock_fido_ble_connection.cc",
+    "ble/mock_fido_ble_connection.h",
     "mock_fido_device.cc",
     "mock_fido_device.h",
     "mock_fido_discovery_observer.cc",
@@ -216,7 +216,7 @@ fuzzer_test("fido_hid_message_fuzzer") {
 
 fuzzer_test("fido_ble_frames_fuzzer") {
   sources = [
-    "fido_ble_frames_fuzzer.cc",
+    "ble/fido_ble_frames_fuzzer.cc",
   ]
   deps = [
     ":fido",

device/fido/fido_ble_connection.cc → device/fido/ble/fido_ble_connection.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_ble_connection.h"
+#include "device/fido/ble/fido_ble_connection.h"
 
 #include <utility>
 
@@ -16,7 +16,7 @@
 #include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
 #include "device/bluetooth/bluetooth_remote_gatt_service.h"
 #include "device/bluetooth/bluetooth_uuid.h"
-#include "device/fido/fido_ble_uuids.h"
+#include "device/fido/ble/fido_ble_uuids.h"
 
 namespace device {
 

device/fido/fido_ble_connection.h → device/fido/ble/fido_ble_connection.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_BLE_CONNECTION_H_
-#define DEVICE_FIDO_FIDO_BLE_CONNECTION_H_
+#ifndef DEVICE_FIDO_BLE_FIDO_BLE_CONNECTION_H_
+#define DEVICE_FIDO_BLE_FIDO_BLE_CONNECTION_H_
 
 #include <stdint.h>
 
@@ -162,4 +162,4 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoBleConnection
 
 }  // namespace device
 
-#endif  // DEVICE_FIDO_FIDO_BLE_CONNECTION_H_
+#endif  // DEVICE_FIDO_BLE_FIDO_BLE_CONNECTION_H_

device/fido/fido_ble_connection_unittest.cc → device/fido/ble/fido_ble_connection_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_ble_connection.h"
+#include "device/fido/ble/fido_ble_connection.h"
 
 #include <utility>
 
@@ -19,7 +19,7 @@
 #include "device/bluetooth/test/mock_bluetooth_gatt_connection.h"
 #include "device/bluetooth/test/mock_bluetooth_gatt_notify_session.h"
 #include "device/bluetooth/test/mock_bluetooth_gatt_service.h"
-#include "device/fido/fido_ble_uuids.h"
+#include "device/fido/ble/fido_ble_uuids.h"
 #include "device/fido/test_callback_receiver.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

device/fido/fido_ble_device.cc → device/fido/ble/fido_ble_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_ble_device.h"
+#include "device/fido/ble/fido_ble_device.h"
 
 #include <bitset>
 
@@ -10,8 +10,8 @@
 #include "base/strings/string_piece.h"
 #include "components/apdu/apdu_response.h"
 #include "device/bluetooth/bluetooth_uuid.h"
-#include "device/fido/fido_ble_frames.h"
-#include "device/fido/fido_ble_uuids.h"
+#include "device/fido/ble/fido_ble_frames.h"
+#include "device/fido/ble/fido_ble_uuids.h"
 #include "device/fido/fido_constants.h"
 
 namespace device {

device/fido/fido_ble_device.h → device/fido/ble/fido_ble_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_BLE_DEVICE_H_
-#define DEVICE_FIDO_FIDO_BLE_DEVICE_H_
+#ifndef DEVICE_FIDO_BLE_FIDO_BLE_DEVICE_H_
+#define DEVICE_FIDO_BLE_FIDO_BLE_DEVICE_H_
 
 #include <memory>
 #include <string>
@@ -17,8 +17,8 @@
 #include "base/optional.h"
 #include "base/strings/string_piece.h"
 #include "base/timer/timer.h"
-#include "device/fido/fido_ble_connection.h"
-#include "device/fido/fido_ble_transaction.h"
+#include "device/fido/ble/fido_ble_connection.h"
+#include "device/fido/ble/fido_ble_transaction.h"
 #include "device/fido/fido_constants.h"
 #include "device/fido/fido_device.h"
 
@@ -93,4 +93,4 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoBleDevice : public FidoDevice {
 
 }  // namespace device
 
-#endif  // DEVICE_FIDO_FIDO_BLE_DEVICE_H_
+#endif  // DEVICE_FIDO_BLE_FIDO_BLE_DEVICE_H_

device/fido/fido_ble_device_unittest.cc → device/fido/ble/fido_ble_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_ble_device.h"
+#include "device/fido/ble/fido_ble_device.h"
 
 #include "base/optional.h"
 #include "base/test/bind_test_util.h"
@@ -11,10 +11,10 @@
 #include "device/bluetooth/test/bluetooth_test.h"
 #include "device/bluetooth/test/mock_bluetooth_adapter.h"
 #include "device/bluetooth/test/mock_bluetooth_device.h"
-#include "device/fido/fido_ble_uuids.h"
+#include "device/fido/ble/fido_ble_uuids.h"
+#include "device/fido/ble/mock_fido_ble_connection.h"
 #include "device/fido/fido_constants.h"
 #include "device/fido/fido_parsing_utils.h"
-#include "device/fido/mock_fido_ble_connection.h"
 #include "device/fido/test_callback_receiver.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

device/fido/fido_ble_discovery.cc → device/fido/ble/fido_ble_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_ble_discovery.h"
+#include "device/fido/ble/fido_ble_discovery.h"
 
 #include <utility>
 
@@ -12,8 +12,8 @@
 #include "device/bluetooth/bluetooth_common.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "device/bluetooth/bluetooth_uuid.h"
-#include "device/fido/fido_ble_device.h"
-#include "device/fido/fido_ble_uuids.h"
+#include "device/fido/ble/fido_ble_device.h"
+#include "device/fido/ble/fido_ble_uuids.h"
 
 namespace device {
 

device/fido/fido_ble_discovery.h → device/fido/ble/fido_ble_discovery.h

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DEVICE_FIDO_FIDO_BLE_DISCOVERY_H_
-#define DEVICE_FIDO_FIDO_BLE_DISCOVERY_H_
+#ifndef DEVICE_FIDO_BLE_FIDO_BLE_DISCOVERY_H_
+#define DEVICE_FIDO_BLE_FIDO_BLE_DISCOVERY_H_
 
 #include <memory>
 
 #include "base/component_export.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "device/fido/fido_ble_discovery_base.h"
+#include "device/fido/ble/fido_ble_discovery_base.h"
 
 namespace device {
 
@@ -43,4 +43,4 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoBleDiscovery
 
 }  // namespace device
 
-#endif  // DEVICE_FIDO_FIDO_BLE_DISCOVERY_H_
+#endif  // DEVICE_FIDO_BLE_FIDO_BLE_DISCOVERY_H_

device/fido/fido_ble_discovery_base.cc → device/fido/ble/fido_ble_discovery_base.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_ble_discovery_base.h"
+#include "device/fido/ble/fido_ble_discovery_base.h"
 
 #include <utility>
 

device/fido/fido_ble_discovery_base.h → device/fido/ble/fido_ble_discovery_base.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_BLE_DISCOVERY_BASE_H_
-#define DEVICE_FIDO_FIDO_BLE_DISCOVERY_BASE_H_
+#ifndef DEVICE_FIDO_BLE_FIDO_BLE_DISCOVERY_BASE_H_
+#define DEVICE_FIDO_BLE_FIDO_BLE_DISCOVERY_BASE_H_
 
 #include <memory>
 
@@ -53,4 +53,4 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoBleDiscoveryBase
 
 }  // namespace device
 
-#endif  // DEVICE_FIDO_FIDO_BLE_DISCOVERY_BASE_H_
+#endif  // DEVICE_FIDO_BLE_FIDO_BLE_DISCOVERY_BASE_H_

device/fido/fido_ble_discovery_unittest.cc → device/fido/ble/fido_ble_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_ble_discovery.h"
+#include "device/fido/ble/fido_ble_discovery.h"
 
 #include <string>
 
@@ -10,7 +10,7 @@
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "device/bluetooth/test/bluetooth_test.h"
-#include "device/fido/fido_ble_device.h"
+#include "device/fido/ble/fido_ble_device.h"
 #include "device/fido/mock_fido_discovery_observer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

device/fido/fido_ble_frames.cc → device/fido/ble/fido_ble_frames.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_ble_frames.h"
+#include "device/fido/ble/fido_ble_frames.h"
 
 #include <algorithm>
 #include <limits>

device/fido/fido_ble_frames.h → device/fido/ble/fido_ble_frames.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_BLE_FRAMES_H_
-#define DEVICE_FIDO_FIDO_BLE_FRAMES_H_
+#ifndef DEVICE_FIDO_BLE_FIDO_BLE_FRAMES_H_
+#define DEVICE_FIDO_BLE_FIDO_BLE_FRAMES_H_
 
 #include <stdint.h>
 
@@ -181,4 +181,4 @@ class COMPONENT_EXPORT(DEVICE_FIDO) FidoBleFrameAssembler {
 
 }  // namespace device
 
-#endif  // DEVICE_FIDO_FIDO_BLE_FRAMES_H_
+#endif  // DEVICE_FIDO_BLE_FIDO_BLE_FRAMES_H_

device/fido/fido_ble_frames_fuzzer.cc → device/fido/ble/fido_ble_frames_fuzzer.cc

@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "device/fido/fido_ble_frames.h"
+#include "device/fido/ble/fido_ble_frames.h"
 #include "device/fido/fido_constants.h"
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* raw_data, size_t size) {

device/fido/fido_ble_frames_unittest.cc → device/fido/ble/fido_ble_frames_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_ble_frames.h"
+#include "device/fido/ble/fido_ble_frames.h"
 
 #include <vector>
 

device/fido/fido_ble_transaction.cc → device/fido/ble/fido_ble_transaction.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "device/fido/fido_ble_transaction.h"
+#include "device/fido/ble/fido_ble_transaction.h"
 
 #include <utility>
 
-#include "device/fido/fido_ble_connection.h"
+#include "device/fido/ble/fido_ble_connection.h"
 #include "device/fido/fido_constants.h"
 
 namespace device {

device/fido/fido_ble_transaction.h → device/fido/ble/fido_ble_transaction.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_BLE_TRANSACTION_H_
-#define DEVICE_FIDO_FIDO_BLE_TRANSACTION_H_
+#ifndef DEVICE_FIDO_BLE_FIDO_BLE_TRANSACTION_H_
+#define DEVICE_FIDO_BLE_FIDO_BLE_TRANSACTION_H_
 
 #include <memory>
 #include <vector>
@@ -13,7 +13,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "base/timer/timer.h"
-#include "device/fido/fido_ble_frames.h"
+#include "device/fido/ble/fido_ble_frames.h"
 
 namespace device {
 
@@ -61,4 +61,4 @@ class FidoBleTransaction {
 
 }  // namespace device
 
-#endif  // DEVICE_FIDO_FIDO_BLE_TRANSACTION_H_
+#endif  // DEVICE_FIDO_BLE_FIDO_BLE_TRANSACTION_H_

device/fido/fido_ble_uuids.cc → device/fido/ble/fido_ble_uuids.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_ble_uuids.h"
+#include "device/fido/ble/fido_ble_uuids.h"
 
 #include "build/build_config.h"
 

device/fido/fido_ble_uuids.h → device/fido/ble/fido_ble_uuids.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_BLE_UUIDS_H_
-#define DEVICE_FIDO_FIDO_BLE_UUIDS_H_
+#ifndef DEVICE_FIDO_BLE_FIDO_BLE_UUIDS_H_
+#define DEVICE_FIDO_BLE_FIDO_BLE_UUIDS_H_
 
 #include "base/component_export.h"
 
@@ -28,4 +28,4 @@ COMPONENT_EXPORT(DEVICE_FIDO) extern const char kCableAdvertisementUUID[];
 
 }  // namespace device
 
-#endif  // DEVICE_FIDO_FIDO_BLE_UUIDS_H_
+#endif  // DEVICE_FIDO_BLE_FIDO_BLE_UUIDS_H_

device/fido/mock_fido_ble_connection.cc → device/fido/ble/mock_fido_ble_connection.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/mock_fido_ble_connection.h"
+#include "device/fido/ble/mock_fido_ble_connection.h"
 
 #include <utility>
 

device/fido/mock_fido_ble_connection.h → device/fido/ble/mock_fido_ble_connection.h

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DEVICE_FIDO_MOCK_FIDO_BLE_CONNECTION_H_
-#define DEVICE_FIDO_MOCK_FIDO_BLE_CONNECTION_H_
+#ifndef DEVICE_FIDO_BLE_MOCK_FIDO_BLE_CONNECTION_H_
+#define DEVICE_FIDO_BLE_MOCK_FIDO_BLE_CONNECTION_H_
 
 #include <string>
 #include <vector>
 
 #include "base/component_export.h"
 #include "base/macros.h"
-#include "device/fido/fido_ble_connection.h"
+#include "device/fido/ble/fido_ble_connection.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace device {

device/fido/fido_cable_device.cc

@@ -8,8 +8,8 @@
 
 #include "base/strings/string_piece.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "device/fido/fido_ble_connection.h"
-#include "device/fido/fido_ble_frames.h"
+#include "device/fido/ble/fido_ble_connection.h"
+#include "device/fido/ble/fido_ble_frames.h"
 #include "device/fido/fido_constants.h"
 #include "device/fido/fido_parsing_utils.h"
 

device/fido/fido_cable_device.h

@@ -16,7 +16,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "crypto/aead.h"
-#include "device/fido/fido_ble_device.h"
+#include "device/fido/ble/fido_ble_device.h"
 
 namespace device {
 

device/fido/fido_cable_device_unittest.cc

@@ -16,8 +16,8 @@
 #include "base/threading/sequenced_task_runner_handle.h"
 #include "crypto/aead.h"
 #include "device/bluetooth/test/bluetooth_test.h"
+#include "device/fido/ble/mock_fido_ble_connection.h"
 #include "device/fido/fido_parsing_utils.h"
-#include "device/fido/mock_fido_ble_connection.h"
 #include "device/fido/test_callback_receiver.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

device/fido/fido_cable_discovery.cc

@@ -17,7 +17,7 @@
 #include "device/bluetooth/bluetooth_advertisement.h"
 #include "device/bluetooth/bluetooth_discovery_session.h"
 #include "device/bluetooth/bluetooth_uuid.h"
-#include "device/fido/fido_ble_uuids.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/fido_parsing_utils.h"

device/fido/fido_cable_discovery.h

@@ -18,7 +18,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "device/fido/fido_ble_discovery_base.h"
+#include "device/fido/ble/fido_ble_discovery_base.h"
 
 namespace device {
 

device/fido/fido_cable_discovery_unittest.cc

@@ -15,8 +15,8 @@
 #include "device/bluetooth/bluetooth_advertisement.h"
 #include "device/bluetooth/test/bluetooth_test.h"
 #include "device/bluetooth/test/mock_bluetooth_adapter.h"
-#include "device/fido/fido_ble_device.h"
-#include "device/fido/fido_ble_uuids.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/fido_parsing_utils.h"
 #include "device/fido/mock_fido_discovery_observer.h"

device/fido/fido_cable_handshake_handler_unittest.cc

@@ -19,11 +19,11 @@
 #include "crypto/hkdf.h"
 #include "crypto/hmac.h"
 #include "device/bluetooth/test/bluetooth_test.h"
-#include "device/fido/fido_ble_frames.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/fido_constants.h"
 #include "device/fido/fido_parsing_utils.h"
-#include "device/fido/mock_fido_ble_connection.h"
 #include "device/fido/test_callback_receiver.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

device/fido/fido_discovery.cc

@@ -8,7 +8,7 @@
 
 #include "base/bind.h"
 #include "build/build_config.h"
-#include "device/fido/fido_ble_discovery.h"
+#include "device/fido/ble/fido_ble_discovery.h"
 #include "device/fido/fido_device.h"
 
 // HID is not supported on Android.