test::mock:: IWYU and remove unused
Bug: 317217375
Test: m .
Flag: EXEMPT, IWYU
Change-Id: Icf17aa499a09d505b5d6fdd0630241eea67932ea
diff --git a/system/test/mock/mock_bta_scn.cc b/system/test/mock/mock_bta_scn.cc
index e376bdc..c020c40 100644
--- a/system/test/mock/mock_bta_scn.cc
+++ b/system/test/mock/mock_bta_scn.cc
@@ -22,7 +22,6 @@
#include <cstdint>
#include "bta/include/bta_rfcomm_scn.h"
-#include "bta/jv/bta_jv_int.h"
#include "test/common/mock_functions.h"
bool BTA_FreeSCN(uint8_t scn) {
diff --git a/system/test/mock/mock_btif_co_bta_dm_co.cc b/system/test/mock/mock_btif_co_bta_dm_co.cc
index 63cbfc1..0437f45 100644
--- a/system/test/mock/mock_btif_co_bta_dm_co.cc
+++ b/system/test/mock/mock_btif_co_bta_dm_co.cc
@@ -20,11 +20,9 @@
#include <cstdint>
-#include "bta/include/bta_api.h"
#include "bta/include/bta_sec_api.h"
#include "bta/sys/bta_sys.h"
#include "internal_include/bte_appl.h"
-#include "stack/include/btm_api_types.h"
tBTE_APPL_CFG bte_appl_cfg = {
BTA_LE_AUTH_REQ_SC_MITM_BOND, // Authentication requirements
diff --git a/system/test/mock/mock_main_shim_entry.cc b/system/test/mock/mock_main_shim_entry.cc
index 80033bb..377e53d2 100644
--- a/system/test/mock/mock_main_shim_entry.cc
+++ b/system/test/mock/mock_main_shim_entry.cc
@@ -14,20 +14,21 @@
* limitations under the License.
*/
-#include "gd/hci/acl_manager_mock.h"
-#include "gd/hci/controller_mock.h"
-#include "gd/hci/distance_measurement_manager_mock.h"
-#include "gd/hci/hci_layer.h"
-#include "gd/hci/hci_layer_mock.h"
-#include "gd/hci/le_advertising_manager_mock.h"
-#include "gd/hci/le_scanning_manager_mock.h"
-#include "gd/neighbor/connectability.h"
-#include "gd/neighbor/discoverability.h"
-#include "gd/neighbor/inquiry.h"
-#include "gd/neighbor/page.h"
-#include "gd/os/handler.h"
-#include "gd/storage/storage_module.h"
+#include "hci/acl_manager_mock.h"
+#include "hci/controller_mock.h"
+#include "hci/distance_measurement_manager_mock.h"
+#include "hci/hci_layer.h"
+#include "hci/hci_layer_mock.h"
+#include "hci/le_advertising_manager_mock.h"
+#include "hci/le_scanning_manager_mock.h"
#include "main/shim/entry.h"
+#include "neighbor/connectability.h"
+#include "neighbor/discoverability.h"
+#include "neighbor/inquiry.h"
+#include "neighbor/page.h"
+#include "os/handler.h"
+#include "security/security_module.h"
+#include "storage/storage_module.h"
namespace bluetooth {
namespace hci {
diff --git a/system/test/mock/mock_main_shim_hci_layer.cc b/system/test/mock/mock_main_shim_hci_layer.cc
index 46031a6..4339c72 100644
--- a/system/test/mock/mock_main_shim_hci_layer.cc
+++ b/system/test/mock/mock_main_shim_hci_layer.cc
@@ -22,8 +22,8 @@
*/
// Mock include file to share data between tests and mock
-#include "test/mock/mock_main_shim_hci_layer.h"
+#include "main/shim/hci_layer.h"
// Mocked internal structures, if any
-const hci_t* bluetooth::shim::hci_layer_get_interface() { return nullptr; }
\ No newline at end of file
+const hci_t* bluetooth::shim::hci_layer_get_interface() { return nullptr; }
diff --git a/system/test/mock/mock_stack_acl_btm_ble_connection_establishment.cc b/system/test/mock/mock_stack_acl_btm_ble_connection_establishment.cc
index 1320c49..7e8171f 100644
--- a/system/test/mock/mock_stack_acl_btm_ble_connection_establishment.cc
+++ b/system/test/mock/mock_stack_acl_btm_ble_connection_establishment.cc
@@ -23,12 +23,10 @@
// Mock include file to share data between tests and mock
#include "test/mock/mock_stack_acl_btm_ble_connection_establishment.h"
-#include <cstdint>
-
// Original included files, if any
+#include "stack/include/hci_error_code.h"
#include "test/common/mock_functions.h"
-#include "types/raw_address.h"
// Mocked compile conditionals, if any
// Mocked internal structures, if any
diff --git a/system/test/mock/mock_stack_btm_ble_addr.h b/system/test/mock/mock_stack_btm_ble_addr.h
index dace61b..d30ebcb 100644
--- a/system/test/mock/mock_stack_btm_ble_addr.h
+++ b/system/test/mock/mock_stack_btm_ble_addr.h
@@ -21,7 +21,8 @@
* mockcify.pl ver 0.2
*/
-#include <cstdint>
+#include <base/functional/callback.h>
+
#include <functional>
// Original included files, if any
diff --git a/system/test/mock/mock_stack_btm_ble_gap.cc b/system/test/mock/mock_stack_btm_ble_gap.cc
index 23c22b4..3173129 100644
--- a/system/test/mock/mock_stack_btm_ble_gap.cc
+++ b/system/test/mock/mock_stack_btm_ble_gap.cc
@@ -27,7 +27,6 @@
#include "stack/btm/btm_ble_int.h"
#include "stack/btm/btm_ble_int_types.h"
-#include "stack/btm/btm_dev.h"
#include "stack/include/btm_api_types.h"
#include "stack/include/hci_error_code.h"
#include "test/common/mock_functions.h"
diff --git a/system/test/mock/mock_stack_btm_inq.h b/system/test/mock/mock_stack_btm_inq.h
index c9f2411..7ac6d12 100644
--- a/system/test/mock/mock_stack_btm_inq.h
+++ b/system/test/mock/mock_stack_btm_inq.h
@@ -35,6 +35,7 @@
#include "stack/btm/neighbor_inquiry.h"
#include "stack/include/bt_hdr.h"
#include "types/bluetooth/uuid.h"
+#include "types/bt_transport.h"
#include "types/raw_address.h"
// Original usings
diff --git a/system/test/mock/mock_stack_btm_iso.cc b/system/test/mock/mock_stack_btm_iso.cc
index 1112ec3..c0645aa 100644
--- a/system/test/mock/mock_stack_btm_iso.cc
+++ b/system/test/mock/mock_stack_btm_iso.cc
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
#include "stack/include/btm_iso_api.h"
diff --git a/system/test/mock/mock_stack_btm_sco.cc b/system/test/mock/mock_stack_btm_sco.cc
index d7ad6d3..f0be5ec 100644
--- a/system/test/mock/mock_stack_btm_sco.cc
+++ b/system/test/mock/mock_stack_btm_sco.cc
@@ -23,7 +23,6 @@
#include "device/include/esco_parameters.h"
#include "stack/btm/btm_sco.h"
-#include "stack/include/bt_hdr.h"
#include "stack/include/btm_api_types.h"
#include "stack/include/btm_status.h"
#include "stack/include/hci_error_code.h"
diff --git a/system/test/mock/mock_stack_smp_api.cc b/system/test/mock/mock_stack_smp_api.cc
index faeef31..f71c260 100644
--- a/system/test/mock/mock_stack_smp_api.cc
+++ b/system/test/mock/mock_stack_smp_api.cc
@@ -19,7 +19,6 @@
* Functions generated:11
*/
-#include "stack/btm/btm_dev.h"
#include "stack/include/smp_api.h"
#include "test/common/mock_functions.h"
#include "types/raw_address.h"
