diff --git a/chrome/browser/sharing/sharing_utils_unittest.cc b/chrome/browser/sharing/sharing_utils_unittest.cc
index d8d5c825..09a97130 100644
--- a/chrome/browser/sharing/sharing_utils_unittest.cc
+++ b/chrome/browser/sharing/sharing_utils_unittest.cc
@@ -126,28 +126,28 @@
 
 TEST_F(SharingUtilsTest, GetDevicePlatform) {
   EXPECT_EQ(GetDevicePlatform(*CreateFakeDeviceInfo(
-                kDeviceGuid, kDeviceName, /*sharing_info=*/absl::nullopt,
+                kDeviceGuid, kDeviceName, /*sharing_info=*/std::nullopt,
                 sync_pb::SyncEnums_DeviceType_TYPE_CROS,
                 syncer::DeviceInfo::OsType::kChromeOsAsh,
                 syncer::DeviceInfo::FormFactor::kDesktop)),
             SharingDevicePlatform::kChromeOS);
 
   EXPECT_EQ(GetDevicePlatform(*CreateFakeDeviceInfo(
-                kDeviceGuid, kDeviceName, /*sharing_info=*/absl::nullopt,
+                kDeviceGuid, kDeviceName, /*sharing_info=*/std::nullopt,
                 sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
                 syncer::DeviceInfo::OsType::kLinux,
                 syncer::DeviceInfo::FormFactor::kDesktop)),
             SharingDevicePlatform::kLinux);
 
   EXPECT_EQ(GetDevicePlatform(*CreateFakeDeviceInfo(
-                kDeviceGuid, kDeviceName, /*sharing_info=*/absl::nullopt,
+                kDeviceGuid, kDeviceName, /*sharing_info=*/std::nullopt,
                 sync_pb::SyncEnums_DeviceType_TYPE_MAC,
                 syncer::DeviceInfo::OsType::kMac,
                 syncer::DeviceInfo::FormFactor::kDesktop)),
             SharingDevicePlatform::kMac);
 
   EXPECT_EQ(GetDevicePlatform(*CreateFakeDeviceInfo(
-                kDeviceGuid, kDeviceName, /*sharing_info=*/absl::nullopt,
+                kDeviceGuid, kDeviceName, /*sharing_info=*/std::nullopt,
                 sync_pb::SyncEnums_DeviceType_TYPE_WIN,
                 syncer::DeviceInfo::OsType::kWindows,
                 syncer::DeviceInfo::FormFactor::kDesktop)),
@@ -155,40 +155,40 @@
 
   EXPECT_EQ(
       GetDevicePlatform(*CreateFakeDeviceInfo(
-          kDeviceGuid, kDeviceName, /*sharing_info=*/absl::nullopt,
+          kDeviceGuid, kDeviceName, /*sharing_info=*/std::nullopt,
           sync_pb::SyncEnums_DeviceType_TYPE_PHONE,
           syncer::DeviceInfo::OsType::kIOS,
           syncer::DeviceInfo::FormFactor::kPhone, "Apple Inc.", "iPhone 50")),
       SharingDevicePlatform::kIOS);
   EXPECT_EQ(
       GetDevicePlatform(*CreateFakeDeviceInfo(
-          kDeviceGuid, kDeviceName, /*sharing_info=*/absl::nullopt,
+          kDeviceGuid, kDeviceName, /*sharing_info=*/std::nullopt,
           sync_pb::SyncEnums_DeviceType_TYPE_TABLET,
           syncer::DeviceInfo::OsType::kIOS,
           syncer::DeviceInfo::FormFactor::kTablet, "Apple Inc.", "iPad 99")),
       SharingDevicePlatform::kIOS);
 
   EXPECT_EQ(GetDevicePlatform(*CreateFakeDeviceInfo(
-                kDeviceGuid, kDeviceName, /*sharing_info=*/absl::nullopt,
+                kDeviceGuid, kDeviceName, /*sharing_info=*/std::nullopt,
                 sync_pb::SyncEnums_DeviceType_TYPE_PHONE,
                 syncer::DeviceInfo::OsType::kAndroid,
                 syncer::DeviceInfo::FormFactor::kPhone, "Google", "Pixel 777")),
             SharingDevicePlatform::kAndroid);
   EXPECT_EQ(GetDevicePlatform(*CreateFakeDeviceInfo(
-                kDeviceGuid, kDeviceName, /*sharing_info=*/absl::nullopt,
+                kDeviceGuid, kDeviceName, /*sharing_info=*/std::nullopt,
                 sync_pb::SyncEnums_DeviceType_TYPE_TABLET,
                 syncer::DeviceInfo::OsType::kAndroid,
                 syncer::DeviceInfo::FormFactor::kTablet, "Google", "Pixel Z")),
             SharingDevicePlatform::kAndroid);
 
   EXPECT_EQ(GetDevicePlatform(*CreateFakeDeviceInfo(
-                kDeviceGuid, kDeviceName, /*sharing_info=*/absl::nullopt,
+                kDeviceGuid, kDeviceName, /*sharing_info=*/std::nullopt,
                 sync_pb::SyncEnums_DeviceType_TYPE_UNSET,
                 syncer::DeviceInfo::OsType::kUnknown,
                 syncer::DeviceInfo::FormFactor::kUnknown)),
             SharingDevicePlatform::kUnknown);
   EXPECT_EQ(GetDevicePlatform(*CreateFakeDeviceInfo(
-                kDeviceGuid, kDeviceName, /*sharing_info=*/absl::nullopt,
+                kDeviceGuid, kDeviceName, /*sharing_info=*/std::nullopt,
                 sync_pb::SyncEnums_DeviceType_TYPE_OTHER,
                 syncer::DeviceInfo::OsType::kUnknown,
                 syncer::DeviceInfo::FormFactor::kUnknown)),