Add a HostContentSettingsMap layer for Supervised Users.

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 9b7389fc542cb6ec4b5e9f6408f8e529c20c3b50..a1dc51d0c59be7be6a3118c391cec9a56bf1f638 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -143,6 +143,7 @@
 #endif
 
 #if defined(ENABLE_SUPERVISED_USERS)
+#include "chrome/browser/content_settings/content_settings_supervised_provider.h"
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
 #include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
@@ -475,7 +476,7 @@ ProfileImpl::ProfileImpl(
   BrowserContextDependencyManager::GetInstance()->
       RegisterProfilePrefsForServices(this, pref_registry_.get());
 
-  SupervisedUserSettingsService* supervised_user_settings = NULL;
+  SupervisedUserSettingsService* supervised_user_settings = nullptr;
 #if defined(ENABLE_SUPERVISED_USERS)
   supervised_user_settings =
       SupervisedUserSettingsServiceFactory::GetForProfile(this);
@@ -1041,6 +1042,12 @@ HostContentSettingsMap* ProfileImpl::GetHostContentSettingsMap() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!host_content_settings_map_.get()) {
     host_content_settings_map_ = new HostContentSettingsMap(GetPrefs(), false);
+#if defined(ENABLE_SUPERVISED_USERS)
+  scoped_ptr<content_settings::SupervisedProvider> supervised_provider(

[Bernhard Bauer, 2015/02/27 12:18:42]

This should be indented two spaces more.

[knn, 2015/02/27 12:40:44]

Done.

+      new content_settings::SupervisedProvider(supervised_user_settings));
+  host_content_settings_map_->RegisterProvider(
+      HostContentSettingsMap::SUPERVISED_PROVIDER, supervised_provider.Pass());
+#endif
   }
   return host_content_settings_map_.get();
 }