Add a HostContentSettingsMap layer for Supervised Users.

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 "chrome/browser/profiles/profile_manager.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 57 matching lines @@
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/extension_service.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest.h"
 #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)
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/ui/browser_list.h"
 #endif  // !defined (OS_IOS)
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 938 matching lines @@
         ->BlockAllExtensions();
   }
 
 #endif
 #if defined(ENABLE_SUPERVISED_USERS)
   // Initialization needs to happen after extension system initialization (for
   // extension::ManagementPolicy) and InitProfileUserPrefs (for setting the
   // 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->Subscribe(base::Bind(
+      &content_settings::SupervisedProvider::OnSupervisedSettingsAvailable,
+      base::Unretained(supervised_provider.get())));
+  profile->GetHostContentSettingsMap()->RegisterProvider(

[Bernhard Bauer, 2015/02/26 18:03:54]

Can we do this when the HCSM is created instead?

[knn, 2015/02/27 10:43:53]

This is called when the profile is created. Isn't it good to have all
Service/Provider initialization in one place?

[Bernhard Bauer, 2015/02/27 11:20:25]

It is, but the right place for it is in the ProfileImpl constructor :)

The only things that happen here are things that need to happen at a very
specific point during profile initialization (see the comment above). I think
creating the superviseduserprovider can happen at any time, as it will do
nothing for a non-supervised profile.

[knn, 2015/02/27 12:05:15]

Acknowledged.

+      HostContentSettingsMap::SUPERVISED_PROVIDER, supervised_provider.Pass());
 #endif
   // Start the deferred task runners once the profile is loaded.
   StartupTaskRunnerServiceFactory::GetForProfile(profile)->
       StartDeferredTaskRunners();
 
   // Activate data reduction proxy. This creates a request context and makes a
   // URL request to check if the data reduction proxy server is reachable.
   DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile)->
       MaybeActivateDataReductionProxy(true);
 
@@ skipping 341 matching lines @@
           last_non_supervised_profile_path.BaseName().MaybeAsASCII());
       FinishDeletingProfile(profile_to_delete_path);
     }
   }
 }
 #endif
 
 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
     const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) {
 }