Use the new flag to guard the Connected Devices settings.

kEnableUnifiedMultiDeviceSettings should be used here instead of the old
flag that was added for SMS sync. This new flag is part of the unified
better together effort.

R=dpapad@chromium.org, khorimoto@chromium.org

Bug: 824568
Change-Id: Id1c21c0905213bcbcf3a18e17d7a51ffc2e57194
Reviewed-on: https://chromium-review.googlesource.com/1092238Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Jeremy Klein <jlklein@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565693}

chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

@@ -52,6 +52,7 @@
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/ui/webui/chromeos/bluetooth_dialog_localized_strings_provider.h"
 #include "chrome/browser/ui/webui/chromeos/network_element_localized_strings_provider.h"
+#include "chromeos/chromeos_features.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/arc/arc_util.h"
 #include "components/user_manager/user_manager.h"
@@ -2479,8 +2480,10 @@ void AddMultideviceStrings(content::WebUIDataSource* html_source) {
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
 
-  html_source->AddBoolean("enableMultideviceSettings",
-                          base::FeatureList::IsEnabled(features::kMultidevice));
+  html_source->AddBoolean(
+      "enableMultideviceSettings",
+      base::FeatureList::IsEnabled(
+          chromeos::features::kEnableUnifiedMultiDeviceSettings));
 }
 #endif