Index: chrome/browser/supervised_user/supervised_user_whitelist_service.cc |
diff --git a/chrome/browser/supervised_user/supervised_user_whitelist_service.cc b/chrome/browser/supervised_user/supervised_user_whitelist_service.cc |
index 07914be641052bfc9467110acd363d4d3c127647..89c0d015d4550c92e150e7acfcc9d1f6e73a409c 100644 |
--- a/chrome/browser/supervised_user/supervised_user_whitelist_service.cc |
+++ b/chrome/browser/supervised_user/supervised_user_whitelist_service.cc |
@@ -86,7 +86,10 @@ void SupervisedUserWhitelistService::Init() { |
void SupervisedUserWhitelistService::AddSiteListsChangedCallback( |
const SiteListsChangedCallback& callback) { |
site_lists_changed_callbacks_.push_back(callback); |
- NotifyWhitelistsChanged(); |
+ |
+ std::vector<scoped_refptr<SupervisedUserSiteList>> whitelists; |
+ GetLoadedWhitelists(&whitelists); |
+ callback.Run(whitelists); |
} |
void SupervisedUserWhitelistService::LoadWhitelistForTesting( |
@@ -287,10 +290,15 @@ void SupervisedUserWhitelistService::RegisterWhitelist(const std::string& id, |
weak_ptr_factory_.GetWeakPtr(), id)); |
} |
-void SupervisedUserWhitelistService::NotifyWhitelistsChanged() { |
- std::vector<scoped_refptr<SupervisedUserSiteList> > whitelists; |
+void SupervisedUserWhitelistService::GetLoadedWhitelists( |
+ std::vector<scoped_refptr<SupervisedUserSiteList>>* whitelists) { |
for (const auto& whitelist : loaded_whitelists_) |
- whitelists.push_back(whitelist.second); |
+ whitelists->push_back(whitelist.second); |
+} |
+ |
+void SupervisedUserWhitelistService::NotifyWhitelistsChanged() { |
+ std::vector<scoped_refptr<SupervisedUserSiteList>> whitelists; |
+ GetLoadedWhitelists(&whitelists); |
for (const auto& callback : site_lists_changed_callbacks_) |
callback.Run(whitelists); |