Add a HostContentSettingsMap layer for Supervised Users.

chrome/browser/supervised_user/supervised_user_settings_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_settings_service.h"
 
+#include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/pref_filter.h"
 #include "base/strings/string_util.h"
 #include "base/threading/sequenced_worker_pool.h"
+#include "chrome/browser/content_settings/content_settings_supervised_provider.h"
 #include "chrome/browser/supervised_user/supervised_user_url_filter.h"
 #include "chrome/common/chrome_constants.h"
+#include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/user_metrics.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_error_factory.h"
 #include "sync/protocol/sync.pb.h"
 
 using base::DictionaryValue;
 using base::JSONReader;
 using base::UserMetricsAction;
 using base::Value;
@@ skipping 17 matching lines @@
 
 namespace {
 
 bool SettingShouldApplyToPrefs(const std::string& name) {
   return !StartsWithASCII(name, kSupervisedUserInternalItemPrefix, false);
 }
 
 }  // namespace
 
 SupervisedUserSettingsService::SupervisedUserSettingsService()
-    : active_(false), local_settings_(new base::DictionaryValue) {}
+    : active_(false), local_settings_(new base::DictionaryValue) {

[Bernhard Bauer, 2015/02/26 12:44:58]

Personally, I'm okay with either keeping opening and closing brace on the same
line, or moving the closing brace to the next line, but it should be consistent
(see three lines below). If there is no strong reason to change the style, I
would keep it as it is.

[knn, 2015/02/26 16:18:56]

Sorry about that.

+}
 
 SupervisedUserSettingsService::~SupervisedUserSettingsService() {}
 
 void SupervisedUserSettingsService::Init(
     base::FilePath profile_path,
     base::SequencedTaskRunner* sequenced_task_runner,
     bool load_synchronously) {
   base::FilePath path =
       profile_path.Append(chrome::kSupervisedUserSettingsFilename);
   PersistentPrefStore* store = new JsonPrefStore(
@@ skipping 20 matching lines @@
 void SupervisedUserSettingsService::Subscribe(
     const SettingsCallback& callback) {
   if (IsReady()) {
     scoped_ptr<base::DictionaryValue> settings = GetSettings();
     callback.Run(settings.get());
   }
 
   subscribers_.push_back(callback);
 }
 
+void SupervisedUserSettingsService::RegisterContentSettings(
+    HostContentSettingsMap* host_content_settings_map) {
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  scoped_ptr<content_settings::SupervisedProvider> supervised_provider(
+      new content_settings::SupervisedProvider());
+  Subscribe(base::Bind(
+      &content_settings::SupervisedProvider::OnSupervisedSettingsAvailable,
+      base::Unretained(supervised_provider.get())));
+  host_content_settings_map->RegisterProvider(
+      HostContentSettingsMap::SUPERVISED_PROVIDER, supervised_provider.Pass());
+}
+
 void SupervisedUserSettingsService::SetActive(bool active) {
   active_ = active;
   InformSubscribers();
 }
 
 bool SupervisedUserSettingsService::IsReady() {
+  if (!store_) return false;

[Bernhard Bauer, 2015/02/26 12:44:58]

Return statement on new line.

Also, it's an error to call this method on an uninitialized object, so this
check shouldn't even exist.

[knn, 2015/02/26 16:18:56]

Done.

   return store_->IsInitializationComplete();
 }
 
 void SupervisedUserSettingsService::Clear() {
   store_->RemoveValue(kAtomicSettings);
   store_->RemoveValue(kSplitSettings);
 }
 
 // static
 std::string SupervisedUserSettingsService::MakeSplitSettingKey(
@@ skipping 271 matching lines @@
 }
 
 void SupervisedUserSettingsService::InformSubscribers() {
   if (!IsReady())
     return;
 
   scoped_ptr<base::DictionaryValue> settings = GetSettings();
   for (const auto& callback : subscribers_)
     callback.Run(settings.get());
 }