diagnostics: move routines inside cros_healthd
Now that wilco_dtc_supportd doesn't directly run any diagnostic
routines, the routines/ directory can be moved inside the
cros_healthd/ directory. This will give new and existing routines
access to cros_healthd's executor.
BUG=chromium:1111462
TEST=FEATURES=TEST emerge-nami diagnostics
Change-Id: I50f0f58ab38a90a299fe23d21dc1da5695896b50
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2330227
Tested-by: Paul Moy <pmoy@chromium.org>
Reviewed-by: Jesse Schettler <jschettler@chromium.org>
Commit-Queue: Paul Moy <pmoy@chromium.org>
diff --git a/diagnostics/BUILD.gn b/diagnostics/BUILD.gn
index fbc8079..eb660d9 100644
--- a/diagnostics/BUILD.gn
+++ b/diagnostics/BUILD.gn
@@ -8,10 +8,10 @@
deps = [
"//diagnostics/cros_health_tool:cros-health-tool",
"//diagnostics/cros_healthd:cros_healthd",
- "//diagnostics/routines:floating-point-accuracy",
- "//diagnostics/routines:prime-search",
- "//diagnostics/routines:smartctl-check",
- "//diagnostics/routines:urandom",
+ "//diagnostics/cros_healthd/routines:floating-point-accuracy",
+ "//diagnostics/cros_healthd/routines:prime-search",
+ "//diagnostics/cros_healthd/routines:smartctl-check",
+ "//diagnostics/cros_healthd/routines:urandom",
"//diagnostics/wilco_dtc_supportd:wilco_dtc_supportd",
]
if (use.test) {
@@ -20,10 +20,10 @@
"//diagnostics/cros_healthd:cros_healthd_test",
"//diagnostics/cros_healthd/events:libcros_healthd_events_test",
"//diagnostics/cros_healthd/fetchers:libcros_healthd_fetchers_test",
+ "//diagnostics/cros_healthd/routines:routine_test",
"//diagnostics/cros_healthd/system:system_config_test",
"//diagnostics/cros_healthd/utils:libcros_healthd_utils_test",
"//diagnostics/cros_healthd_mojo_adapter:cros_healthd_mojo_adapter_test",
- "//diagnostics/routines:routine_test",
"//diagnostics/wilco_dtc_supportd:wilco_dtc_supportd_test",
]
}
diff --git a/diagnostics/cros_healthd/BUILD.gn b/diagnostics/cros_healthd/BUILD.gn
index 1682908..6a69b67 100644
--- a/diagnostics/cros_healthd/BUILD.gn
+++ b/diagnostics/cros_healthd/BUILD.gn
@@ -20,9 +20,9 @@
"events:libcros_healthd_events",
"fetchers:libcros_healthd_fetchers",
"process:libcros_healthd_process",
+ "routines:libdiag_routine",
"system:libcros_healthd_system",
"//diagnostics/mojo:cros_healthd_mojo_bindings",
- "//diagnostics/routines:libdiag_routine",
]
sources = [
"cros_healthd.cc",
@@ -58,10 +58,10 @@
]
deps = [
":libcros_healthd",
+ "routines:libroutine_test_utils",
"system:libcros_healthd_system_test_utils",
"//common-mk/testrunner:testrunner",
"//diagnostics/common:libcommon_test_utils",
- "//diagnostics/routines:libroutine_test_utils",
]
sources = [
"cros_healthd_mojo_service_test.cc",
diff --git a/diagnostics/cros_healthd/cros_healthd_routine_factory.h b/diagnostics/cros_healthd/cros_healthd_routine_factory.h
index edbaac7..a7f0a45 100644
--- a/diagnostics/cros_healthd/cros_healthd_routine_factory.h
+++ b/diagnostics/cros_healthd/cros_healthd_routine_factory.h
@@ -13,7 +13,7 @@
#include <base/time/time.h>
#include "diagnostics/common/system/debugd_adapter_impl.h"
-#include "diagnostics/routines/diag_routine.h"
+#include "diagnostics/cros_healthd/routines/diag_routine.h"
#include "mojo/cros_healthd.mojom.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/cros_healthd_routine_factory_impl.cc b/diagnostics/cros_healthd/cros_healthd_routine_factory_impl.cc
index 71c7d55..c4de5e7 100644
--- a/diagnostics/cros_healthd/cros_healthd_routine_factory_impl.cc
+++ b/diagnostics/cros_healthd/cros_healthd_routine_factory_impl.cc
@@ -4,19 +4,19 @@
#include "diagnostics/cros_healthd/cros_healthd_routine_factory_impl.h"
-#include "diagnostics/routines/ac_power/ac_power.h"
-#include "diagnostics/routines/battery_capacity/battery_capacity.h"
-#include "diagnostics/routines/battery_discharge/battery_discharge.h"
-#include "diagnostics/routines/battery_health/battery_health.h"
-#include "diagnostics/routines/cpu_cache/cpu_cache.h"
-#include "diagnostics/routines/cpu_stress/cpu_stress.h"
-#include "diagnostics/routines/disk_read/disk_read.h"
-#include "diagnostics/routines/floating_point/floating_point_accuracy.h"
-#include "diagnostics/routines/nvme_self_test/nvme_self_test.h"
-#include "diagnostics/routines/nvme_wear_level/nvme_wear_level.h"
-#include "diagnostics/routines/prime_search/prime_search.h"
-#include "diagnostics/routines/smartctl_check/smartctl_check.h"
-#include "diagnostics/routines/urandom/urandom.h"
+#include "diagnostics/cros_healthd/routines/ac_power/ac_power.h"
+#include "diagnostics/cros_healthd/routines/battery_capacity/battery_capacity.h"
+#include "diagnostics/cros_healthd/routines/battery_discharge/battery_discharge.h"
+#include "diagnostics/cros_healthd/routines/battery_health/battery_health.h"
+#include "diagnostics/cros_healthd/routines/cpu_cache/cpu_cache.h"
+#include "diagnostics/cros_healthd/routines/cpu_stress/cpu_stress.h"
+#include "diagnostics/cros_healthd/routines/disk_read/disk_read.h"
+#include "diagnostics/cros_healthd/routines/floating_point/floating_point_accuracy.h"
+#include "diagnostics/cros_healthd/routines/nvme_self_test/nvme_self_test.h"
+#include "diagnostics/cros_healthd/routines/nvme_wear_level/nvme_wear_level.h"
+#include "diagnostics/cros_healthd/routines/prime_search/prime_search.h"
+#include "diagnostics/cros_healthd/routines/smartctl_check/smartctl_check.h"
+#include "diagnostics/cros_healthd/routines/urandom/urandom.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/cros_healthd_routine_service_impl.h b/diagnostics/cros_healthd/cros_healthd_routine_service_impl.h
index 2b7234f..f6afdc0 100644
--- a/diagnostics/cros_healthd/cros_healthd_routine_service_impl.h
+++ b/diagnostics/cros_healthd/cros_healthd_routine_service_impl.h
@@ -15,8 +15,8 @@
#include "diagnostics/cros_healthd/cros_healthd_routine_factory.h"
#include "diagnostics/cros_healthd/cros_healthd_routine_service.h"
+#include "diagnostics/cros_healthd/routines/diag_routine.h"
#include "diagnostics/cros_healthd/system/context.h"
-#include "diagnostics/routines/diag_routine.h"
#include "mojo/cros_healthd.mojom.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/cros_healthd_routine_service_impl_test.cc b/diagnostics/cros_healthd/cros_healthd_routine_service_impl_test.cc
index 2b3108e..73b196e 100644
--- a/diagnostics/cros_healthd/cros_healthd_routine_service_impl_test.cc
+++ b/diagnostics/cros_healthd/cros_healthd_routine_service_impl_test.cc
@@ -16,8 +16,8 @@
#include "diagnostics/common/system/mock_debugd_adapter.h"
#include "diagnostics/cros_healthd/cros_healthd_routine_service_impl.h"
#include "diagnostics/cros_healthd/fake_cros_healthd_routine_factory.h"
+#include "diagnostics/cros_healthd/routines/routine_test_utils.h"
#include "diagnostics/cros_healthd/system/mock_context.h"
-#include "diagnostics/routines/routine_test_utils.h"
#include "mojo/cros_healthd_diagnostics.mojom.h"
using testing::StrictMock;
diff --git a/diagnostics/cros_healthd/fake_cros_healthd_routine_factory.h b/diagnostics/cros_healthd/fake_cros_healthd_routine_factory.h
index f1136b1..37c435a 100644
--- a/diagnostics/cros_healthd/fake_cros_healthd_routine_factory.h
+++ b/diagnostics/cros_healthd/fake_cros_healthd_routine_factory.h
@@ -12,7 +12,7 @@
#include <base/optional.h>
#include "diagnostics/cros_healthd/cros_healthd_routine_factory.h"
-#include "diagnostics/routines/diag_routine.h"
+#include "diagnostics/cros_healthd/routines/diag_routine.h"
#include "mojo/cros_healthd_diagnostics.mojom.h"
namespace diagnostics {
diff --git a/diagnostics/routines/BUILD.gn b/diagnostics/cros_healthd/routines/BUILD.gn
similarity index 100%
rename from diagnostics/routines/BUILD.gn
rename to diagnostics/cros_healthd/routines/BUILD.gn
diff --git a/diagnostics/routines/ac_power/ac_power.cc b/diagnostics/cros_healthd/routines/ac_power/ac_power.cc
similarity index 98%
rename from diagnostics/routines/ac_power/ac_power.cc
rename to diagnostics/cros_healthd/routines/ac_power/ac_power.cc
index a29b9d2..3607257 100644
--- a/diagnostics/routines/ac_power/ac_power.cc
+++ b/diagnostics/cros_healthd/routines/ac_power/ac_power.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 "diagnostics/routines/ac_power/ac_power.h"
+#include "diagnostics/cros_healthd/routines/ac_power/ac_power.h"
#include <base/files/file_enumerator.h>
#include <base/files/file_path.h>
diff --git a/diagnostics/routines/ac_power/ac_power.h b/diagnostics/cros_healthd/routines/ac_power/ac_power.h
similarity index 91%
rename from diagnostics/routines/ac_power/ac_power.h
rename to diagnostics/cros_healthd/routines/ac_power/ac_power.h
index 72ec85f..537885c 100644
--- a/diagnostics/routines/ac_power/ac_power.h
+++ b/diagnostics/cros_healthd/routines/ac_power/ac_power.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 DIAGNOSTICS_ROUTINES_AC_POWER_AC_POWER_H_
-#define DIAGNOSTICS_ROUTINES_AC_POWER_AC_POWER_H_
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_AC_POWER_AC_POWER_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_AC_POWER_AC_POWER_H_
#include <cstdint>
#include <string>
@@ -11,7 +11,7 @@
#include <base/files/file_path.h>
#include <base/optional.h>
-#include "diagnostics/routines/diag_routine.h"
+#include "diagnostics/cros_healthd/routines/diag_routine.h"
#include "mojo/cros_healthd_diagnostics.mojom.h"
namespace diagnostics {
@@ -74,4 +74,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_ROUTINES_AC_POWER_AC_POWER_H_
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_AC_POWER_AC_POWER_H_
diff --git a/diagnostics/routines/ac_power/ac_power_test.cc b/diagnostics/cros_healthd/routines/ac_power/ac_power_test.cc
similarity index 98%
rename from diagnostics/routines/ac_power/ac_power_test.cc
rename to diagnostics/cros_healthd/routines/ac_power/ac_power_test.cc
index 48a6c0d..6edbffb 100644
--- a/diagnostics/routines/ac_power/ac_power_test.cc
+++ b/diagnostics/cros_healthd/routines/ac_power/ac_power_test.cc
@@ -12,8 +12,8 @@
#include <gtest/gtest.h>
#include "diagnostics/common/file_test_utils.h"
-#include "diagnostics/routines/ac_power/ac_power.h"
-#include "diagnostics/routines/routine_test_utils.h"
+#include "diagnostics/cros_healthd/routines/ac_power/ac_power.h"
+#include "diagnostics/cros_healthd/routines/routine_test_utils.h"
#include "mojo/cros_healthd_diagnostics.mojom.h"
namespace diagnostics {
diff --git a/diagnostics/routines/battery_capacity/battery_capacity.cc b/diagnostics/cros_healthd/routines/battery_capacity/battery_capacity.cc
similarity index 97%
rename from diagnostics/routines/battery_capacity/battery_capacity.cc
rename to diagnostics/cros_healthd/routines/battery_capacity/battery_capacity.cc
index 706424d..e698b55 100644
--- a/diagnostics/routines/battery_capacity/battery_capacity.cc
+++ b/diagnostics/cros_healthd/routines/battery_capacity/battery_capacity.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 "diagnostics/routines/battery_capacity/battery_capacity.h"
+#include "diagnostics/cros_healthd/routines/battery_capacity/battery_capacity.h"
#include <cstdint>
#include <utility>
diff --git a/diagnostics/routines/battery_capacity/battery_capacity.h b/diagnostics/cros_healthd/routines/battery_capacity/battery_capacity.h
similarity index 87%
rename from diagnostics/routines/battery_capacity/battery_capacity.h
rename to diagnostics/cros_healthd/routines/battery_capacity/battery_capacity.h
index 943e818..9d4b89b 100644
--- a/diagnostics/routines/battery_capacity/battery_capacity.h
+++ b/diagnostics/cros_healthd/routines/battery_capacity/battery_capacity.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 DIAGNOSTICS_ROUTINES_BATTERY_CAPACITY_BATTERY_CAPACITY_H_
-#define DIAGNOSTICS_ROUTINES_BATTERY_CAPACITY_BATTERY_CAPACITY_H_
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_BATTERY_CAPACITY_BATTERY_CAPACITY_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_BATTERY_CAPACITY_BATTERY_CAPACITY_H_
#include <cstdint>
#include <string>
#include <base/files/file_path.h>
-#include "diagnostics/routines/diag_routine.h"
+#include "diagnostics/cros_healthd/routines/diag_routine.h"
namespace diagnostics {
@@ -61,4 +61,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_ROUTINES_BATTERY_CAPACITY_BATTERY_CAPACITY_H_
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_BATTERY_CAPACITY_BATTERY_CAPACITY_H_
diff --git a/diagnostics/routines/battery_capacity/battery_capacity_test.cc b/diagnostics/cros_healthd/routines/battery_capacity/battery_capacity_test.cc
similarity index 96%
rename from diagnostics/routines/battery_capacity/battery_capacity_test.cc
rename to diagnostics/cros_healthd/routines/battery_capacity/battery_capacity_test.cc
index 90320d9..d029cf8 100644
--- a/diagnostics/routines/battery_capacity/battery_capacity_test.cc
+++ b/diagnostics/cros_healthd/routines/battery_capacity/battery_capacity_test.cc
@@ -11,8 +11,8 @@
#include <gtest/gtest.h>
#include "diagnostics/common/file_test_utils.h"
-#include "diagnostics/routines/battery_capacity/battery_capacity.h"
-#include "diagnostics/routines/routine_test_utils.h"
+#include "diagnostics/cros_healthd/routines/battery_capacity/battery_capacity.h"
+#include "diagnostics/cros_healthd/routines/routine_test_utils.h"
#include "mojo/cros_healthd_diagnostics.mojom.h"
namespace diagnostics {
diff --git a/diagnostics/routines/battery_discharge/battery_discharge.cc b/diagnostics/cros_healthd/routines/battery_discharge/battery_discharge.cc
similarity index 97%
rename from diagnostics/routines/battery_discharge/battery_discharge.cc
rename to diagnostics/cros_healthd/routines/battery_discharge/battery_discharge.cc
index 9be3cd1..05bbabe 100644
--- a/diagnostics/routines/battery_discharge/battery_discharge.cc
+++ b/diagnostics/cros_healthd/routines/battery_discharge/battery_discharge.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 "diagnostics/routines/battery_discharge/battery_discharge.h"
+#include "diagnostics/cros_healthd/routines/battery_discharge/battery_discharge.h"
#include <inttypes.h>
@@ -18,7 +18,7 @@
#include "diagnostics/common/file_utils.h"
#include "diagnostics/common/mojo_utils.h"
-#include "diagnostics/routines/battery_discharge/battery_discharge_constants.h"
+#include "diagnostics/cros_healthd/routines/battery_discharge/battery_discharge_constants.h"
#include "mojo/cros_healthd_diagnostics.mojom.h"
namespace diagnostics {
diff --git a/diagnostics/routines/battery_discharge/battery_discharge.h b/diagnostics/cros_healthd/routines/battery_discharge/battery_discharge.h
similarity index 91%
rename from diagnostics/routines/battery_discharge/battery_discharge.h
rename to diagnostics/cros_healthd/routines/battery_discharge/battery_discharge.h
index ca05c77..d4d8874 100644
--- a/diagnostics/routines/battery_discharge/battery_discharge.h
+++ b/diagnostics/cros_healthd/routines/battery_discharge/battery_discharge.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 DIAGNOSTICS_ROUTINES_BATTERY_DISCHARGE_BATTERY_DISCHARGE_H_
-#define DIAGNOSTICS_ROUTINES_BATTERY_DISCHARGE_BATTERY_DISCHARGE_H_
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_BATTERY_DISCHARGE_BATTERY_DISCHARGE_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_BATTERY_DISCHARGE_BATTERY_DISCHARGE_H_
#include <cstdint>
#include <memory>
@@ -17,7 +17,7 @@
#include <base/time/tick_clock.h>
#include <base/time/time.h>
-#include "diagnostics/routines/diag_routine.h"
+#include "diagnostics/cros_healthd/routines/diag_routine.h"
#include "mojo/cros_healthd_diagnostics.mojom.h"
namespace diagnostics {
@@ -88,4 +88,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_ROUTINES_BATTERY_DISCHARGE_BATTERY_DISCHARGE_H_
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_BATTERY_DISCHARGE_BATTERY_DISCHARGE_H_
diff --git a/diagnostics/routines/battery_discharge/battery_discharge_constants.cc b/diagnostics/cros_healthd/routines/battery_discharge/battery_discharge_constants.cc
similarity index 93%
rename from diagnostics/routines/battery_discharge/battery_discharge_constants.cc
rename to diagnostics/cros_healthd/routines/battery_discharge/battery_discharge_constants.cc
index dd9d00c..5f07675 100644
--- a/diagnostics/routines/battery_discharge/battery_discharge_constants.cc
+++ b/diagnostics/cros_healthd/routines/battery_discharge/battery_discharge_constants.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 "diagnostics/routines/battery_discharge/battery_discharge_constants.h"
+#include "diagnostics/cros_healthd/routines/battery_discharge/battery_discharge_constants.h"
namespace diagnostics {
diff --git a/diagnostics/routines/battery_discharge/battery_discharge_constants.h b/diagnostics/cros_healthd/routines/battery_discharge/battery_discharge_constants.h
similarity index 80%
rename from diagnostics/routines/battery_discharge/battery_discharge_constants.h
rename to diagnostics/cros_healthd/routines/battery_discharge/battery_discharge_constants.h
index bdbedaa..9976459 100644
--- a/diagnostics/routines/battery_discharge/battery_discharge_constants.h
+++ b/diagnostics/cros_healthd/routines/battery_discharge/battery_discharge_constants.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 DIAGNOSTICS_ROUTINES_BATTERY_DISCHARGE_BATTERY_DISCHARGE_CONSTANTS_H_
-#define DIAGNOSTICS_ROUTINES_BATTERY_DISCHARGE_BATTERY_DISCHARGE_CONSTANTS_H_
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_BATTERY_DISCHARGE_BATTERY_DISCHARGE_CONSTANTS_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_BATTERY_DISCHARGE_BATTERY_DISCHARGE_CONSTANTS_H_
namespace diagnostics {
@@ -28,4 +28,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_ROUTINES_BATTERY_DISCHARGE_BATTERY_DISCHARGE_CONSTANTS_H_
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_BATTERY_DISCHARGE_BATTERY_DISCHARGE_CONSTANTS_H_
diff --git a/diagnostics/routines/battery_discharge/battery_discharge_test.cc b/diagnostics/cros_healthd/routines/battery_discharge/battery_discharge_test.cc
similarity index 98%
rename from diagnostics/routines/battery_discharge/battery_discharge_test.cc
rename to diagnostics/cros_healthd/routines/battery_discharge/battery_discharge_test.cc
index 12a1a5d..b637a5a 100644
--- a/diagnostics/routines/battery_discharge/battery_discharge_test.cc
+++ b/diagnostics/cros_healthd/routines/battery_discharge/battery_discharge_test.cc
@@ -16,9 +16,9 @@
#include <mojo/core/embedder/embedder.h>
#include "diagnostics/common/file_test_utils.h"
-#include "diagnostics/routines/battery_discharge/battery_discharge.h"
-#include "diagnostics/routines/battery_discharge/battery_discharge_constants.h"
-#include "diagnostics/routines/routine_test_utils.h"
+#include "diagnostics/cros_healthd/routines/battery_discharge/battery_discharge.h"
+#include "diagnostics/cros_healthd/routines/battery_discharge/battery_discharge_constants.h"
+#include "diagnostics/cros_healthd/routines/routine_test_utils.h"
#include "mojo/cros_healthd_diagnostics.mojom.h"
namespace diagnostics {
diff --git a/diagnostics/routines/battery_health/battery_health.cc b/diagnostics/cros_healthd/routines/battery_health/battery_health.cc
similarity index 98%
rename from diagnostics/routines/battery_health/battery_health.cc
rename to diagnostics/cros_healthd/routines/battery_health/battery_health.cc
index 3b73dc7..056fdc9 100644
--- a/diagnostics/routines/battery_health/battery_health.cc
+++ b/diagnostics/cros_healthd/routines/battery_health/battery_health.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 "diagnostics/routines/battery_health/battery_health.h"
+#include "diagnostics/cros_healthd/routines/battery_health/battery_health.h"
#include <utility>
diff --git a/diagnostics/routines/battery_health/battery_health.h b/diagnostics/cros_healthd/routines/battery_health/battery_health.h
similarity index 91%
rename from diagnostics/routines/battery_health/battery_health.h
rename to diagnostics/cros_healthd/routines/battery_health/battery_health.h
index ce1478c..cfa1665 100644
--- a/diagnostics/routines/battery_health/battery_health.h
+++ b/diagnostics/cros_healthd/routines/battery_health/battery_health.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 DIAGNOSTICS_ROUTINES_BATTERY_HEALTH_BATTERY_HEALTH_H_
-#define DIAGNOSTICS_ROUTINES_BATTERY_HEALTH_BATTERY_HEALTH_H_
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_BATTERY_HEALTH_BATTERY_HEALTH_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_BATTERY_HEALTH_BATTERY_HEALTH_H_
#include <cstdint>
#include <map>
@@ -11,7 +11,7 @@
#include <base/files/file_path.h>
-#include "diagnostics/routines/diag_routine.h"
+#include "diagnostics/cros_healthd/routines/diag_routine.h"
namespace diagnostics {
// Relative path to the directory with files read by the BatteryHealth routine.
@@ -80,4 +80,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_ROUTINES_BATTERY_HEALTH_BATTERY_HEALTH_H_
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_BATTERY_HEALTH_BATTERY_HEALTH_H_
diff --git a/diagnostics/routines/battery_health/battery_health_test.cc b/diagnostics/cros_healthd/routines/battery_health/battery_health_test.cc
similarity index 98%
rename from diagnostics/routines/battery_health/battery_health_test.cc
rename to diagnostics/cros_healthd/routines/battery_health/battery_health_test.cc
index 7250525..0ebe393 100644
--- a/diagnostics/routines/battery_health/battery_health_test.cc
+++ b/diagnostics/cros_healthd/routines/battery_health/battery_health_test.cc
@@ -15,8 +15,8 @@
#include "diagnostics/common/file_test_utils.h"
#include "diagnostics/common/mojo_utils.h"
-#include "diagnostics/routines/battery_health/battery_health.h"
-#include "diagnostics/routines/routine_test_utils.h"
+#include "diagnostics/cros_healthd/routines/battery_health/battery_health.h"
+#include "diagnostics/cros_healthd/routines/routine_test_utils.h"
#include "mojo/cros_healthd_diagnostics.mojom.h"
namespace diagnostics {
diff --git a/diagnostics/routines/cpu_cache/cpu_cache.cc b/diagnostics/cros_healthd/routines/cpu_cache/cpu_cache.cc
similarity index 88%
rename from diagnostics/routines/cpu_cache/cpu_cache.cc
rename to diagnostics/cros_healthd/routines/cpu_cache/cpu_cache.cc
index a0df3a2..ca1a7c2 100644
--- a/diagnostics/routines/cpu_cache/cpu_cache.cc
+++ b/diagnostics/cros_healthd/routines/cpu_cache/cpu_cache.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "diagnostics/routines/cpu_cache/cpu_cache.h"
+#include "diagnostics/cros_healthd/routines/cpu_cache/cpu_cache.h"
#include <string>
#include <vector>
-#include "diagnostics/routines/subproc_routine.h"
+#include "diagnostics/cros_healthd/routines/subproc_routine.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/routines/cpu_cache/cpu_cache.h b/diagnostics/cros_healthd/routines/cpu_cache/cpu_cache.h
new file mode 100644
index 0000000..4cfa82f
--- /dev/null
+++ b/diagnostics/cros_healthd/routines/cpu_cache/cpu_cache.h
@@ -0,0 +1,20 @@
+// Copyright 2020 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_CPU_CACHE_CPU_CACHE_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_CPU_CACHE_CPU_CACHE_H_
+
+#include <cstdint>
+#include <memory>
+
+#include "diagnostics/cros_healthd/routines/diag_routine.h"
+
+namespace diagnostics {
+
+std::unique_ptr<DiagnosticRoutine> CreateCpuCacheRoutine(
+ base::TimeDelta exec_duration);
+
+} // namespace diagnostics
+
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_CPU_CACHE_CPU_CACHE_H_
diff --git a/diagnostics/routines/cpu_stress/cpu_stress.cc b/diagnostics/cros_healthd/routines/cpu_stress/cpu_stress.cc
similarity index 88%
rename from diagnostics/routines/cpu_stress/cpu_stress.cc
rename to diagnostics/cros_healthd/routines/cpu_stress/cpu_stress.cc
index 0d02507..346db2b 100644
--- a/diagnostics/routines/cpu_stress/cpu_stress.cc
+++ b/diagnostics/cros_healthd/routines/cpu_stress/cpu_stress.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "diagnostics/routines/cpu_stress/cpu_stress.h"
+#include "diagnostics/cros_healthd/routines/cpu_stress/cpu_stress.h"
#include <string>
#include <vector>
-#include "diagnostics/routines/subproc_routine.h"
+#include "diagnostics/cros_healthd/routines/subproc_routine.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/routines/cpu_stress/cpu_stress.h b/diagnostics/cros_healthd/routines/cpu_stress/cpu_stress.h
new file mode 100644
index 0000000..d9a46c7
--- /dev/null
+++ b/diagnostics/cros_healthd/routines/cpu_stress/cpu_stress.h
@@ -0,0 +1,20 @@
+// Copyright 2020 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_CPU_STRESS_CPU_STRESS_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_CPU_STRESS_CPU_STRESS_H_
+
+#include <cstdint>
+#include <memory>
+
+#include "diagnostics/cros_healthd/routines/diag_routine.h"
+
+namespace diagnostics {
+
+std::unique_ptr<DiagnosticRoutine> CreateCpuStressRoutine(
+ base::TimeDelta exec_duration);
+
+} // namespace diagnostics
+
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_CPU_STRESS_CPU_STRESS_H_
diff --git a/diagnostics/routines/diag_process_adapter.h b/diagnostics/cros_healthd/routines/diag_process_adapter.h
similarity index 82%
rename from diagnostics/routines/diag_process_adapter.h
rename to diagnostics/cros_healthd/routines/diag_process_adapter.h
index 4e29bac..af64e2a 100644
--- a/diagnostics/routines/diag_process_adapter.h
+++ b/diagnostics/cros_healthd/routines/diag_process_adapter.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 DIAGNOSTICS_ROUTINES_DIAG_PROCESS_ADAPTER_H_
-#define DIAGNOSTICS_ROUTINES_DIAG_PROCESS_ADAPTER_H_
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_DIAG_PROCESS_ADAPTER_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_DIAG_PROCESS_ADAPTER_H_
#include <string>
#include <vector>
@@ -32,4 +32,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_ROUTINES_DIAG_PROCESS_ADAPTER_H_
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_DIAG_PROCESS_ADAPTER_H_
diff --git a/diagnostics/routines/diag_process_adapter_impl.cc b/diagnostics/cros_healthd/routines/diag_process_adapter_impl.cc
similarity index 94%
rename from diagnostics/routines/diag_process_adapter_impl.cc
rename to diagnostics/cros_healthd/routines/diag_process_adapter_impl.cc
index 792b045..dd44a28 100644
--- a/diagnostics/routines/diag_process_adapter_impl.cc
+++ b/diagnostics/cros_healthd/routines/diag_process_adapter_impl.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 "diagnostics/routines/diag_process_adapter_impl.h"
+#include "diagnostics/cros_healthd/routines/diag_process_adapter_impl.h"
#include <stdlib.h>
diff --git a/diagnostics/routines/diag_process_adapter_impl.h b/diagnostics/cros_healthd/routines/diag_process_adapter_impl.h
similarity index 76%
rename from diagnostics/routines/diag_process_adapter_impl.h
rename to diagnostics/cros_healthd/routines/diag_process_adapter_impl.h
index 266d3f1..afba5a3 100644
--- a/diagnostics/routines/diag_process_adapter_impl.h
+++ b/diagnostics/cros_healthd/routines/diag_process_adapter_impl.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef DIAGNOSTICS_ROUTINES_DIAG_PROCESS_ADAPTER_IMPL_H_
-#define DIAGNOSTICS_ROUTINES_DIAG_PROCESS_ADAPTER_IMPL_H_
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_DIAG_PROCESS_ADAPTER_IMPL_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_DIAG_PROCESS_ADAPTER_IMPL_H_
#include <string>
#include <vector>
-#include "diagnostics/routines/diag_process_adapter.h"
+#include "diagnostics/cros_healthd/routines/diag_process_adapter.h"
namespace diagnostics {
@@ -31,4 +31,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_ROUTINES_DIAG_PROCESS_ADAPTER_IMPL_H_
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_DIAG_PROCESS_ADAPTER_IMPL_H_
diff --git a/diagnostics/routines/diag_routine.h b/diagnostics/cros_healthd/routines/diag_routine.h
similarity index 89%
rename from diagnostics/routines/diag_routine.h
rename to diagnostics/cros_healthd/routines/diag_routine.h
index 3d8580b..ded9149 100644
--- a/diagnostics/routines/diag_routine.h
+++ b/diagnostics/cros_healthd/routines/diag_routine.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 DIAGNOSTICS_ROUTINES_DIAG_ROUTINE_H_
-#define DIAGNOSTICS_ROUTINES_DIAG_ROUTINE_H_
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_DIAG_ROUTINE_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_DIAG_ROUTINE_H_
#include "mojo/cros_healthd_diagnostics.mojom.h"
@@ -38,4 +38,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_ROUTINES_DIAG_ROUTINE_H_
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_DIAG_ROUTINE_H_
diff --git a/diagnostics/routines/disk_read/disk_read.cc b/diagnostics/cros_healthd/routines/disk_read/disk_read.cc
similarity index 97%
rename from diagnostics/routines/disk_read/disk_read.cc
rename to diagnostics/cros_healthd/routines/disk_read/disk_read.cc
index c3b98a3..ae0a7ac 100644
--- a/diagnostics/routines/disk_read/disk_read.cc
+++ b/diagnostics/cros_healthd/routines/disk_read/disk_read.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 "diagnostics/routines/disk_read/disk_read.h"
+#include "diagnostics/cros_healthd/routines/disk_read/disk_read.h"
#include <list>
#include <string>
diff --git a/diagnostics/routines/disk_read/disk_read.h b/diagnostics/cros_healthd/routines/disk_read/disk_read.h
similarity index 68%
rename from diagnostics/routines/disk_read/disk_read.h
rename to diagnostics/cros_healthd/routines/disk_read/disk_read.h
index b14780a..a49ce6f 100644
--- a/diagnostics/routines/disk_read/disk_read.h
+++ b/diagnostics/cros_healthd/routines/disk_read/disk_read.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 DIAGNOSTICS_ROUTINES_DISK_READ_DISK_READ_H_
-#define DIAGNOSTICS_ROUTINES_DISK_READ_DISK_READ_H_
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_DISK_READ_DISK_READ_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_DISK_READ_DISK_READ_H_
#include <cstdint>
#include <memory>
@@ -11,7 +11,7 @@
#include <base/time/time.h>
#include <brillo/process/process.h>
-#include "diagnostics/routines/subproc_routine.h"
+#include "diagnostics/cros_healthd/routines/subproc_routine.h"
#include "mojo/cros_healthd_diagnostics.mojom.h"
namespace diagnostics {
@@ -23,4 +23,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_ROUTINES_DISK_READ_DISK_READ_H_
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_DISK_READ_DISK_READ_H_
diff --git a/diagnostics/routines/floating_point/floating_point_accuracy.cc b/diagnostics/cros_healthd/routines/floating_point/floating_point_accuracy.cc
similarity index 84%
rename from diagnostics/routines/floating_point/floating_point_accuracy.cc
rename to diagnostics/cros_healthd/routines/floating_point/floating_point_accuracy.cc
index 3536e5f..40c8e68 100644
--- a/diagnostics/routines/floating_point/floating_point_accuracy.cc
+++ b/diagnostics/cros_healthd/routines/floating_point/floating_point_accuracy.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "diagnostics/routines/floating_point/floating_point_accuracy.h"
+#include "diagnostics/cros_healthd/routines/floating_point/floating_point_accuracy.h"
#include <memory>
#include <string>
#include <vector>
-#include "diagnostics/routines/subproc_routine.h"
+#include "diagnostics/cros_healthd/routines/subproc_routine.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/routines/floating_point/floating_point_accuracy.h b/diagnostics/cros_healthd/routines/floating_point/floating_point_accuracy.h
new file mode 100644
index 0000000..2a1b407
--- /dev/null
+++ b/diagnostics/cros_healthd/routines/floating_point/floating_point_accuracy.h
@@ -0,0 +1,19 @@
+// Copyright 2020 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_FLOATING_POINT_FLOATING_POINT_ACCURACY_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_FLOATING_POINT_FLOATING_POINT_ACCURACY_H_
+
+#include <memory>
+
+#include "diagnostics/cros_healthd/routines/diag_routine.h"
+
+namespace diagnostics {
+
+std::unique_ptr<DiagnosticRoutine> CreateFloatingPointAccuracyRoutine(
+ base::TimeDelta exec_duration);
+
+} // namespace diagnostics
+
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_FLOATING_POINT_FLOATING_POINT_ACCURACY_H_
diff --git a/diagnostics/routines/floating_point/main.cc b/diagnostics/cros_healthd/routines/floating_point/main.cc
similarity index 100%
rename from diagnostics/routines/floating_point/main.cc
rename to diagnostics/cros_healthd/routines/floating_point/main.cc
diff --git a/diagnostics/routines/nvme_self_test/nvme_self_test.cc b/diagnostics/cros_healthd/routines/nvme_self_test/nvme_self_test.cc
similarity index 98%
rename from diagnostics/routines/nvme_self_test/nvme_self_test.cc
rename to diagnostics/cros_healthd/routines/nvme_self_test/nvme_self_test.cc
index 0fae768..3ec2361 100644
--- a/diagnostics/routines/nvme_self_test/nvme_self_test.cc
+++ b/diagnostics/cros_healthd/routines/nvme_self_test/nvme_self_test.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 "diagnostics/routines/nvme_self_test/nvme_self_test.h"
+#include "diagnostics/cros_healthd/routines/nvme_self_test/nvme_self_test.h"
#include <algorithm>
#include <utility>
diff --git a/diagnostics/routines/nvme_self_test/nvme_self_test.h b/diagnostics/cros_healthd/routines/nvme_self_test/nvme_self_test.h
similarity index 92%
rename from diagnostics/routines/nvme_self_test/nvme_self_test.h
rename to diagnostics/cros_healthd/routines/nvme_self_test/nvme_self_test.h
index d612758..31da794 100644
--- a/diagnostics/routines/nvme_self_test/nvme_self_test.h
+++ b/diagnostics/cros_healthd/routines/nvme_self_test/nvme_self_test.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 DIAGNOSTICS_ROUTINES_NVME_SELF_TEST_NVME_SELF_TEST_H_
-#define DIAGNOSTICS_ROUTINES_NVME_SELF_TEST_NVME_SELF_TEST_H_
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_NVME_SELF_TEST_NVME_SELF_TEST_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_NVME_SELF_TEST_NVME_SELF_TEST_H_
#include <cstdint>
#include <memory>
@@ -12,7 +12,7 @@
#include <brillo/errors/error.h>
#include "diagnostics/common/system/debugd_adapter.h"
-#include "diagnostics/routines/diag_routine.h"
+#include "diagnostics/cros_healthd/routines/diag_routine.h"
#include "mojo/cros_healthd_diagnostics.mojom.h"
namespace diagnostics {
@@ -100,4 +100,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_ROUTINES_NVME_SELF_TEST_NVME_SELF_TEST_H_
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_NVME_SELF_TEST_NVME_SELF_TEST_H_
diff --git a/diagnostics/routines/nvme_self_test/nvme_self_test_test.cc b/diagnostics/cros_healthd/routines/nvme_self_test/nvme_self_test_test.cc
similarity index 99%
rename from diagnostics/routines/nvme_self_test/nvme_self_test_test.cc
rename to diagnostics/cros_healthd/routines/nvme_self_test/nvme_self_test_test.cc
index 075eb0d..a596a4b 100644
--- a/diagnostics/routines/nvme_self_test/nvme_self_test_test.cc
+++ b/diagnostics/cros_healthd/routines/nvme_self_test/nvme_self_test_test.cc
@@ -14,8 +14,8 @@
#include "diagnostics/common/mojo_utils.h"
#include "diagnostics/common/system/mock_debugd_adapter.h"
-#include "diagnostics/routines/nvme_self_test/nvme_self_test.h"
-#include "diagnostics/routines/routine_test_utils.h"
+#include "diagnostics/cros_healthd/routines/nvme_self_test/nvme_self_test.h"
+#include "diagnostics/cros_healthd/routines/routine_test_utils.h"
#include "mojo/cros_healthd_diagnostics.mojom.h"
using testing::_;
diff --git a/diagnostics/routines/nvme_wear_level/nvme_wear_level.cc b/diagnostics/cros_healthd/routines/nvme_wear_level/nvme_wear_level.cc
similarity index 98%
rename from diagnostics/routines/nvme_wear_level/nvme_wear_level.cc
rename to diagnostics/cros_healthd/routines/nvme_wear_level/nvme_wear_level.cc
index cc94cc3..4fde826 100644
--- a/diagnostics/routines/nvme_wear_level/nvme_wear_level.cc
+++ b/diagnostics/cros_healthd/routines/nvme_wear_level/nvme_wear_level.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 "diagnostics/routines/nvme_wear_level/nvme_wear_level.h"
+#include "diagnostics/cros_healthd/routines/nvme_wear_level/nvme_wear_level.h"
#include <utility>
#include <vector>
diff --git a/diagnostics/routines/nvme_wear_level/nvme_wear_level.h b/diagnostics/cros_healthd/routines/nvme_wear_level/nvme_wear_level.h
similarity index 88%
rename from diagnostics/routines/nvme_wear_level/nvme_wear_level.h
rename to diagnostics/cros_healthd/routines/nvme_wear_level/nvme_wear_level.h
index 892c6cf..7cdf0ce 100644
--- a/diagnostics/routines/nvme_wear_level/nvme_wear_level.h
+++ b/diagnostics/cros_healthd/routines/nvme_wear_level/nvme_wear_level.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 DIAGNOSTICS_ROUTINES_NVME_WEAR_LEVEL_NVME_WEAR_LEVEL_H_
-#define DIAGNOSTICS_ROUTINES_NVME_WEAR_LEVEL_NVME_WEAR_LEVEL_H_
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_NVME_WEAR_LEVEL_NVME_WEAR_LEVEL_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_NVME_WEAR_LEVEL_NVME_WEAR_LEVEL_H_
#include <cstdint>
#include <memory>
@@ -12,7 +12,7 @@
#include <brillo/errors/error.h>
#include "diagnostics/common/system/debugd_adapter.h"
-#include "diagnostics/routines/diag_routine.h"
+#include "diagnostics/cros_healthd/routines/diag_routine.h"
#include "mojo/cros_healthd_diagnostics.mojom.h"
namespace diagnostics {
@@ -68,4 +68,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_ROUTINES_NVME_WEAR_LEVEL_NVME_WEAR_LEVEL_H_
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_NVME_WEAR_LEVEL_NVME_WEAR_LEVEL_H_
diff --git a/diagnostics/routines/nvme_wear_level/nvme_wear_level_test.cc b/diagnostics/cros_healthd/routines/nvme_wear_level/nvme_wear_level_test.cc
similarity index 97%
rename from diagnostics/routines/nvme_wear_level/nvme_wear_level_test.cc
rename to diagnostics/cros_healthd/routines/nvme_wear_level/nvme_wear_level_test.cc
index f8afb23..9704d25 100644
--- a/diagnostics/routines/nvme_wear_level/nvme_wear_level_test.cc
+++ b/diagnostics/cros_healthd/routines/nvme_wear_level/nvme_wear_level_test.cc
@@ -13,8 +13,8 @@
#include "diagnostics/common/mojo_utils.h"
#include "diagnostics/common/system/mock_debugd_adapter.h"
-#include "diagnostics/routines/nvme_wear_level/nvme_wear_level.h"
-#include "diagnostics/routines/routine_test_utils.h"
+#include "diagnostics/cros_healthd/routines/nvme_wear_level/nvme_wear_level.h"
+#include "diagnostics/cros_healthd/routines/routine_test_utils.h"
#include "mojo/cros_healthd_diagnostics.mojom.h"
using testing::_;
diff --git a/diagnostics/routines/prime_search/main.cc b/diagnostics/cros_healthd/routines/prime_search/main.cc
similarity index 94%
rename from diagnostics/routines/prime_search/main.cc
rename to diagnostics/cros_healthd/routines/prime_search/main.cc
index a4d93e5..444d12f 100644
--- a/diagnostics/routines/prime_search/main.cc
+++ b/diagnostics/cros_healthd/routines/prime_search/main.cc
@@ -9,7 +9,7 @@
#include <base/time/time.h>
#include <brillo/flag_helper.h>
-#include "diagnostics/routines/prime_search/prime_number_search.h"
+#include "diagnostics/cros_healthd/routines/prime_search/prime_number_search.h"
// 'prime_search' command-line tool:
// Calculates prime number between 2 to max_num and verifies the calculation
diff --git a/diagnostics/routines/prime_search/prime_number_search.cc b/diagnostics/cros_healthd/routines/prime_search/prime_number_search.cc
similarity index 94%
rename from diagnostics/routines/prime_search/prime_number_search.cc
rename to diagnostics/cros_healthd/routines/prime_search/prime_number_search.cc
index 39bc1b4..733e58d 100644
--- a/diagnostics/routines/prime_search/prime_number_search.cc
+++ b/diagnostics/cros_healthd/routines/prime_search/prime_number_search.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 "diagnostics/routines/prime_search/prime_number_search.h"
+#include "diagnostics/cros_healthd/routines/prime_search/prime_number_search.h"
#include <cmath>
diff --git a/diagnostics/routines/prime_search/prime_number_search.h b/diagnostics/cros_healthd/routines/prime_search/prime_number_search.h
similarity index 79%
rename from diagnostics/routines/prime_search/prime_number_search.h
rename to diagnostics/cros_healthd/routines/prime_search/prime_number_search.h
index 5171eff..874c6e4 100644
--- a/diagnostics/routines/prime_search/prime_number_search.h
+++ b/diagnostics/cros_healthd/routines/prime_search/prime_number_search.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 DIAGNOSTICS_ROUTINES_PRIME_SEARCH_PRIME_NUMBER_SEARCH_H_
-#define DIAGNOSTICS_ROUTINES_PRIME_SEARCH_PRIME_NUMBER_SEARCH_H_
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_PRIME_SEARCH_PRIME_NUMBER_SEARCH_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_PRIME_SEARCH_PRIME_NUMBER_SEARCH_H_
#include <bitset>
#include <cstdint>
@@ -34,4 +34,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_ROUTINES_PRIME_SEARCH_PRIME_NUMBER_SEARCH_H_
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_PRIME_SEARCH_PRIME_NUMBER_SEARCH_H_
diff --git a/diagnostics/routines/prime_search/prime_number_search_test.cc b/diagnostics/cros_healthd/routines/prime_search/prime_number_search_test.cc
similarity index 97%
rename from diagnostics/routines/prime_search/prime_number_search_test.cc
rename to diagnostics/cros_healthd/routines/prime_search/prime_number_search_test.cc
index 0267a6b..9259929 100644
--- a/diagnostics/routines/prime_search/prime_number_search_test.cc
+++ b/diagnostics/cros_healthd/routines/prime_search/prime_number_search_test.cc
@@ -7,7 +7,7 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include "diagnostics/routines/prime_search/prime_number_search.h"
+#include "diagnostics/cros_healthd/routines/prime_search/prime_number_search.h"
namespace diagnostics {
diff --git a/diagnostics/routines/prime_search/prime_search.cc b/diagnostics/cros_healthd/routines/prime_search/prime_search.cc
similarity index 85%
rename from diagnostics/routines/prime_search/prime_search.cc
rename to diagnostics/cros_healthd/routines/prime_search/prime_search.cc
index 36f6b77..2f34516 100644
--- a/diagnostics/routines/prime_search/prime_search.cc
+++ b/diagnostics/cros_healthd/routines/prime_search/prime_search.cc
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "diagnostics/routines/prime_search/prime_search.h"
+#include "diagnostics/cros_healthd/routines/prime_search/prime_search.h"
#include <string>
#include <vector>
#include <base/command_line.h>
-#include "diagnostics/routines/subproc_routine.h"
+#include "diagnostics/cros_healthd/routines/subproc_routine.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/routines/prime_search/prime_search.h b/diagnostics/cros_healthd/routines/prime_search/prime_search.h
new file mode 100644
index 0000000..c6269a3
--- /dev/null
+++ b/diagnostics/cros_healthd/routines/prime_search/prime_search.h
@@ -0,0 +1,19 @@
+// Copyright 2020 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_PRIME_SEARCH_PRIME_SEARCH_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_PRIME_SEARCH_PRIME_SEARCH_H_
+
+#include <memory>
+
+#include "diagnostics/cros_healthd/routines/diag_routine.h"
+
+namespace diagnostics {
+
+std::unique_ptr<DiagnosticRoutine> CreatePrimeSearchRoutine(
+ base::TimeDelta exec_duration, uint64_t max_num);
+
+} // namespace diagnostics
+
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_PRIME_SEARCH_PRIME_SEARCH_H_
diff --git a/diagnostics/routines/routine_test_utils.cc b/diagnostics/cros_healthd/routines/routine_test_utils.cc
similarity index 94%
rename from diagnostics/routines/routine_test_utils.cc
rename to diagnostics/cros_healthd/routines/routine_test_utils.cc
index c31f34a..26b7f0b 100644
--- a/diagnostics/routines/routine_test_utils.cc
+++ b/diagnostics/cros_healthd/routines/routine_test_utils.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 "diagnostics/routines/routine_test_utils.h"
+#include "diagnostics/cros_healthd/routines/routine_test_utils.h"
#include <gtest/gtest.h>
diff --git a/diagnostics/routines/routine_test_utils.h b/diagnostics/cros_healthd/routines/routine_test_utils.h
similarity index 84%
rename from diagnostics/routines/routine_test_utils.h
rename to diagnostics/cros_healthd/routines/routine_test_utils.h
index 4a2a918..18fc83d 100644
--- a/diagnostics/routines/routine_test_utils.h
+++ b/diagnostics/cros_healthd/routines/routine_test_utils.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 DIAGNOSTICS_ROUTINES_ROUTINE_TEST_UTILS_H_
-#define DIAGNOSTICS_ROUTINES_ROUTINE_TEST_UTILS_H_
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_ROUTINE_TEST_UTILS_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_ROUTINE_TEST_UTILS_H_
#include <string>
@@ -29,4 +29,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_ROUTINES_ROUTINE_TEST_UTILS_H_
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_ROUTINE_TEST_UTILS_H_
diff --git a/diagnostics/routines/smartctl_check/main.cc b/diagnostics/cros_healthd/routines/smartctl_check/main.cc
similarity index 96%
rename from diagnostics/routines/smartctl_check/main.cc
rename to diagnostics/cros_healthd/routines/smartctl_check/main.cc
index 5d6b439..26fcf95 100644
--- a/diagnostics/routines/smartctl_check/main.cc
+++ b/diagnostics/cros_healthd/routines/smartctl_check/main.cc
@@ -14,7 +14,7 @@
#include <dbus/dbus.h>
#include "debugd/dbus-proxies.h"
-#include "diagnostics/routines/smartctl_check/smartctl_check_utils.h"
+#include "diagnostics/cros_healthd/routines/smartctl_check/smartctl_check_utils.h"
// 'smartctl-check' command-line tool:
//
diff --git a/diagnostics/routines/smartctl_check/smartctl_check.cc b/diagnostics/cros_healthd/routines/smartctl_check/smartctl_check.cc
similarity index 76%
rename from diagnostics/routines/smartctl_check/smartctl_check.cc
rename to diagnostics/cros_healthd/routines/smartctl_check/smartctl_check.cc
index ac7092c..4725aa5 100644
--- a/diagnostics/routines/smartctl_check/smartctl_check.cc
+++ b/diagnostics/cros_healthd/routines/smartctl_check/smartctl_check.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 "diagnostics/routines/smartctl_check/smartctl_check.h"
+#include "diagnostics/cros_healthd/routines/smartctl_check/smartctl_check.h"
#include <utility>
@@ -10,8 +10,8 @@
#include <base/process/process_handle.h>
#include <base/command_line.h>
-#include "diagnostics/routines/diag_process_adapter_impl.h"
-#include "diagnostics/routines/subproc_routine.h"
+#include "diagnostics/cros_healthd/routines/diag_process_adapter_impl.h"
+#include "diagnostics/cros_healthd/routines/subproc_routine.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/routines/smartctl_check/smartctl_check.h b/diagnostics/cros_healthd/routines/smartctl_check/smartctl_check.h
new file mode 100644
index 0000000..1c2f4e3
--- /dev/null
+++ b/diagnostics/cros_healthd/routines/smartctl_check/smartctl_check.h
@@ -0,0 +1,18 @@
+// Copyright 2019 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_SMARTCTL_CHECK_SMARTCTL_CHECK_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_SMARTCTL_CHECK_SMARTCTL_CHECK_H_
+
+#include <memory>
+
+#include "diagnostics/cros_healthd/routines/subproc_routine.h"
+
+namespace diagnostics {
+
+std::unique_ptr<DiagnosticRoutine> CreateSmartctlCheckRoutine();
+
+} // namespace diagnostics
+
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_SMARTCTL_CHECK_SMARTCTL_CHECK_H_
diff --git a/diagnostics/routines/smartctl_check/smartctl_check_utils.cc b/diagnostics/cros_healthd/routines/smartctl_check/smartctl_check_utils.cc
similarity index 95%
rename from diagnostics/routines/smartctl_check/smartctl_check_utils.cc
rename to diagnostics/cros_healthd/routines/smartctl_check/smartctl_check_utils.cc
index 0649ea5..e56eee9 100644
--- a/diagnostics/routines/smartctl_check/smartctl_check_utils.cc
+++ b/diagnostics/cros_healthd/routines/smartctl_check/smartctl_check_utils.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 "diagnostics/routines/smartctl_check/smartctl_check_utils.h"
+#include "diagnostics/cros_healthd/routines/smartctl_check/smartctl_check_utils.h"
#include <sstream>
diff --git a/diagnostics/routines/smartctl_check/smartctl_check_utils.h b/diagnostics/cros_healthd/routines/smartctl_check/smartctl_check_utils.h
similarity index 66%
rename from diagnostics/routines/smartctl_check/smartctl_check_utils.h
rename to diagnostics/cros_healthd/routines/smartctl_check/smartctl_check_utils.h
index 231ec11..c19224e 100644
--- a/diagnostics/routines/smartctl_check/smartctl_check_utils.h
+++ b/diagnostics/cros_healthd/routines/smartctl_check/smartctl_check_utils.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 DIAGNOSTICS_ROUTINES_SMARTCTL_CHECK_SMARTCTL_CHECK_UTILS_H_
-#define DIAGNOSTICS_ROUTINES_SMARTCTL_CHECK_SMARTCTL_CHECK_UTILS_H_
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_SMARTCTL_CHECK_SMARTCTL_CHECK_UTILS_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_SMARTCTL_CHECK_SMARTCTL_CHECK_UTILS_H_
#include <string>
@@ -16,4 +16,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_ROUTINES_SMARTCTL_CHECK_SMARTCTL_CHECK_UTILS_H_
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_SMARTCTL_CHECK_SMARTCTL_CHECK_UTILS_H_
diff --git a/diagnostics/routines/smartctl_check/smartctl_check_utils_test.cc b/diagnostics/cros_healthd/routines/smartctl_check/smartctl_check_utils_test.cc
similarity index 97%
rename from diagnostics/routines/smartctl_check/smartctl_check_utils_test.cc
rename to diagnostics/cros_healthd/routines/smartctl_check/smartctl_check_utils_test.cc
index 5a59228..dd21b3d 100644
--- a/diagnostics/routines/smartctl_check/smartctl_check_utils_test.cc
+++ b/diagnostics/cros_healthd/routines/smartctl_check/smartctl_check_utils_test.cc
@@ -6,7 +6,7 @@
#include <base/strings/stringprintf.h>
#include <gtest/gtest.h>
-#include "diagnostics/routines/smartctl_check/smartctl_check_utils.h"
+#include "diagnostics/cros_healthd/routines/smartctl_check/smartctl_check_utils.h"
namespace diagnostics {
namespace {
diff --git a/diagnostics/routines/subproc_routine.cc b/diagnostics/cros_healthd/routines/subproc_routine.cc
similarity index 98%
rename from diagnostics/routines/subproc_routine.cc
rename to diagnostics/cros_healthd/routines/subproc_routine.cc
index 35aa295..b2eb386 100644
--- a/diagnostics/routines/subproc_routine.cc
+++ b/diagnostics/cros_healthd/routines/subproc_routine.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 "diagnostics/routines/subproc_routine.h"
+#include "diagnostics/cros_healthd/routines/subproc_routine.h"
#include <algorithm>
#include <utility>
@@ -12,7 +12,7 @@
#include <base/strings/string_util.h>
#include <base/process/process_handle.h>
-#include "diagnostics/routines/diag_process_adapter_impl.h"
+#include "diagnostics/cros_healthd/routines/diag_process_adapter_impl.h"
namespace diagnostics {
namespace mojo_ipc = ::chromeos::cros_healthd::mojom;
diff --git a/diagnostics/routines/subproc_routine.h b/diagnostics/cros_healthd/routines/subproc_routine.h
similarity index 94%
rename from diagnostics/routines/subproc_routine.h
rename to diagnostics/cros_healthd/routines/subproc_routine.h
index a76175b..dabc4cb 100644
--- a/diagnostics/routines/subproc_routine.h
+++ b/diagnostics/cros_healthd/routines/subproc_routine.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 DIAGNOSTICS_ROUTINES_SUBPROC_ROUTINE_H_
-#define DIAGNOSTICS_ROUTINES_SUBPROC_ROUTINE_H_
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_SUBPROC_ROUTINE_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_SUBPROC_ROUTINE_H_
#include <cstdint>
#include <list>
@@ -14,8 +14,8 @@
#include <base/process/process.h>
#include <base/time/default_tick_clock.h>
-#include "diagnostics/routines/diag_process_adapter.h"
-#include "diagnostics/routines/diag_routine.h"
+#include "diagnostics/cros_healthd/routines/diag_process_adapter.h"
+#include "diagnostics/cros_healthd/routines/diag_routine.h"
namespace diagnostics {
@@ -138,4 +138,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_ROUTINES_SUBPROC_ROUTINE_H_
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_SUBPROC_ROUTINE_H_
diff --git a/diagnostics/routines/subproc_routine_test.cc b/diagnostics/cros_healthd/routines/subproc_routine_test.cc
similarity index 98%
rename from diagnostics/routines/subproc_routine_test.cc
rename to diagnostics/cros_healthd/routines/subproc_routine_test.cc
index 701b56a..3be758b 100644
--- a/diagnostics/routines/subproc_routine_test.cc
+++ b/diagnostics/cros_healthd/routines/subproc_routine_test.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 "diagnostics/routines/subproc_routine.h"
+#include "diagnostics/cros_healthd/routines/subproc_routine.h"
#include <cstdint>
#include <list>
@@ -14,8 +14,8 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include "diagnostics/routines/diag_process_adapter.h"
-#include "diagnostics/routines/routine_test_utils.h"
+#include "diagnostics/cros_healthd/routines/diag_process_adapter.h"
+#include "diagnostics/cros_healthd/routines/routine_test_utils.h"
namespace diagnostics {
namespace mojo_ipc = ::chromeos::cros_healthd::mojom;
diff --git a/diagnostics/routines/urandom/main.cc b/diagnostics/cros_healthd/routines/urandom/main.cc
similarity index 100%
rename from diagnostics/routines/urandom/main.cc
rename to diagnostics/cros_healthd/routines/urandom/main.cc
diff --git a/diagnostics/routines/urandom/urandom.cc b/diagnostics/cros_healthd/routines/urandom/urandom.cc
similarity index 80%
rename from diagnostics/routines/urandom/urandom.cc
rename to diagnostics/cros_healthd/routines/urandom/urandom.cc
index e1dd570..4d9052b 100644
--- a/diagnostics/routines/urandom/urandom.cc
+++ b/diagnostics/cros_healthd/routines/urandom/urandom.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "diagnostics/routines/urandom/urandom.h"
+#include "diagnostics/cros_healthd/routines/urandom/urandom.h"
#include <utility>
#include <vector>
#include <base/logging.h>
-#include "diagnostics/routines/diag_process_adapter_impl.h"
-#include "diagnostics/routines/subproc_routine.h"
+#include "diagnostics/cros_healthd/routines/diag_process_adapter_impl.h"
+#include "diagnostics/cros_healthd/routines/subproc_routine.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/routines/urandom/urandom.h b/diagnostics/cros_healthd/routines/urandom/urandom.h
new file mode 100644
index 0000000..dc8d70e
--- /dev/null
+++ b/diagnostics/cros_healthd/routines/urandom/urandom.h
@@ -0,0 +1,25 @@
+// Copyright 2019 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef DIAGNOSTICS_CROS_HEALTHD_ROUTINES_URANDOM_URANDOM_H_
+#define DIAGNOSTICS_CROS_HEALTHD_ROUTINES_URANDOM_URANDOM_H_
+
+#include <cstdint>
+#include <memory>
+#include <string>
+
+#include <base/macros.h>
+#include <base/process/process.h>
+
+#include "diagnostics/cros_healthd/routines/diag_process_adapter.h"
+#include "diagnostics/cros_healthd/routines/diag_routine.h"
+
+namespace diagnostics {
+
+std::unique_ptr<DiagnosticRoutine> CreateUrandomRoutine(
+ uint32_t length_seconds);
+
+} // namespace diagnostics
+
+#endif // DIAGNOSTICS_CROS_HEALTHD_ROUTINES_URANDOM_URANDOM_H_
diff --git a/diagnostics/routines/cpu_cache/cpu_cache.h b/diagnostics/routines/cpu_cache/cpu_cache.h
deleted file mode 100644
index 67d5c62..0000000
--- a/diagnostics/routines/cpu_cache/cpu_cache.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2020 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef DIAGNOSTICS_ROUTINES_CPU_CACHE_CPU_CACHE_H_
-#define DIAGNOSTICS_ROUTINES_CPU_CACHE_CPU_CACHE_H_
-
-#include <cstdint>
-#include <memory>
-
-#include "diagnostics/routines/diag_routine.h"
-
-namespace diagnostics {
-
-std::unique_ptr<DiagnosticRoutine> CreateCpuCacheRoutine(
- base::TimeDelta exec_duration);
-
-} // namespace diagnostics
-
-#endif // DIAGNOSTICS_ROUTINES_CPU_CACHE_CPU_CACHE_H_
diff --git a/diagnostics/routines/cpu_stress/cpu_stress.h b/diagnostics/routines/cpu_stress/cpu_stress.h
deleted file mode 100644
index 1710ba9..0000000
--- a/diagnostics/routines/cpu_stress/cpu_stress.h
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2020 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef DIAGNOSTICS_ROUTINES_CPU_STRESS_CPU_STRESS_H_
-#define DIAGNOSTICS_ROUTINES_CPU_STRESS_CPU_STRESS_H_
-
-#include <cstdint>
-#include <memory>
-
-#include "diagnostics/routines/diag_routine.h"
-
-namespace diagnostics {
-
-std::unique_ptr<DiagnosticRoutine> CreateCpuStressRoutine(
- base::TimeDelta exec_duration);
-
-} // namespace diagnostics
-
-#endif // DIAGNOSTICS_ROUTINES_CPU_STRESS_CPU_STRESS_H_
diff --git a/diagnostics/routines/floating_point/floating_point_accuracy.h b/diagnostics/routines/floating_point/floating_point_accuracy.h
deleted file mode 100644
index 8874fc0..0000000
--- a/diagnostics/routines/floating_point/floating_point_accuracy.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2020 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef DIAGNOSTICS_ROUTINES_FLOATING_POINT_FLOATING_POINT_ACCURACY_H_
-#define DIAGNOSTICS_ROUTINES_FLOATING_POINT_FLOATING_POINT_ACCURACY_H_
-
-#include <memory>
-
-#include "diagnostics/routines/diag_routine.h"
-
-namespace diagnostics {
-
-std::unique_ptr<DiagnosticRoutine> CreateFloatingPointAccuracyRoutine(
- base::TimeDelta exec_duration);
-
-} // namespace diagnostics
-
-#endif // DIAGNOSTICS_ROUTINES_FLOATING_POINT_FLOATING_POINT_ACCURACY_H_
diff --git a/diagnostics/routines/prime_search/prime_search.h b/diagnostics/routines/prime_search/prime_search.h
deleted file mode 100644
index 5e616da..0000000
--- a/diagnostics/routines/prime_search/prime_search.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2020 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef DIAGNOSTICS_ROUTINES_PRIME_SEARCH_PRIME_SEARCH_H_
-#define DIAGNOSTICS_ROUTINES_PRIME_SEARCH_PRIME_SEARCH_H_
-
-#include <memory>
-
-#include "diagnostics/routines/diag_routine.h"
-
-namespace diagnostics {
-
-std::unique_ptr<DiagnosticRoutine> CreatePrimeSearchRoutine(
- base::TimeDelta exec_duration, uint64_t max_num);
-
-} // namespace diagnostics
-
-#endif // DIAGNOSTICS_ROUTINES_PRIME_SEARCH_PRIME_SEARCH_H_
diff --git a/diagnostics/routines/smartctl_check/smartctl_check.h b/diagnostics/routines/smartctl_check/smartctl_check.h
deleted file mode 100644
index 73cce38..0000000
--- a/diagnostics/routines/smartctl_check/smartctl_check.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2019 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef DIAGNOSTICS_ROUTINES_SMARTCTL_CHECK_SMARTCTL_CHECK_H_
-#define DIAGNOSTICS_ROUTINES_SMARTCTL_CHECK_SMARTCTL_CHECK_H_
-
-#include <memory>
-
-#include "diagnostics/routines/subproc_routine.h"
-
-namespace diagnostics {
-
-std::unique_ptr<DiagnosticRoutine> CreateSmartctlCheckRoutine();
-
-} // namespace diagnostics
-
-#endif // DIAGNOSTICS_ROUTINES_SMARTCTL_CHECK_SMARTCTL_CHECK_H_
diff --git a/diagnostics/routines/urandom/urandom.h b/diagnostics/routines/urandom/urandom.h
deleted file mode 100644
index 9b22bd9..0000000
--- a/diagnostics/routines/urandom/urandom.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2019 The Chromium OS Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef DIAGNOSTICS_ROUTINES_URANDOM_URANDOM_H_
-#define DIAGNOSTICS_ROUTINES_URANDOM_URANDOM_H_
-
-#include <cstdint>
-#include <memory>
-#include <string>
-
-#include <base/macros.h>
-#include <base/process/process.h>
-
-#include "diagnostics/routines/diag_process_adapter.h"
-#include "diagnostics/routines/diag_routine.h"
-#include "wilco_dtc_supportd.pb.h" // NOLINT(build/include)
-
-namespace diagnostics {
-
-std::unique_ptr<DiagnosticRoutine> CreateUrandomRoutine(
- uint32_t length_seconds);
-
-} // namespace diagnostics
-
-#endif // DIAGNOSTICS_ROUTINES_URANDOM_URANDOM_H_
