Move session service and supervised users to buildflags.

chrome/browser/ui/webui/options/create_profile_handler.h

Index: chrome/browser/ui/webui/options/create_profile_handler.h
diff --git a/chrome/browser/ui/webui/options/create_profile_handler.h b/chrome/browser/ui/webui/options/create_profile_handler.h
index 96d1bec0777c158d5019769f8be49df722405471..29795ca685659303ff4c2971922ea13d81cc4d38 100644
--- a/chrome/browser/ui/webui/options/create_profile_handler.h
+++ b/chrome/browser/ui/webui/options/create_profile_handler.h
@@ -13,6 +13,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
+#include "chrome/common/features.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
 
@@ -21,7 +22,7 @@ class DictionaryValue;
 class ListValue;
 }
 
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
 class SupervisedUserRegistrationUtility;
 #endif
 
@@ -51,7 +52,7 @@ class CreateProfileHandler: public OptionsPageUIHandler {
   // It is used to map the type of the profile creation operation to the
   // correct UMA metric name.
   enum ProfileCreationOperationType {
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
     SUPERVISED_PROFILE_CREATION,
     SUPERVISED_PROFILE_IMPORT,
 #endif
@@ -98,7 +99,7 @@ class CreateProfileHandler: public OptionsPageUIHandler {
   void RecordProfileCreationMetrics(Profile::CreateStatus status);
 
   base::string16 GetProfileCreationErrorMessageLocal() const;
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   // The following error messages only apply to supervised profiles.
   base::string16 GetProfileCreationErrorMessageRemote() const;
   base::string16 GetProfileCreationErrorMessageSignin() const;
@@ -118,7 +119,7 @@ class CreateProfileHandler: public OptionsPageUIHandler {
   // The value is only relevant while we are creating/importing a profile.
   ProfileCreationOperationType profile_creation_type_;
 
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   // Extracts the supervised user ID from the args passed into CreateProfile,
   // sets |profile_creation_type_| if necessary, and returns true if the
   // supervised user id specified in |args| are valid.