From 9c6cde0770446f1e22b99c8e47db25dc5123eae4 Mon Sep 17 00:00:00 2001
From: Francis Tsui <ftsui@google.com>
Date: Fri, 24 May 2024 14:03:50 -0700
Subject: [PATCH] Remove auto app start flag from settings.

PiperOrigin-RevId: 637027668
---
 sharing/common/nearby_share_prefs.cc    |  3 ---
 sharing/nearby_sharing_settings.cc      | 12 ------------
 sharing/nearby_sharing_settings.h       |  3 ---
 sharing/nearby_sharing_settings_test.cc | 10 ----------
 4 files changed, 28 deletions(-)

diff --git a/sharing/common/nearby_share_prefs.cc b/sharing/common/nearby_share_prefs.cc
index 34357024..873d2d1a 100644
--- a/sharing/common/nearby_share_prefs.cc
+++ b/sharing/common/nearby_share_prefs.cc
@@ -100,8 +100,6 @@ ABSL_CONST_INIT const char kNearbySharingIsAnalyticsEnabledName[] =
     "nearby_sharing.is_analytics_enabled";
 ABSL_CONST_INIT const char kNearbySharingIsAllContactsEnabledName[] =
     "nearby_sharing.is_all_contacts_enabled";
-ABSL_CONST_INIT const char kNearbySharingAutoAppStartEnabledName[] =
-    "nearby_sharing.auto_app_start_enabled";
 
 void RegisterNearbySharingPrefs(PreferenceManager& preference_manager,
                                 bool skip_persistent_ones) {
@@ -169,7 +167,6 @@ void RegisterNearbySharingPrefs(PreferenceManager& preference_manager,
 
   preference_manager.SetBoolean(kNearbySharingIsAnalyticsEnabledName, false);
   preference_manager.SetBoolean(kNearbySharingIsAllContactsEnabledName, true);
-  preference_manager.SetBoolean(kNearbySharingAutoAppStartEnabledName, true);
 }
 
 void ResetSchedulers(PreferenceManager& preference_manager) {
diff --git a/sharing/nearby_sharing_settings.cc b/sharing/nearby_sharing_settings.cc
index 79d320bb..8b3b1512 100644
--- a/sharing/nearby_sharing_settings.cc
+++ b/sharing/nearby_sharing_settings.cc
@@ -589,18 +589,6 @@ void NearbyShareSettings::SetIsAllContactsEnabled(
   }
 }
 
-bool NearbyShareSettings::GetAutoAppStartEnabled() const {
-  MutexLock lock(&mutex_);
-  return preference_manager_.GetBoolean(
-      prefs::kNearbySharingAutoAppStartEnabledName, true);
-}
-
-void NearbyShareSettings::SetAutoAppStartEnabled(bool is_auto_app_start) const {
-  MutexLock lock(&mutex_);
-  preference_manager_.SetBoolean(prefs::kNearbySharingAutoAppStartEnabledName,
-                                   is_auto_app_start);
-}
-
 void NearbyShareSettings::SendDesktopNotification(
     DesktopNotification event) const {
   analytics_recorder_->NewSendDesktopNotification(event);
diff --git a/sharing/nearby_sharing_settings.h b/sharing/nearby_sharing_settings.h
index be3215bf..e18535de 100644
--- a/sharing/nearby_sharing_settings.h
+++ b/sharing/nearby_sharing_settings.h
@@ -228,9 +228,6 @@ class NearbyShareSettings
   void SetCustomSavePathAsync(absl::string_view save_path,
                               const std::function<void()>& callback);
 
-  bool GetAutoAppStartEnabled() const;
-  void SetAutoAppStartEnabled(bool is_auto_app_start) const;
-
   // NearbyShareLocalDeviceDataManager::Observer:
   void OnLocalDeviceDataChanged(bool did_device_name_change,
                                 bool did_full_name_change,
diff --git a/sharing/nearby_sharing_settings_test.cc b/sharing/nearby_sharing_settings_test.cc
index e7be3699..fd4c2175 100644
--- a/sharing/nearby_sharing_settings_test.cc
+++ b/sharing/nearby_sharing_settings_test.cc
@@ -520,16 +520,6 @@ TEST_F(NearbyShareSettingsTest, GetAndSetAllowedContacts) {
   EXPECT_EQ(allowed_contacts.size(), 0u);
 }
 
-TEST_F(NearbyShareSettingsTest, GetAndSetAutoAppStartEnabled) {
-  bool is_auto_app_start_enabled = settings()->GetAutoAppStartEnabled();
-  EXPECT_TRUE(is_auto_app_start_enabled);
-
-  settings()->SetAutoAppStartEnabled(false);
-  Flush();
-  is_auto_app_start_enabled = settings()->GetAutoAppStartEnabled();
-  EXPECT_FALSE(is_auto_app_start_enabled);
-}
-
 TEST_F(NearbyShareSettingsTest, SendDesktopNotification) {
   settings()->SendDesktopNotification(
       DesktopNotification::DESKTOP_NOTIFICATION_UNKNOWN);