Remove IsNewProfileManagement and EnableNewProfileManagementForTesting

chrome/browser/ui/startup/startup_browser_creator.cc

 // Copyright (c) 2012 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/startup/startup_browser_creator.h"
 
 #include <stddef.h>
 
 #include <algorithm>  // For max().
 #include <limits>
@@ skipping 53 matching lines @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/search_engines/util.h"
-#include "components/signin/core/common/profile_management_switches.h"
 #include "components/url_formatter/url_fixer.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/common/switches.h"
 #include "net/base/port_util.h"
 #include "printing/features/features.h"
 
 #if defined(USE_ASH)
@@ skipping 872 matching lines @@
   Profile* profile = profile_manager->GetProfile(profile_path);
 
   // If there is no entry in profile attributes storage, the profile is deleted,
   // and we should show the user manager. Also, when using
   // --new-profile-management, if the profile is locked we should show the user
   // manager as well. When neither of these is true, we can safely start up with
   // |profile|.
   auto* storage = &profile_manager->GetProfileAttributesStorage();
   ProfileAttributesEntry* entry;
   bool has_entry = storage->GetProfileAttributesWithPath(profile_path, &entry);
-  if (has_entry && (!switches::IsNewProfileManagement() ||
-                    !entry->IsSigninRequired() || !profile)) {
+  if (has_entry && (!entry->IsSigninRequired() || !profile)) {
     return profile;
   }
 
   // We want to show the user manager. To indicate this, return the guest
   // profile. However, we can only do this if the system profile (where the user
   // manager lives) also exists (or is creatable).
   return profile_manager->GetProfile(ProfileManager::GetSystemProfilePath()) ?
          profile_manager->GetProfile(ProfileManager::GetGuestProfilePath()) :
          nullptr;
 }
@@ skipping 33 matching lines @@
     if (!entry->IsSigninRequired()) {
       Profile* profile = profile_manager->GetProfile(entry->GetPath());
       if (profile)
         return profile;
     }
   }
 
   return nullptr;
 }
 #endif  // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)