View | Details | Raw Unified | Return to bug 246387
Collapse All | Expand All

(-)./files/patch-base_system_sys__info__freebsd.cc (-2 / +13 lines)
Lines 1-6 Link Here
1 
--- base/system/sys_info_freebsd.cc.orig	2019-12-16 21:50:40 UTC
 1 
--- base/system/sys_info_freebsd.cc.orig	2020-06-24 07:44:41 UTC
2 
+++ base/system/sys_info_freebsd.cc
 2 
+++ base/system/sys_info_freebsd.cc
3 
@@ -13,26 +13,59 @@
 3 
@@ -13,26 +13,70 @@
4 
 namespace base {
 4 
 namespace base {
5
5
6 
 int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
 6 
 int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
Lines 49-54 Link Here
49 
+  if (sysctl(mib, base::size(mib), &name, &size, NULL, 0) == 0)
 49 
+  if (sysctl(mib, base::size(mib), &name, &size, NULL, 0) == 0)
50 
+    return name;
 50 
+    return name;
51 
+  return std::string();
 51 
+  return std::string();
52 
+}
53 
+
54 
+SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() {
55 
+  HardwareInfo info;
56 
+  // Set the manufacturer to "FreeBSD" and the model to
57 
+  // an empty string.
58 
+  info.manufacturer = "FreeBSD";
59 
+  info.model = HardwareModelName();
60 
+  DCHECK(IsStringUTF8(info.manufacturer));
61 
+  DCHECK(IsStringUTF8(info.model));
62 
+  return info;
52 
+}
 63 
+}
53 
+
 64 
+
54 
+// static
 65 
+// static
(-)./files/patch-components_sync__device__info_device__info__sync__bridge.cc (-16 lines)
Lines 1-16 Link Here
1 
--- components/sync_device_info/device_info_sync_bridge.cc.orig	2020-03-16 18:40:31 UTC
2 
+++ components/sync_device_info/device_info_sync_bridge.cc
3 
@@ -456,11 +456,13 @@ void DeviceInfoSyncBridge::OnStoreCreated(
4 
     return;
5 
   }
6
7 
+#if !defined(OS_BSD)
8 
   store_ = std::move(store);
9
10 
   base::SysInfo::GetHardwareInfo(
11 
       base::BindOnce(&DeviceInfoSyncBridge::OnHardwareInfoRetrieved,
12 
                      weak_ptr_factory_.GetWeakPtr()));
13 
+#endif
14 
 }
15
16 
 void DeviceInfoSyncBridge::OnHardwareInfoRetrieved(

Return to bug 246387