Initialize ManagedUserService after ExtensionSystem to register as extension management policy prov…

chrome/browser/profiles/profile_manager.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 <set>
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 705 matching lines @@
   // Only keep track of profiles that we are managing; tests may create others.
   if (profile_manager_->profiles_info_.find(
       last_active->GetPath()) != profile_manager_->profiles_info_.end()) {
     local_state->SetString(prefs::kProfileLastUsed,
                            last_active->GetPath().BaseName().MaybeAsASCII());
   }
 }
 #endif  // !defined(OS_ANDROID) && !defined(OS_IOS)
 
 void ProfileManager::DoFinalInit(Profile* profile, bool go_off_the_record) {
+  InitProfileUserPrefs(profile);
   DoFinalInitForServices(profile, go_off_the_record);
-  InitProfileUserPrefs(profile);
   AddProfileToCache(profile);
   DoFinalInitLogging(profile);
 
   ProfileMetrics::LogNumberOfProfiles(this, ProfileMetrics::ADD_PROFILE_EVENT);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_ADDED,
       content::Source<Profile>(profile),
       content::NotificationService::NoDetails());
 
 }
 
 void ProfileManager::DoFinalInitForServices(Profile* profile,
                                             bool go_off_the_record) {
 #if defined(ENABLE_EXTENSIONS)
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (!IsImportProcess(command_line)) {
     extensions::ExtensionSystem::Get(profile)->InitForRegularProfile(
         !go_off_the_record);
     // During tests, when |profile| is an instance of TestingProfile,
     // ExtensionSystem might not create an ExtensionService.
     if (extensions::ExtensionSystem::Get(profile)->extension_service()) {
       profile->GetHostContentSettingsMap()->RegisterExtensionService(
           extensions::ExtensionSystem::Get(profile)->extension_service());
     }
   }
 #endif
+#if defined(ENABLE_MANAGED_USERS)
+  // Initialization needs to happen after extension system initialization (for
+  // extension::ManagementPolicy) and InitProfileUserPrefs (for setting the
+  // initializing the managed flag if necessary).
+  ManagedUserServiceFactory::GetForProfile(profile)->Init();
+#endif
 }
 
 void ProfileManager::DoFinalInitLogging(Profile* profile) {
   // Count number of extensions in this profile.
   int extension_count = -1;
 #if defined(ENABLE_EXTENSIONS)
   ExtensionService* extension_service = profile->GetExtensionService();
   if (extension_service)
     extension_count = extension_service->GetAppIds().size();
 #endif
@@ skipping 188 matching lines @@
     avatar_index = cache.ChooseAvatarIconIndexForNewProfile();
     profile_name = UTF16ToUTF8(cache.ChooseNameForNewProfile(avatar_index));
   }
 
   if (!profile->GetPrefs()->HasPrefPath(prefs::kProfileAvatarIndex))
     profile->GetPrefs()->SetInteger(prefs::kProfileAvatarIndex, avatar_index);
 
   if (!profile->GetPrefs()->HasPrefPath(prefs::kProfileName))
     profile->GetPrefs()->SetString(prefs::kProfileName, profile_name);
 
-  if (!profile->GetPrefs()->HasPrefPath(prefs::kProfileIsManaged)) {
+  if (!profile->GetPrefs()->HasPrefPath(prefs::kProfileIsManaged))
     profile->GetPrefs()->SetBoolean(prefs::kProfileIsManaged, is_managed);
-#if defined(ENABLE_MANAGED_USERS)
-    ManagedUserServiceFactory::GetForProfile(profile)->Init();
-#else
-    DCHECK(!is_managed);
-#endif
-  }
 }
 
 bool ProfileManager::ShouldGoOffTheRecord() {
   bool go_off_the_record = false;
 #if defined(OS_CHROMEOS)
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (!logged_in_ &&
       (!command_line.HasSwitch(switches::kTestType) ||
        command_line.HasSwitch(switches::kLoginProfile))) {
     go_off_the_record = true;
@@ skipping 126 matching lines @@
 ProfileManager::ProfileInfo::ProfileInfo(
     Profile* profile,
     bool created)
     : profile(profile),
       created(created) {
 }
 
 ProfileManager::ProfileInfo::~ProfileInfo() {
   ProfileDestroyer::DestroyProfileWhenAppropriate(profile.release());
 }