From 8ffa9267ceb84f1e859fd175ea5115d6d685440f Mon Sep 17 00:00:00 2001
From: Francis Tsui <ftsui@google.com>
Date: Thu, 13 Nov 2025 16:07:17 -0800
Subject: [PATCH] Deprecate flags that have been launched.

PiperOrigin-RevId: 832047988
---
 sharing/flags/generated/nearby_sharing_feature_flags.h | 8 --------
 sharing/nearby_sharing_service_impl.cc                 | 9 +--------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/sharing/flags/generated/nearby_sharing_feature_flags.h b/sharing/flags/generated/nearby_sharing_feature_flags.h
index b19b6e00..071eb51d 100755
--- a/sharing/flags/generated/nearby_sharing_feature_flags.h
+++ b/sharing/flags/generated/nearby_sharing_feature_flags.h
@@ -76,12 +76,6 @@ constexpr auto kDeleteUnexpectedReceivedFileFix =
 // The default time in milliseconds a cached entry can be in LOST state.
 constexpr auto kDiscoveryCacheLostExpiryMs =
     flags::Flag<int64_t>(kConfigPackage, "45658774", 500);
-// When true, use the Titanium flag from the Nearby backend.
-constexpr auto kEnableNearbyBackendTitaniumConfig =
-    flags::Flag<bool>(kConfigPackage, "45731874", false);
-// When true, enable Nearby Share gRPC async client.
-constexpr auto kEnableNearbyShareGrpcAsyncClient =
-    flags::Flag<bool>(kConfigPackage, "45726584", false);
 // When true, enable wifi hotspot medium for HP Realtek devices.
 constexpr auto kEnableWifiHotspotForHpRealtekDevices =
     flags::Flag<bool>(kConfigPackage, "45673628", false);
@@ -128,8 +122,6 @@ inline absl::btree_map<int, const flags::Flag<bool>&> GetBoolFlags() {
       {45409033, kShowAutoUpdateSetting},
       {45630055, kUseGrpcClient},
       {45657036, kDeleteUnexpectedReceivedFileFix},
-      {45731874, kEnableNearbyBackendTitaniumConfig},
-      {45726584, kEnableNearbyShareGrpcAsyncClient},
       {45673628, kEnableWifiHotspotForHpRealtekDevices},
       {45683539, kUseAlternateServiceUuidForDiscovery},
       {45410558, kShowAdminModeWarning},
diff --git a/sharing/nearby_sharing_service_impl.cc b/sharing/nearby_sharing_service_impl.cc
index d9686fe4..80d6e5a0 100644
--- a/sharing/nearby_sharing_service_impl.cc
+++ b/sharing/nearby_sharing_service_impl.cc
@@ -2619,16 +2619,9 @@ void NearbySharingServiceImpl::OnOutgoingConnectionKeyVerificationDone(
       !NearbyFlags::GetInstance().GetBoolFlag(
           config_package_nearby::nearby_sharing_feature::
               kSenderSkipsConfirmation);
-  bool protection_enabled = mendel_advanced_protection_enabled;
-  if (NearbyFlags::GetInstance().GetBoolFlag(
-          config_package_nearby::nearby_sharing_feature::
-              kEnableNearbyBackendTitaniumConfig)) {
-    protection_enabled = be_advanced_protection_enabled;
-  }
+  bool protection_enabled = be_advanced_protection_enabled;
   bool advanced_protection_mismatch =
       (be_advanced_protection_enabled != mendel_advanced_protection_enabled);
-  // Continue to use mendel flag until we have confidence that the Nearby BE
-  // flag has the same value.
   session->SetAdvancedProtectionStatus(protection_enabled,
                                        advanced_protection_mismatch);
   if (session->token().empty() || !mendel_advanced_protection_enabled) {