Supervised users: Re-check ManagementPolicy when ProfileIsSupervised changes.

chrome/browser/supervised_user/supervised_user_service.cc

 // Copyright 2014 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/supervised_user/supervised_user_service.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
@@ skipping 38 matching lines @@
 #include "content/public/browser/user_metrics.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "components/user_manager/user_manager.h"
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
-#include "extensions/browser/extension_registry.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "extensions/browser/extension_system.h"
 #endif
 
 #if defined(ENABLE_THEMES)
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #endif
 
 using base::DictionaryValue;
 using base::UserMetricsAction;
@@ skipping 463 matching lines @@
   extensions::ExtensionSystem* extension_system =
       extensions::ExtensionSystem::Get(profile_);
   extensions::ManagementPolicy* management_policy =
       extension_system->management_policy();
 
   if (management_policy) {
     if (active_)
       management_policy->RegisterProvider(this);
     else
       management_policy->UnregisterProvider(this);
+
+    // Re-check the policy to make sure any new settings get applied.
+    extension_system->extension_service()->CheckManagementPolicy();
   }
 }
 #endif  // defined(ENABLE_EXTENSIONS)
 
 SupervisedUserSettingsService* SupervisedUserService::GetSettingsService() {
   return SupervisedUserSettingsServiceFactory::GetForProfile(profile_);
 }
 
 size_t SupervisedUserService::FindEnabledPermissionRequestCreator(
     size_t start) {
@@ skipping 201 matching lines @@
 
       SetupSync();
     }
   }
 
   // Now activate/deactivate anything not handled by the delegate yet.
 
 #if defined(ENABLE_THEMES)
   // Re-set the default theme to turn the SU theme on/off.
   ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile_);
-  if (theme_service->UsingDefaultTheme() || theme_service->UsingSystemTheme()) {
-    ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme();
-  }
+  if (theme_service->UsingDefaultTheme() || theme_service->UsingSystemTheme())
+    theme_service->UseDefaultTheme();
 #endif
 
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   sync_service->SetEncryptEverythingAllowed(!active_);
 
   GetSettingsService()->SetActive(active_);
 
 #if defined(ENABLE_EXTENSIONS)
   SetExtensionsActive();
@@ skipping 14 matching lines @@
       pref_change_registrar_.Add(pref,
           base::Bind(&SupervisedUserService::OnCustodianInfoChanged,
                      base::Unretained(this)));
     }
 
     // Initialize the filter.
     OnDefaultFilteringBehaviorChanged();
     whitelist_service_->Init();
     UpdateManualHosts();
     UpdateManualURLs();
-    if (profile_->IsChild() &&
+    if (profile_->IsChild() && delegate_ &&
         supervised_users::IsSafeSitesBlacklistEnabled()) {
       LoadBlacklist(GetBlacklistPath(), GURL(kBlacklistURL));
     }
-    if (profile_->IsChild() &&
+    if (profile_->IsChild() && delegate_ &&
         supervised_users::IsSafeSitesOnlineCheckEnabled()) {
       url_filter_context_.InitAsyncURLChecker(profile_->GetRequestContext());
     }
 
 #if !defined(OS_ANDROID)
     // TODO(bauerb): Get rid of the platform-specific #ifdef here.
     // http://crbug.com/313377
     BrowserList::AddObserver(this);
 #endif
   } else {
@@ skipping 130 matching lines @@
   // The active user can be NULL in unit tests.
   if (user_manager::UserManager::Get()->GetActiveUser()) {
     return UTF16ToUTF8(user_manager::UserManager::Get()->GetUserDisplayName(
         user_manager::UserManager::Get()->GetActiveUser()->GetUserID()));
   }
   return std::string();
 #else
   return profile_->GetPrefs()->GetString(prefs::kProfileName);
 #endif
 }