From 001069faa1f702b749c308a61d1b8fce1272c9d6 Mon Sep 17 00:00:00 2001
From: Crisrael Lucero <crisrael@google.com>
Date: Mon, 10 Jul 2023 14:42:12 -0700
Subject: [PATCH] Convert std::variant usage to absl::variant

PiperOrigin-RevId: 546987633
---
 connections/v3/BUILD                 |  1 +
 connections/v3/connections_device.cc | 16 ++++++++--------
 presence/BUILD                       |  1 +
 presence/presence_device.cc          | 17 +++++++++--------
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/connections/v3/BUILD b/connections/v3/BUILD
index 9cdc47b4..7aa7a7b2 100644
--- a/connections/v3/BUILD
+++ b/connections/v3/BUILD
@@ -25,6 +25,7 @@ cc_library(
         "//proto:connections_enums_cc_proto",
         "@com_google_absl//absl/functional:any_invocable",
         "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/types:variant",
     ],
 )
 
diff --git a/connections/v3/connections_device.cc b/connections/v3/connections_device.cc
index c2d3ab67..402f5a0a 100644
--- a/connections/v3/connections_device.cc
+++ b/connections/v3/connections_device.cc
@@ -15,9 +15,9 @@
 #include "connections/v3/connections_device.h"
 
 #include <string>
-#include <variant>
 
 #include "absl/strings/str_cat.h"
+#include "absl/types/variant.h"
 #include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "internal/platform/ble_connection_info.h"
 #include "internal/platform/bluetooth_connection_info.h"
@@ -31,22 +31,22 @@ std::string ConnectionsDevice::ToProtoBytes() const {
   // Bytes holding the connection info data elements.
   std::string connection_info_string;
   for (const auto& connection_info : connection_infos_) {
-    if (std::holds_alternative<absl::monostate>(connection_info)) {
+    if (absl::holds_alternative<absl::monostate>(connection_info)) {
       continue;
     }
-    if (std::holds_alternative<BleConnectionInfo>(connection_info)) {
+    if (absl::holds_alternative<BleConnectionInfo>(connection_info)) {
       absl::StrAppend(
           &connection_info_string,
-          std::get<BleConnectionInfo>(connection_info).ToDataElementBytes());
+          absl::get<BleConnectionInfo>(connection_info).ToDataElementBytes());
     }
-    if (std::holds_alternative<WifiLanConnectionInfo>(connection_info)) {
+    if (absl::holds_alternative<WifiLanConnectionInfo>(connection_info)) {
       absl::StrAppend(&connection_info_string,
-                      std::get<WifiLanConnectionInfo>(connection_info)
+                      absl::get<WifiLanConnectionInfo>(connection_info)
                           .ToDataElementBytes());
     }
-    if (std::holds_alternative<BluetoothConnectionInfo>(connection_info)) {
+    if (absl::holds_alternative<BluetoothConnectionInfo>(connection_info)) {
       absl::StrAppend(&connection_info_string,
-                      std::get<BluetoothConnectionInfo>(connection_info)
+                      absl::get<BluetoothConnectionInfo>(connection_info)
                           .ToDataElementBytes());
     }
   }
diff --git a/presence/BUILD b/presence/BUILD
index 6c49a01f..9645c99c 100644
--- a/presence/BUILD
+++ b/presence/BUILD
@@ -36,6 +36,7 @@ cc_library(
         "//presence/implementation:internal",  # build_cleaner: keep
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
+        "@com_google_absl//absl/types:variant",
     ],
 )
 
diff --git a/presence/presence_device.cc b/presence/presence_device.cc
index 175cf382..afbec278 100644
--- a/presence/presence_device.cc
+++ b/presence/presence_device.cc
@@ -15,9 +15,9 @@
 #include "presence/presence_device.h"
 
 #include <string>
-#include <variant>
 #include <vector>
 
+#include "absl/types/variant.h"
 #include "connections/implementation/proto/offline_wire_formats.pb.h"
 #include "internal/interop/device.h"
 #include "internal/platform/ble_connection_info.h"
@@ -139,19 +139,20 @@ std::string PresenceDevice::ToProtoBytes() const {
   }
   std::string connection_infos = "";
   for (const auto& connection_info : GetConnectionInfos()) {
-    if (std::holds_alternative<absl::monostate>(connection_info)) {
+    if (absl::holds_alternative<absl::monostate>(connection_info)) {
       continue;
     }
-    if (std::holds_alternative<BleConnectionInfo>(connection_info)) {
+    if (absl::holds_alternative<BleConnectionInfo>(connection_info)) {
       connection_infos +=
-          std::get<BleConnectionInfo>(connection_info).ToDataElementBytes();
+          absl::get<BleConnectionInfo>(connection_info).ToDataElementBytes();
     }
-    if (std::holds_alternative<WifiLanConnectionInfo>(connection_info)) {
+    if (absl::holds_alternative<WifiLanConnectionInfo>(connection_info)) {
       connection_infos +=
-          std::get<WifiLanConnectionInfo>(connection_info).ToDataElementBytes();
+          absl::get<WifiLanConnectionInfo>(connection_info)
+              .ToDataElementBytes();
     }
-    if (std::holds_alternative<BluetoothConnectionInfo>(connection_info)) {
-      connection_infos += std::get<BluetoothConnectionInfo>(connection_info)
+    if (absl::holds_alternative<BluetoothConnectionInfo>(connection_info)) {
+      connection_infos += absl::get<BluetoothConnectionInfo>(connection_info)
                               .ToDataElementBytes();
     }
   }