Do not show Wifi Sync in search if phone not supported

Bug: 1162307
Change-Id: Ia52ba4e2866832c22243b1b001b4cfe88921f440
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2616355Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Jon Mann <jonmann@chromium.org>
Commit-Queue: Claude van der Merwe <cvandermerwe@google.com>
Cr-Commit-Position: refs/heads/master@{#842142}

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

@@ -553,13 +553,10 @@ void MultiDeviceSection::OnHostStatusChanged(
         host_status_with_device) {
   SearchTagRegistry::ScopedTagUpdater updater = registry()->StartUpdate();
   updater.RemoveSearchTags(GetMultiDeviceOptedOutSearchConcepts());
-  updater.RemoveSearchTags(GetMultiDeviceOptedInWifiSyncSearchConcepts());
   updater.RemoveSearchTags(GetMultiDeviceOptedInSearchConcepts());
 
   if (IsOptedIn(host_status_with_device.first)) {
     updater.AddSearchTags(GetMultiDeviceOptedInSearchConcepts());
-    if (features::IsWifiSyncAndroidEnabled())
-      updater.AddSearchTags(GetMultiDeviceOptedInWifiSyncSearchConcepts());
   } else {
     updater.AddSearchTags(GetMultiDeviceOptedOutSearchConcepts());
   }
@@ -571,13 +568,16 @@ void MultiDeviceSection::OnFeatureStatesChanged(
   SearchTagRegistry::ScopedTagUpdater updater = registry()->StartUpdate();
   updater.RemoveSearchTags(GetSmartLockOptionsSearchConcepts());
   updater.RemoveSearchTags(GetMultiDeviceOptedInPhoneHubSearchConcepts());
+  updater.RemoveSearchTags(GetMultiDeviceOptedInWifiSyncSearchConcepts());
 
   if (feature_states_map.at(multidevice_setup::mojom::Feature::kSmartLock) ==
       multidevice_setup::mojom::FeatureState::kEnabledByUser) {
     updater.AddSearchTags(GetSmartLockOptionsSearchConcepts());
   }
-  if (IsPhoneHubSupported())
+  if (IsFeatureSupported(multidevice_setup::mojom::Feature::kPhoneHub))
     updater.AddSearchTags(GetMultiDeviceOptedInPhoneHubSearchConcepts());
+  if (IsFeatureSupported(multidevice_setup::mojom::Feature::kWifiSync))
+    updater.AddSearchTags(GetMultiDeviceOptedInWifiSyncSearchConcepts());
 }
 
 void MultiDeviceSection::OnNearbySharingEnabledChanged() {
@@ -592,9 +592,10 @@ void MultiDeviceSection::OnNearbySharingEnabledChanged() {
   }
 }
 
-bool MultiDeviceSection::IsPhoneHubSupported() {
-  const FeatureState feature_state = multidevice_setup_client_->GetFeatureState(
-      multidevice_setup::mojom::Feature::kPhoneHub);
+bool MultiDeviceSection::IsFeatureSupported(
+    multidevice_setup::mojom::Feature feature) {
+  const FeatureState feature_state =
+      multidevice_setup_client_->GetFeatureState(feature);
   return feature_state != FeatureState::kNotSupportedByPhone &&
          feature_state != FeatureState::kNotSupportedByChromebook;
 }

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

@@ -68,7 +68,7 @@ class MultiDeviceSection
   // Nearby Share enabled pref change observer.
   void OnNearbySharingEnabledChanged();
 
-  bool IsPhoneHubSupported();
+  bool IsFeatureSupported(multidevice_setup::mojom::Feature feature);
 
   multidevice_setup::MultiDeviceSetupClient* multidevice_setup_client_;
   phonehub::PhoneHubManager* phone_hub_manager_;