Move session service and supervised users to buildflags.

chrome/browser/ui/webui/signin/md_user_manager_ui.cc

Index: chrome/browser/ui/webui/signin/md_user_manager_ui.cc
diff --git a/chrome/browser/ui/webui/signin/md_user_manager_ui.cc b/chrome/browser/ui/webui/signin/md_user_manager_ui.cc
index 84b0d64b4c2be9b591f44f58a405b4b31c618eab..912b131dba8d07597db0fc8d197165e073829527 100644
--- a/chrome/browser/ui/webui/signin/md_user_manager_ui.cc
+++ b/chrome/browser/ui/webui/signin/md_user_manager_ui.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/ui/webui/signin/signin_create_profile_handler.h"
 #include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h"
 #include "chrome/browser/ui/webui/theme_source.h"
+#include "chrome/common/features.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/settings_resources.h"
@@ -20,7 +21,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/web_ui_util.h"
 
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/ui/webui/signin/signin_supervised_user_import_handler.h"
 #endif
 
@@ -32,7 +33,7 @@ MDUserManagerUI::MDUserManagerUI(content::WebUI* web_ui)
   // destroy them when it (the WebUI) is destroyed.
   web_ui->AddMessageHandler(signin_create_profile_handler_);
   web_ui->AddMessageHandler(user_manager_screen_handler_);
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   signin_supervised_user_import_handler_ =
       new SigninSupervisedUserImportHandler();
   web_ui->AddMessageHandler(signin_supervised_user_import_handler_);
@@ -110,7 +111,7 @@ void MDUserManagerUI::GetLocalizedStrings(
     base::DictionaryValue* localized_strings) {
   user_manager_screen_handler_->GetLocalizedValues(localized_strings);
   signin_create_profile_handler_->GetLocalizedValues(localized_strings);
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   signin_supervised_user_import_handler_->GetLocalizedValues(localized_strings);
 #endif
   const std::string& app_locale = g_browser_process->GetApplicationLocale();