cfm-device-monitor: migrate base::TimeDelta::From* to base:*
The functions were migrated on upstream in r927512 (crrev.com/c/3198824)
and removed in r931007 (crrev.com/c/3219846).
Change recreated by running sed.
BUG=b:211560276
TEST=FEATURES=test emerge-endeavour {apex,huddly,mimo}-monitor
Change-Id: I8bf0c772075b0c678cb8dc66fb7f416194e01e26
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/cfm-device-monitor/+/3401986
Tested-by: Grace Cham <hscham@chromium.org>
Reviewed-by: Pablo Ceballos <pceballos@chromium.org>
Commit-Queue: Grace Cham <hscham@chromium.org>
diff --git a/apex-monitor/apex_monitor.cc b/apex-monitor/apex_monitor.cc
index 4687683..ba85e5d 100644
--- a/apex-monitor/apex_monitor.cc
+++ b/apex-monitor/apex_monitor.cc
@@ -46,7 +46,7 @@
void ApexMonitor::PostTask(Functor&& task, const int& delay_ms) {
brillo::MessageLoop::current()->PostDelayedTask(
FROM_HERE, base::Bind(task, weak_factory_.GetWeakPtr()),
- base::TimeDelta::FromMilliseconds(delay_ms));
+ base::Milliseconds(delay_ms));
}
void ApexMonitor::CheckChipStatus() {
diff --git a/camera-monitor/abstract_monitor.cc b/camera-monitor/abstract_monitor.cc
index e565ae2..c90e2b2 100644
--- a/camera-monitor/abstract_monitor.cc
+++ b/camera-monitor/abstract_monitor.cc
@@ -52,7 +52,7 @@
std::string err_msg;
while (Monitor(&err_msg)) {
base::PlatformThread::Sleep(
- base::TimeDelta::FromMilliseconds(sleep_time_milliseconds_));
+ base::Milliseconds(sleep_time_milliseconds_));
}
if (terminate_) {
diff --git a/camera-monitor/huddly_monitor.cc b/camera-monitor/huddly_monitor.cc
index 53f6c01..bae3b6f 100644
--- a/camera-monitor/huddly_monitor.cc
+++ b/camera-monitor/huddly_monitor.cc
@@ -214,7 +214,7 @@
result = camera_->Reset();
} else {
const base::TimeDelta kPowerCycleDelay =
- base::TimeDelta::FromMilliseconds(200);
+ base::Milliseconds(200);
// Guado can't power cycle USB devices trough permission_broker, it uses a
// board specific implementation instead.
std::string board = base::SysInfo::GetLsbReleaseBoard();
@@ -236,7 +236,7 @@
LOG(WARNING) << "Detected crashed camera. Rebooted.";
const uint32_t kRebootSleepTimeSeconds = 30;
base::PlatformThread::Sleep(
- base::TimeDelta::FromSeconds(kRebootSleepTimeSeconds));
+ base::Seconds(kRebootSleepTimeSeconds));
}
return result;
diff --git a/camera-monitor/main.cc b/camera-monitor/main.cc
index a480a46..9200ae2 100644
--- a/camera-monitor/main.cc
+++ b/camera-monitor/main.cc
@@ -16,8 +16,8 @@
#include "cfm-device-monitor/camera-monitor/huddly_monitor.h"
#include "cfm-device-monitor/camera-monitor/udev.h"
-constexpr auto kMetricsStartDelay = base::TimeDelta::FromMilliseconds(500);
-constexpr auto kMetricsTimeInterval = base::TimeDelta::FromMinutes(15);
+constexpr auto kMetricsStartDelay = base::Milliseconds(500);
+constexpr auto kMetricsTimeInterval = base::Minutes(15);
class HuddlyDaemon : public brillo::Daemon {
public:
diff --git a/camera-monitor/tools.cc b/camera-monitor/tools.cc
index d1f1eb3..55f5dbb 100644
--- a/camera-monitor/tools.cc
+++ b/camera-monitor/tools.cc
@@ -21,7 +21,7 @@
namespace {
const base::TimeDelta kHotplugSleepTime =
- base::TimeDelta::FromMilliseconds(200);
+ base::Milliseconds(200);
const uint8_t kBufLength = 100;
} // namespace
diff --git a/mimo-monitor/displaylink_monitor.cc b/mimo-monitor/displaylink_monitor.cc
index f9836b1..5fdd04f 100644
--- a/mimo-monitor/displaylink_monitor.cc
+++ b/mimo-monitor/displaylink_monitor.cc
@@ -108,7 +108,7 @@
frame_cnt1 = data_buf[0];
// Let a few frames go by. Use loop to avoid early return here.
- base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(50));
+ base::PlatformThread::Sleep(base::Milliseconds(50));
// Read frame count again.
ret = Peek(dev_handle.get(), kPeekValue, kPeekAddr, data_buf, 1);
diff --git a/mimo-monitor/mimo_monitor.cc b/mimo-monitor/mimo_monitor.cc
index 1c1fdb4..a15089e 100644
--- a/mimo-monitor/mimo_monitor.cc
+++ b/mimo-monitor/mimo_monitor.cc
@@ -162,7 +162,7 @@
if (!mimo_found_) {
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, base::Bind(&MimoMonitor::FindMimo, GetWeakPtr()),
- base::TimeDelta::FromMilliseconds(kFindMimoSleepTimeMs));
+ base::Milliseconds(kFindMimoSleepTimeMs));
return;
}
@@ -175,7 +175,7 @@
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, base::Bind(&MimoMonitor::FindMimo, GetWeakPtr()),
- base::TimeDelta::FromMilliseconds(kResetSleepTimeMs));
+ base::Milliseconds(kResetSleepTimeMs));
return;
}
@@ -188,7 +188,7 @@
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, base::Bind(&MimoMonitor::FindMimo, GetWeakPtr()),
- base::TimeDelta::FromMilliseconds(kResetSleepTimeMs));
+ base::Milliseconds(kResetSleepTimeMs));
return;
}
@@ -201,7 +201,7 @@
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, base::Bind(&MimoMonitor::FindMimo, GetWeakPtr()),
- base::TimeDelta::FromMilliseconds(kResetSleepTimeMs));
+ base::Milliseconds(kResetSleepTimeMs));
return;
}
@@ -210,7 +210,7 @@
base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, base::Bind(&MimoMonitor::CheckMimoHealth, GetWeakPtr()),
- base::TimeDelta::FromMilliseconds(kPingIntervalMs));
+ base::Milliseconds(kPingIntervalMs));
return;
}
