[MultidevicePage] Fix "Smart lock screen lock options" when smart lock disabled

Fix the "Smart lock screen lock options" search tag behavior to only
appear when the smart lock feature is enabled by the user and the
corresponding options buttons are visible.

Bug: 1116553
Change-Id: Ib5a7194b8a97a639ba4df6b96952a92e4fb47270
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2429935
Commit-Queue: Daniel Classon <dclasson@google.com>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810914}

chrome/browser/ui/webui/settings/chromeos/multidevice_section.cc

@@ -37,13 +37,7 @@ namespace {
 
 const std::vector<SearchConcept>& GetMultiDeviceOptedInSearchConcepts() {
   static const base::NoDestructor<std::vector<SearchConcept>> tags(
-      {{IDS_OS_SETTINGS_TAG_MULTIDEVICE_SMART_LOCK_OPTIONS,
-        mojom::kSmartLockSubpagePath,
-        mojom::SearchResultIcon::kLock,
-        mojom::SearchResultDefaultRank::kMedium,
-        mojom::SearchResultType::kSetting,
-        {.setting = mojom::Setting::kSmartLockUnlockOrSignIn}},
-       {IDS_OS_SETTINGS_TAG_MULTIDEVICE_FORGET,
+      {{IDS_OS_SETTINGS_TAG_MULTIDEVICE_FORGET,
         mojom::kMultiDeviceFeaturesSubpagePath,
         mojom::SearchResultIcon::kPhone,
         mojom::SearchResultDefaultRank::kMedium,
@@ -75,6 +69,17 @@ const std::vector<SearchConcept>& GetMultiDeviceOptedInSearchConcepts() {
   return *tags;
 }
 
+const std::vector<SearchConcept>& GetSmartLockOptionsSearchConcepts() {
+  static const base::NoDestructor<std::vector<SearchConcept>> tags(
+      {{IDS_OS_SETTINGS_TAG_MULTIDEVICE_SMART_LOCK_OPTIONS,
+        mojom::kSmartLockSubpagePath,
+        mojom::SearchResultIcon::kLock,
+        mojom::SearchResultDefaultRank::kMedium,
+        mojom::SearchResultType::kSetting,
+        {.setting = mojom::Setting::kSmartLockUnlockOrSignIn}}});
+  return *tags;
+}
+
 const std::vector<SearchConcept>&
 GetMultiDeviceOptedInPhoneHubSearchConcepts() {
   static const base::NoDestructor<std::vector<SearchConcept>> tags(
@@ -247,6 +252,7 @@ MultiDeviceSection::MultiDeviceSection(
 
   multidevice_setup_client_->AddObserver(this);
   OnHostStatusChanged(multidevice_setup_client_->GetHostStatus());
+  OnFeatureStatesChanged(multidevice_setup_client_->GetFeatureStates());
 }
 
 MultiDeviceSection::~MultiDeviceSection() {
@@ -488,6 +494,18 @@ void MultiDeviceSection::OnHostStatusChanged(
   }
 }
 
+void MultiDeviceSection::OnFeatureStatesChanged(
+    const multidevice_setup::MultiDeviceSetupClient::FeatureStatesMap&
+        feature_states_map) {
+  SearchTagRegistry::ScopedTagUpdater updater = registry()->StartUpdate();
+  updater.RemoveSearchTags(GetSmartLockOptionsSearchConcepts());
+
+  if (feature_states_map.at(multidevice_setup::mojom::Feature::kSmartLock) ==
+      multidevice_setup::mojom::FeatureState::kEnabledByUser) {
+    updater.AddSearchTags(GetSmartLockOptionsSearchConcepts());
+  }
+}
+
 void MultiDeviceSection::OnNearbySharingEnabledChanged() {
   SearchTagRegistry::ScopedTagUpdater updater = registry()->StartUpdate();
 

chrome/browser/ui/webui/settings/chromeos/multidevice_section.h

@@ -59,6 +59,9 @@ class MultiDeviceSection
   void OnHostStatusChanged(
       const multidevice_setup::MultiDeviceSetupClient::HostStatusWithDevice&
           host_status_with_device) override;
+  void OnFeatureStatesChanged(
+      const multidevice_setup::MultiDeviceSetupClient::FeatureStatesMap&
+          feature_states_map) override;
 
   // Nearby Share enabled pref change observer.
   void OnNearbySharingEnabledChanged();