Removed Profile::GetHostContentSettingsMap

chrome/browser/supervised_user/supervised_user_pref_store.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_pref_store.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 52 matching lines @@
 
 }  // namespace
 
 SupervisedUserPrefStore::SupervisedUserPrefStore(
     SupervisedUserSettingsService* supervised_user_settings_service) {
   user_settings_subscription_ = supervised_user_settings_service->Subscribe(
       base::Bind(&SupervisedUserPrefStore::OnNewSettingsAvailable,
                  base::Unretained(this)));
 
   // Should only be nullptr in unit tests
-  // TODO(peconn): Remove this notification once HostContentSettingsMap is
-  // a KeyedService.
+  // TODO(peconn): Remove this once SupervisedUserPrefStore is (partially at
+  // least) a KeyedService. The user_settings_subscription_ must be reset or
+  // destroyed before the SupervisedUserSettingsService is.
   if (supervised_user_settings_service->GetProfile() != nullptr){
     unsubscriber_registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
         content::Source<Profile>(
           supervised_user_settings_service->GetProfile()));
   }
 }
 
 bool SupervisedUserPrefStore::GetValue(const std::string& key,
                                        const base::Value** value) const {
   // TODO(bauerb): Temporary CHECK to force a clean crash while investigating
@@ skipping 80 matching lines @@
 }
 
 // Callback to unsubscribe from the supervised user settings service.
 void SupervisedUserPrefStore::Observe(
     int type,
     const content::NotificationSource& src,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);
   user_settings_subscription_.reset();
 }