Move session service and supervised users to buildflags.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/signin/signin_create_profile_handler.h"
 
 #include <stddef.h>
 #include <string>
 #include <vector>
 
@@ skipping 14 matching lines @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profile_metrics.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/signin/signin_error_controller_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/user_manager.h"
 #include "chrome/browser/ui/webui/profile_helper.h"
 #include "chrome/browser/ui/webui/signin/signin_utils.h"
+#include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/browser_sync/profile_sync_service.h"
 #include "components/prefs/pref_service.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/legacy/supervised_user_registration_utility.h"
 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"
 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #endif
 
 SigninCreateProfileHandler::SigninCreateProfileHandler()
     : profile_creation_type_(NO_CREATION_IN_PROGRESS),
       weak_ptr_factory_(this) {
   g_browser_process->profile_manager()->
       GetProfileAttributesStorage().AddObserver(this);
 }
 
 SigninCreateProfileHandler::~SigninCreateProfileHandler() {
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   // Cancellation is only supported for supervised users.
   CancelProfileRegistration(false);
 #endif
   g_browser_process->profile_manager()->
     GetProfileAttributesStorage().RemoveObserver(this);
 }
 
 void SigninCreateProfileHandler::GetLocalizedValues(
     base::DictionaryValue* localized_strings) {
   localized_strings->SetString(
@@ skipping 67 matching lines @@
       "supervisedUserCreatedDone",
       l10n_util::GetStringUTF16(
           IDS_LEGACY_SUPERVISED_USER_CREATED_DONE_BUTTON));
   localized_strings->SetString(
       "supervisedUserCreatedSwitch",
       l10n_util::GetStringUTF16(
           IDS_LEGACY_SUPERVISED_USER_CREATED_SWITCH_BUTTON));
 }
 
 void SigninCreateProfileHandler::RegisterMessages() {
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   // Cancellation is only supported for supervised users.
   web_ui()->RegisterMessageCallback(
       "cancelCreateProfile",
       base::Bind(&SigninCreateProfileHandler::HandleCancelProfileCreation,
                  base::Unretained(this)));
 
   web_ui()->RegisterMessageCallback(
       "switchToProfile",
       base::Bind(&SigninCreateProfileHandler::SwitchToProfile,
                  base::Unretained(this)));
@@ skipping 82 matching lines @@
   if (args->GetString(0, &name) && args->GetString(1, &icon_url)) {
     DCHECK(base::IsStringASCII(icon_url));
     base::TrimWhitespace(name, base::TRIM_ALL, &name);
     CHECK(!name.empty());
 #ifndef NDEBUG
     size_t icon_index;
     DCHECK(profiles::IsDefaultAvatarIconUrl(icon_url, &icon_index));
 #endif
     args->GetBoolean(2, &create_shortcut);
   }
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   std::string supervised_user_id;
   base::FilePath custodian_profile_path;
   if (GetSupervisedCreateProfileArgs(args, &supervised_user_id,
                                      &custodian_profile_path)) {
     // Load custodian profile.
     g_browser_process->profile_manager()->CreateProfileAsync(
         custodian_profile_path,
         base::Bind(&SigninCreateProfileHandler::LoadCustodianProfileCallback,
                    weak_ptr_factory_.GetWeakPtr(), name, icon_url,
                    create_shortcut, supervised_user_id),
@@ skipping 62 matching lines @@
     bool create_shortcut,
     const std::string& supervised_user_id,
     Profile* custodian_profile,
     Profile* profile) {
   switch (profile_creation_type_) {
     case NON_SUPERVISED_PROFILE_CREATION: {
       DCHECK(supervised_user_id.empty());
       CreateShortcutAndShowSuccess(create_shortcut, nullptr, profile);
       break;
     }
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
     case SUPERVISED_PROFILE_CREATION:
     case SUPERVISED_PROFILE_IMPORT:
       RegisterSupervisedUser(create_shortcut, supervised_user_id,
                              custodian_profile, profile);
       break;
 #endif
     case NO_CREATION_IN_PROGRESS:
       NOTREACHED();
       break;
   }
@@ skipping 14 matching lines @@
   DCHECK_EQ(profile_path_being_created_.value(), profile->GetPath().value());
   profile_path_being_created_.clear();
   DCHECK_NE(NO_CREATION_IN_PROGRESS, profile_creation_type_);
   base::DictionaryValue dict;
   dict.SetString("name", profile->GetPrefs()->GetString(prefs::kProfileName));
   dict.Set("filePath", base::CreateFilePathValue(profile->GetPath()));
 
   bool is_force_signin_enabled = signin::IsForceSigninEnabled();
   bool open_new_window = !is_force_signin_enabled;
 
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   // If the new profile is a supervised user, instead of opening a new window
   // right away, a confirmation page will be shown by JS from the creation
   // dialog. If we are importing an existing supervised profile or creating a
   // new non-supervised user profile we don't show any confirmation, so open
   // the new window now.
 
   open_new_window =
       open_new_window && profile_creation_type_ != SUPERVISED_PROFILE_CREATION;
 
   dict.SetBoolean("showConfirmation",
@@ skipping 65 matching lines @@
   UMA_HISTOGRAM_ENUMERATION("Profile.CreateResult", status,
                             Profile::MAX_CREATE_STATUS);
   UMA_HISTOGRAM_MEDIUM_TIMES(
       "Profile.CreateTimeNoTimeout",
       base::TimeTicks::Now() - profile_creation_start_time_);
 }
 
 base::string16 SigninCreateProfileHandler::GetProfileCreationErrorMessageLocal()
     const {
   int message_id = IDS_PROFILES_CREATE_LOCAL_ERROR;
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   // Local errors can occur during supervised profile import.
   if (profile_creation_type_ == SUPERVISED_PROFILE_IMPORT)
     message_id = IDS_LEGACY_SUPERVISED_USER_IMPORT_LOCAL_ERROR;
 #endif
   return l10n_util::GetStringUTF16(message_id);
 }
 
 void SigninCreateProfileHandler::Observe(
     int type,
     const content::NotificationSource& source,
@@ skipping 26 matching lines @@
   switch (status) {
     case PROFILE_CREATION_SUCCESS:
       return base::StringValue("create-profile-success");
     case PROFILE_CREATION_ERROR:
       return base::StringValue("create-profile-error");
   }
   NOTREACHED();
   return base::StringValue(std::string());
 }
 
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
 base::string16 SigninCreateProfileHandler::GetProfileCreateErrorMessageRemote()
     const {
   return l10n_util::GetStringUTF16(
       profile_creation_type_ == SUPERVISED_PROFILE_IMPORT
           ? IDS_LEGACY_SUPERVISED_USER_IMPORT_REMOTE_ERROR
           : IDS_PROFILES_CREATE_REMOTE_ERROR);
 }
 
 base::string16 SigninCreateProfileHandler::GetProfileCreateErrorMessageSignin()
     const {
@@ skipping 285 matching lines @@
 
   profiles::OpenBrowserWindowForProfile(
       base::Bind(&SigninCreateProfileHandler::OnBrowserReadyCallback,
                  weak_ptr_factory_.GetWeakPtr()),
       false,  // Don't create a window if one already exists.
       true,  // Create a first run window.
       profile,
       Profile::CREATE_STATUS_INITIALIZED);
 }
 #endif