diagnostics: move Status headers to common.
They are going to be re-used in the cros_healthd_mojo_adapter.
BUG=b:151176984
TEST=unittest
Change-Id: I6281126becb4240d62852cfacfa8308fc071dde7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2291850
Commit-Queue: Daniil Lunev <dlunev@chromium.org>
Tested-by: Daniil Lunev <dlunev@chromium.org>
Reviewed-by: Paul Moy <pmoy@chromium.org>
diff --git a/diagnostics/cros_healthd/utils/storage/status_macros.h b/diagnostics/common/status_macros.h
similarity index 81%
rename from diagnostics/cros_healthd/utils/storage/status_macros.h
rename to diagnostics/common/status_macros.h
index 69990ac..76b35a0 100644
--- a/diagnostics/cros_healthd/utils/storage/status_macros.h
+++ b/diagnostics/common/status_macros.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef DIAGNOSTICS_CROS_HEALTHD_UTILS_STORAGE_STATUS_MACROS_H_
-#define DIAGNOSTICS_CROS_HEALTHD_UTILS_STORAGE_STATUS_MACROS_H_
+#ifndef DIAGNOSTICS_COMMON_STATUS_MACROS_H_
+#define DIAGNOSTICS_COMMON_STATUS_MACROS_H_
#include <utility>
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
+#include "diagnostics/common/statusor.h"
#define RETURN_IF_ERROR(rexpr) \
do { \
@@ -33,4 +33,4 @@
#define STATUS_MACROS_IMPL_CONCAT_INNER_(x, y) x##y
#define STATUS_MACROS_IMPL_CONCAT_(x, y) STATUS_MACROS_IMPL_CONCAT_INNER_(x, y)
-#endif // DIAGNOSTICS_CROS_HEALTHD_UTILS_STORAGE_STATUS_MACROS_H_
+#endif // DIAGNOSTICS_COMMON_STATUS_MACROS_H_
diff --git a/diagnostics/cros_healthd/utils/storage/statusor.h b/diagnostics/common/statusor.h
similarity index 92%
rename from diagnostics/cros_healthd/utils/storage/statusor.h
rename to diagnostics/common/statusor.h
index 3afb6f3..2ff5726 100644
--- a/diagnostics/cros_healthd/utils/storage/statusor.h
+++ b/diagnostics/common/statusor.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_CROS_HEALTHD_UTILS_STORAGE_STATUSOR_H_
-#define DIAGNOSTICS_CROS_HEALTHD_UTILS_STORAGE_STATUSOR_H_
+#ifndef DIAGNOSTICS_COMMON_STATUSOR_H_
+#define DIAGNOSTICS_COMMON_STATUSOR_H_
#include <string>
#include <utility>
@@ -94,4 +94,4 @@
} // namespace diagnostics
-#endif // DIAGNOSTICS_CROS_HEALTHD_UTILS_STORAGE_STATUSOR_H_
+#endif // DIAGNOSTICS_COMMON_STATUSOR_H_
diff --git a/diagnostics/cros_healthd/fetchers/disk_fetcher.cc b/diagnostics/cros_healthd/fetchers/disk_fetcher.cc
index df8e329..9222a8c 100644
--- a/diagnostics/cros_healthd/fetchers/disk_fetcher.cc
+++ b/diagnostics/cros_healthd/fetchers/disk_fetcher.cc
@@ -10,12 +10,12 @@
#include <base/optional.h>
#include <brillo/udev/udev.h>
+#include "diagnostics/common/status_macros.h"
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/error_utils.h"
#include "diagnostics/cros_healthd/utils/storage/device_lister.h"
#include "diagnostics/cros_healthd/utils/storage/device_manager.h"
#include "diagnostics/cros_healthd/utils/storage/device_resolver.h"
-#include "diagnostics/cros_healthd/utils/storage/status_macros.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/caching_device_adapter.h b/diagnostics/cros_healthd/utils/storage/caching_device_adapter.h
index 4776d08..ae2840f 100644
--- a/diagnostics/cros_healthd/utils/storage/caching_device_adapter.h
+++ b/diagnostics/cros_healthd/utils/storage/caching_device_adapter.h
@@ -11,8 +11,8 @@
#include <base/optional.h>
-#include "diagnostics/cros_healthd/utils/storage/status_macros.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
+#include "diagnostics/common/status_macros.h"
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/storage/storage_device_adapter.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/default_device_adapter.cc b/diagnostics/cros_healthd/utils/storage/default_device_adapter.cc
index e75c270..01b0d5c 100644
--- a/diagnostics/cros_healthd/utils/storage/default_device_adapter.cc
+++ b/diagnostics/cros_healthd/utils/storage/default_device_adapter.cc
@@ -10,7 +10,7 @@
#include <base/strings/stringprintf.h>
#include "diagnostics/common/file_utils.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
+#include "diagnostics/common/statusor.h"
#include "mojo/cros_healthd_probe.mojom.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/default_device_adapter.h b/diagnostics/cros_healthd/utils/storage/default_device_adapter.h
index 29361b8..3786d32 100644
--- a/diagnostics/cros_healthd/utils/storage/default_device_adapter.h
+++ b/diagnostics/cros_healthd/utils/storage/default_device_adapter.h
@@ -9,7 +9,7 @@
#include <base/files/file_path.h>
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/storage/storage_device_adapter.h"
#include "mojo/cros_healthd_probe.mojom.h"
diff --git a/diagnostics/cros_healthd/utils/storage/default_device_adapter_test.cc b/diagnostics/cros_healthd/utils/storage/default_device_adapter_test.cc
index 2bb96bb..165cf1a 100644
--- a/diagnostics/cros_healthd/utils/storage/default_device_adapter_test.cc
+++ b/diagnostics/cros_healthd/utils/storage/default_device_adapter_test.cc
@@ -6,8 +6,8 @@
#include <gtest/gtest.h>
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/storage/default_device_adapter.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/device_info.cc b/diagnostics/cros_healthd/utils/storage/device_info.cc
index 75511e6..3b44ec4 100644
--- a/diagnostics/cros_healthd/utils/storage/device_info.cc
+++ b/diagnostics/cros_healthd/utils/storage/device_info.cc
@@ -16,14 +16,14 @@
#include <base/strings/string_split.h>
#include "diagnostics/common/file_utils.h"
+#include "diagnostics/common/status_macros.h"
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/error_utils.h"
#include "diagnostics/cros_healthd/utils/storage/caching_device_adapter.h"
#include "diagnostics/cros_healthd/utils/storage/default_device_adapter.h"
#include "diagnostics/cros_healthd/utils/storage/disk_iostat.h"
#include "diagnostics/cros_healthd/utils/storage/emmc_device_adapter.h"
#include "diagnostics/cros_healthd/utils/storage/nvme_device_adapter.h"
-#include "diagnostics/cros_healthd/utils/storage/status_macros.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
#include "diagnostics/cros_healthd/utils/storage/storage_device_adapter.h"
#include "mojo/cros_healthd_probe.mojom.h"
diff --git a/diagnostics/cros_healthd/utils/storage/device_info.h b/diagnostics/cros_healthd/utils/storage/device_info.h
index e1940fc..b2695cb 100644
--- a/diagnostics/cros_healthd/utils/storage/device_info.h
+++ b/diagnostics/cros_healthd/utils/storage/device_info.h
@@ -12,10 +12,10 @@
#include <base/files/file_path.h>
#include <base/optional.h>
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/error_utils.h"
#include "diagnostics/cros_healthd/utils/storage/disk_iostat.h"
#include "diagnostics/cros_healthd/utils/storage/platform.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
#include "diagnostics/cros_healthd/utils/storage/storage_device_adapter.h"
#include "mojo/cros_healthd_probe.mojom.h"
diff --git a/diagnostics/cros_healthd/utils/storage/device_info_test.cc b/diagnostics/cros_healthd/utils/storage/device_info_test.cc
index d1127ad..0310531 100644
--- a/diagnostics/cros_healthd/utils/storage/device_info_test.cc
+++ b/diagnostics/cros_healthd/utils/storage/device_info_test.cc
@@ -10,9 +10,9 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/storage/device_info.h"
#include "diagnostics/cros_healthd/utils/storage/mock/mock_platform.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
#include "mojo/cros_healthd_probe.mojom.h"
using testing::_;
diff --git a/diagnostics/cros_healthd/utils/storage/device_manager.cc b/diagnostics/cros_healthd/utils/storage/device_manager.cc
index 9ee654c..c3893b1 100644
--- a/diagnostics/cros_healthd/utils/storage/device_manager.cc
+++ b/diagnostics/cros_healthd/utils/storage/device_manager.cc
@@ -17,9 +17,9 @@
#include <brillo/udev/udev.h>
#include <brillo/udev/udev_device.h>
+#include "diagnostics/common/status_macros.h"
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/storage/device_info.h"
-#include "diagnostics/cros_healthd/utils/storage/status_macros.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
#include "mojo/cros_healthd_probe.mojom.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/device_manager.h b/diagnostics/cros_healthd/utils/storage/device_manager.h
index e9cb274..e211c1e 100644
--- a/diagnostics/cros_healthd/utils/storage/device_manager.h
+++ b/diagnostics/cros_healthd/utils/storage/device_manager.h
@@ -15,11 +15,11 @@
#include <brillo/udev/udev.h>
#include <brillo/udev/udev_device.h>
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/error_utils.h"
#include "diagnostics/cros_healthd/utils/storage/device_info.h"
#include "diagnostics/cros_healthd/utils/storage/device_lister.h"
#include "diagnostics/cros_healthd/utils/storage/device_resolver.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/device_resolver.cc b/diagnostics/cros_healthd/utils/storage/device_resolver.cc
index 90e3c65..2226f73 100644
--- a/diagnostics/cros_healthd/utils/storage/device_resolver.cc
+++ b/diagnostics/cros_healthd/utils/storage/device_resolver.cc
@@ -12,8 +12,8 @@
#include <libmount/libmount.h>
-#include "diagnostics/cros_healthd/utils/storage/status_macros.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
+#include "diagnostics/common/status_macros.h"
+#include "diagnostics/common/statusor.h"
#include "mojo/cros_healthd_probe.mojom.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/device_resolver.h b/diagnostics/cros_healthd/utils/storage/device_resolver.h
index 7536187..7481d8a 100644
--- a/diagnostics/cros_healthd/utils/storage/device_resolver.h
+++ b/diagnostics/cros_healthd/utils/storage/device_resolver.h
@@ -12,7 +12,7 @@
#include <base/files/file_path.h>
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
+#include "diagnostics/common/statusor.h"
#include "mojo/cros_healthd_probe.mojom.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/disk_iostat.cc b/diagnostics/cros_healthd/utils/storage/disk_iostat.cc
index 4c1781f..8ee3a9f 100644
--- a/diagnostics/cros_healthd/utils/storage/disk_iostat.cc
+++ b/diagnostics/cros_healthd/utils/storage/disk_iostat.cc
@@ -13,7 +13,7 @@
#include <base/optional.h>
#include <base/time/time.h>
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
+#include "diagnostics/common/statusor.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/disk_iostat.h b/diagnostics/cros_healthd/utils/storage/disk_iostat.h
index f3b59ab..515f2c8 100644
--- a/diagnostics/cros_healthd/utils/storage/disk_iostat.h
+++ b/diagnostics/cros_healthd/utils/storage/disk_iostat.h
@@ -11,7 +11,7 @@
#include <base/optional.h>
#include <base/time/time.h>
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
+#include "diagnostics/common/statusor.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/disk_iostat_test.cc b/diagnostics/cros_healthd/utils/storage/disk_iostat_test.cc
index 523cfb2..36c878d 100644
--- a/diagnostics/cros_healthd/utils/storage/disk_iostat_test.cc
+++ b/diagnostics/cros_healthd/utils/storage/disk_iostat_test.cc
@@ -4,8 +4,8 @@
#include <gtest/gtest.h>
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/storage/disk_iostat.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/emmc_device_adapter.cc b/diagnostics/cros_healthd/utils/storage/emmc_device_adapter.cc
index 210a576..30580cd 100644
--- a/diagnostics/cros_healthd/utils/storage/emmc_device_adapter.cc
+++ b/diagnostics/cros_healthd/utils/storage/emmc_device_adapter.cc
@@ -15,7 +15,7 @@
#include <base/strings/stringprintf.h>
#include "diagnostics/common/file_utils.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
+#include "diagnostics/common/statusor.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/emmc_device_adapter.h b/diagnostics/cros_healthd/utils/storage/emmc_device_adapter.h
index d2d9751..af27b13 100644
--- a/diagnostics/cros_healthd/utils/storage/emmc_device_adapter.h
+++ b/diagnostics/cros_healthd/utils/storage/emmc_device_adapter.h
@@ -9,7 +9,7 @@
#include <base/files/file_path.h>
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/storage/storage_device_adapter.h"
#include "mojo/cros_healthd_probe.mojom.h"
diff --git a/diagnostics/cros_healthd/utils/storage/emmc_device_adapter_test.cc b/diagnostics/cros_healthd/utils/storage/emmc_device_adapter_test.cc
index a594264..b37fdcc 100644
--- a/diagnostics/cros_healthd/utils/storage/emmc_device_adapter_test.cc
+++ b/diagnostics/cros_healthd/utils/storage/emmc_device_adapter_test.cc
@@ -6,8 +6,8 @@
#include <gtest/gtest.h>
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/storage/emmc_device_adapter.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/mock/mock_device_adapter.h b/diagnostics/cros_healthd/utils/storage/mock/mock_device_adapter.h
index e32a58a..e58bdc2 100644
--- a/diagnostics/cros_healthd/utils/storage/mock/mock_device_adapter.h
+++ b/diagnostics/cros_healthd/utils/storage/mock/mock_device_adapter.h
@@ -10,7 +10,7 @@
#include <gmock/gmock.h>
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/storage/storage_device_adapter.h"
#include "mojo/cros_healthd_probe.mojom.h"
diff --git a/diagnostics/cros_healthd/utils/storage/nvme_device_adapter.cc b/diagnostics/cros_healthd/utils/storage/nvme_device_adapter.cc
index 1ae27fa..196d0e5 100644
--- a/diagnostics/cros_healthd/utils/storage/nvme_device_adapter.cc
+++ b/diagnostics/cros_healthd/utils/storage/nvme_device_adapter.cc
@@ -15,7 +15,7 @@
#include <base/strings/stringprintf.h>
#include "diagnostics/common/file_utils.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
+#include "diagnostics/common/statusor.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/nvme_device_adapter.h b/diagnostics/cros_healthd/utils/storage/nvme_device_adapter.h
index b2c228a..653983b 100644
--- a/diagnostics/cros_healthd/utils/storage/nvme_device_adapter.h
+++ b/diagnostics/cros_healthd/utils/storage/nvme_device_adapter.h
@@ -9,7 +9,7 @@
#include <base/files/file_path.h>
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/storage/storage_device_adapter.h"
#include "mojo/cros_healthd_probe.mojom.h"
diff --git a/diagnostics/cros_healthd/utils/storage/nvme_device_adapter_test.cc b/diagnostics/cros_healthd/utils/storage/nvme_device_adapter_test.cc
index 75fa701..393d64a 100644
--- a/diagnostics/cros_healthd/utils/storage/nvme_device_adapter_test.cc
+++ b/diagnostics/cros_healthd/utils/storage/nvme_device_adapter_test.cc
@@ -6,8 +6,8 @@
#include <gtest/gtest.h>
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/storage/nvme_device_adapter.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/platform.cc b/diagnostics/cros_healthd/utils/storage/platform.cc
index ff7b3e9..4adaaa4 100644
--- a/diagnostics/cros_healthd/utils/storage/platform.cc
+++ b/diagnostics/cros_healthd/utils/storage/platform.cc
@@ -17,8 +17,8 @@
#include <base/posix/eintr_wrapper.h>
#include <rootdev/rootdev.h>
+#include "diagnostics/common/statusor.h"
#include "diagnostics/cros_healthd/utils/storage/platform.h"
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/platform.h b/diagnostics/cros_healthd/utils/storage/platform.h
index ce4a6c5..6e3685d 100644
--- a/diagnostics/cros_healthd/utils/storage/platform.h
+++ b/diagnostics/cros_healthd/utils/storage/platform.h
@@ -10,7 +10,7 @@
#include <base/files/file_path.h>
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
+#include "diagnostics/common/statusor.h"
namespace diagnostics {
diff --git a/diagnostics/cros_healthd/utils/storage/storage_device_adapter.h b/diagnostics/cros_healthd/utils/storage/storage_device_adapter.h
index cf732c7..7fc81cc 100644
--- a/diagnostics/cros_healthd/utils/storage/storage_device_adapter.h
+++ b/diagnostics/cros_healthd/utils/storage/storage_device_adapter.h
@@ -7,7 +7,7 @@
#include <cstdint>
#include <string>
-#include "diagnostics/cros_healthd/utils/storage/statusor.h"
+#include "diagnostics/common/statusor.h"
#include "mojo/cros_healthd_probe.mojom.h"
namespace diagnostics {
