Reland 251352 "cros: Enable multiprofile for everyone."

chrome/browser/chromeos/login/multi_profile_user_controller.cc

 // Copyright 2013 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/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"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/chromeos/login/multi_profile_user_controller_delegate.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/policy_cert_service.h"
 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
 #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 {
 
 namespace {
 
 std::string SanitizeBehaviorValue(const std::string& value) {
   if (value == MultiProfileUserController::kBehaviorUnrestricted ||
       value == MultiProfileUserController::kBehaviorPrimaryOnly ||
       value == MultiProfileUserController::kBehaviorNotAllowed) {
@@ skipping 21 matching lines @@
 
 // static
 void MultiProfileUserController::RegisterPrefs(
     PrefRegistrySimple* registry) {
   registry->RegisterDictionaryPref(prefs::kCachedMultiProfileUserBehavior);
 }
 
 // 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);
 }
 
 MultiProfileUserController::UserAllowedInSessionResult
 MultiProfileUserController::IsUserAllowedInSession(
     const std::string& user_email) const {
   UserManager* user_manager = UserManager::Get();
   CHECK(user_manager);
 
   const User* primary_user = user_manager->GetPrimaryUser();
@@ skipping 121 matching lines @@
   } else {
     const std::string behavior =
         prefs->GetString(prefs::kMultiProfileUserBehavior);
     SetCachedValue(user_email, behavior);
   }
 
   CheckSessionUsers();
 }
 
 }  // namespace chromeos