Reland 251352 "cros: Enable multiprofile for everyone."

chrome/browser/chromeos/login/multi_profile_user_controller.cc

Index: chrome/browser/chromeos/login/multi_profile_user_controller.cc
diff --git a/chrome/browser/chromeos/login/multi_profile_user_controller.cc b/chrome/browser/chromeos/login/multi_profile_user_controller.cc
index f5eb9a9ccb57c116019f120c77771bc8ec0fdab5..847c27b89468c2a4d7429a6d7d237cbb18146d70 100644
--- a/chrome/browser/chromeos/login/multi_profile_user_controller.cc
+++ b/chrome/browser/chromeos/login/multi_profile_user_controller.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/chromeos/login/multi_profile_user_controller.h"
 
 #include "base/bind.h"
-#include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_registry_simple.h"
@@ -19,7 +18,6 @@
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
-#include "chromeos/chromeos_switches.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 
 namespace chromeos {
@@ -61,18 +59,9 @@ void MultiProfileUserController::RegisterPrefs(
 // static
 void MultiProfileUserController::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
-  // Use "disabled" default if there is no user manager or no logged in user.
-  // This is true for signin profile (where the value does not matter) or
-  // for the primary user's profile. This essentially disables multiprofile
-  // unless the primary user has a policy to say otherwise.
-  const bool use_disable_default =
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-           switches::kForceMultiProfileInTests) &&
-      (!UserManager::IsInitialized() ||
-       UserManager::Get()->GetLoggedInUsers().size() == 1);
   registry->RegisterStringPref(
       prefs::kMultiProfileUserBehavior,
-      use_disable_default ? kBehaviorNotAllowed : kBehaviorUnrestricted,
+      kBehaviorUnrestricted,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }