Mark supervised profiles as such immediately when they're created.

chrome/browser/themes/theme_service.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/themes/theme_service.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/sequenced_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/managed_mode/managed_user_service.h"
-#include "chrome/browser/managed_mode/managed_user_service_factory.h"
 #include "chrome/browser/managed_mode/managed_user_theme.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/browser_theme_pack.h"
 #include "chrome/browser/themes/custom_theme_supplier.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_syncable_service.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
@@ skipping 62 matching lines @@
 }
 
 ThemeService::~ThemeService() {
   FreePlatformCaches();
 }
 
 void ThemeService::Init(Profile* profile) {
   DCHECK(CalledOnValidThread());
   profile_ = profile;
 
-  ManagedUserServiceFactory::GetForProfile(profile)->AddInitCallback(base::Bind(
-      &ThemeService::OnManagedUserInitialized, weak_ptr_factory_.GetWeakPtr()));
+  if (!(theme_supplier_ &&
+        (theme_supplier_->get_theme_type() == CustomThemeSupplier::EXTENSION ||
+         theme_supplier_->get_theme_type() ==
+             CustomThemeSupplier::MANAGED_USER_THEME)) &&
+      IsManagedUser()) {
+    SetManagedUserTheme();
+  }
 
   LoadThemePrefs();
 
   registrar_.Add(this,
                  chrome::NOTIFICATION_EXTENSIONS_READY,
                  content::Source<Profile>(profile_));
 
   theme_syncable_service_.reset(new ThemeSyncableService(profile_, this));
 }
 
@@ skipping 458 matching lines @@
 }
 
 bool ThemeService::IsManagedUser() const {
   return profile_->IsManaged();
 }
 
 void ThemeService::SetManagedUserTheme() {
   SetCustomDefaultTheme(new ManagedUserTheme);
 }
 
-void ThemeService::OnManagedUserInitialized() {
-  // Currently when creating a supervised user, the ThemeService is initialized
-  // before the boolean flag indicating the profile belongs to a supervised
-  // user gets set. In order to get the custom managed user theme, we get a
-  // callback when ManagedUserService is initialized, which happens some time
-  // after the boolean flag has been set in
-  // ProfileManager::InitProfileUserPrefs() and after the
-  // NOTIFICATION_EXTENSIONS_READY notification is sent.
-  if ((theme_supplier_.get() &&
-       (theme_supplier_->get_theme_type() == CustomThemeSupplier::EXTENSION ||
-        theme_supplier_->get_theme_type() ==
-            CustomThemeSupplier::MANAGED_USER_THEME)) ||
-      !IsManagedUser()) {
-    return;
-  }
-
-  SetManagedUserTheme();
-}
-
 void ThemeService::OnInfobarDisplayed() {
   number_of_infobars_++;
 }
 
 void ThemeService::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes(false);
 }
 
 ThemeSyncableService* ThemeService::GetThemeSyncableService() const {
   return theme_syncable_service_.get();
 }