summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_system_sys__info__unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_system_sys__info__unittest.cc')
-rw-r--r--www/chromium/files/patch-base_system_sys__info__unittest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/chromium/files/patch-base_system_sys__info__unittest.cc b/www/chromium/files/patch-base_system_sys__info__unittest.cc
index 02bec6b99962..75ea1a02ee4e 100644
--- a/www/chromium/files/patch-base_system_sys__info__unittest.cc
+++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc
@@ -1,6 +1,6 @@
---- base/system/sys_info_unittest.cc.orig 2021-01-18 21:28:45 UTC
+--- base/system/sys_info_unittest.cc.orig 2021-03-12 23:57:15 UTC
+++ base/system/sys_info_unittest.cc
-@@ -50,13 +50,13 @@ TEST_F(SysInfoTest, AmountOfMem) {
+@@ -62,13 +62,13 @@ TEST_F(SysInfoTest, AmountOfMem) {
EXPECT_GE(SysInfo::AmountOfVirtualMemory(), 0);
}
@@ -17,16 +17,16 @@
TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMemory) {
// Note: info is in _K_bytes.
SystemMemoryInfoKB info;
-@@ -87,7 +87,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMem
+@@ -99,7 +99,7 @@ TEST_F(SysInfoTest, MAYBE_AmountOfAvailablePhysicalMem
EXPECT_GT(amount, static_cast<int64_t>(info.free) * 1024);
EXPECT_LT(amount / 1024, info.total);
}
-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID)
-+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSDD)
++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD)
TEST_F(SysInfoTest, AmountOfFreeDiskSpace) {
// We aren't actually testing that it's correct, just that it's sane.
-@@ -137,7 +137,7 @@ TEST_F(SysInfoTest, NestedVolumesAmountOfTotalDiskSpac
+@@ -149,7 +149,7 @@ TEST_F(SysInfoTest, NestedVolumesAmountOfTotalDiskSpac
}
#endif // defined(OS_FUCHSIA)
@@ -35,7 +35,7 @@
defined(OS_CHROMEOS) || defined(OS_FUCHSIA)
TEST_F(SysInfoTest, OperatingSystemVersionNumbers) {
int32_t os_major_version = -1;
-@@ -198,7 +198,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
+@@ -210,7 +210,7 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
EXPECT_TRUE(IsStringUTF8(hardware_info->model));
bool empty_result_expected =
#if defined(OS_ANDROID) || defined(OS_APPLE) || defined(OS_WIN) || \