Add a HostContentSettingsMap layer for Supervised Users.

chrome/browser/profiles/profile_manager.cc

Index: chrome/browser/profiles/profile_manager.cc
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index 20957bd50d2c3ede449e0c361b748b254f190304..08eef4526dbd68029a822006566ddc466b7e8696 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -75,10 +75,13 @@
 #endif
 
 #if defined(ENABLE_SUPERVISED_USERS)
+#include "chrome/browser/content_settings/content_settings_supervised_provider.h"
 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h"
 #include "chrome/browser/supervised_user/child_accounts/child_account_service_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
 #endif
 
 #if !defined(OS_IOS)
@@ -1037,6 +1040,12 @@ void ProfileManager::DoFinalInitForServices(Profile* profile,
   // initializing the supervised flag if necessary).
   ChildAccountServiceFactory::GetForProfile(profile)->Init();
   SupervisedUserServiceFactory::GetForProfile(profile)->Init();
+  SupervisedUserSettingsService* supervised_service =
+      SupervisedUserSettingsServiceFactory::GetForProfile(profile);
+  scoped_ptr<content_settings::SupervisedProvider> supervised_provider(
+      new content_settings::SupervisedProvider(supervised_service));
+  profile->GetHostContentSettingsMap()->RegisterProvider(
+      HostContentSettingsMap::SUPERVISED_PROVIDER, supervised_provider.Pass());
 #endif
   // Start the deferred task runners once the profile is loaded.
   StartupTaskRunnerServiceFactory::GetForProfile(profile)->