Don't notify existing observers in SupervisedUserWhitelistService::AddSiteListsChangedCallback().

chrome/browser/supervised_user/supervised_user_whitelist_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_whitelist_service.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 68 matching lines @@
       id = whitelist;
     }
     bool new_installation = true;
     RegisterWhitelist(id, name, new_installation);
   }
 }
 
 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(
     const std::string& id,
     const base::FilePath& path) {
   bool result = registered_whitelists_.insert(id).second;
   DCHECK(result);
   OnWhitelistReady(id, path);
 }
 
@@ skipping 180 matching lines @@
                                                        bool new_installation) {
   bool result = registered_whitelists_.insert(id).second;
   DCHECK(result);
 
   installer_->RegisterWhitelist(
       id, name, new_installation,
       base::Bind(&SupervisedUserWhitelistService::OnWhitelistReady,
                  weak_ptr_factory_.GetWeakPtr(), id));
 }
 
+void SupervisedUserWhitelistService::GetLoadedWhitelists(
+    std::vector<scoped_refptr<SupervisedUserSiteList>>* whitelists) {
+  for (const auto& whitelist : loaded_whitelists_)
+    whitelists->push_back(whitelist.second);
+}
+
 void SupervisedUserWhitelistService::NotifyWhitelistsChanged() {
-  std::vector<scoped_refptr<SupervisedUserSiteList> > whitelists;
-  for (const auto& whitelist : loaded_whitelists_)
-    whitelists.push_back(whitelist.second);
+  std::vector<scoped_refptr<SupervisedUserSiteList>> whitelists;
+  GetLoadedWhitelists(&whitelists);
 
   for (const auto& callback : site_lists_changed_callbacks_)
     callback.Run(whitelists);
 }
 
 void SupervisedUserWhitelistService::OnWhitelistReady(
     const std::string& id,
     const base::FilePath& whitelist_path) {
   // If the whitelist has been unregistered in the mean time, ignore it.
   if (registered_whitelists_.count(id) == 0u)
@@ skipping 17 matching lines @@
   UMA_HISTOGRAM_TIMES("ManagedUsers.Whitelist.TotalLoadDuration",
                       base::TimeTicks::Now() - start_time);
 
   // If the whitelist has been unregistered in the mean time, ignore it.
   if (registered_whitelists_.count(id) == 0u)
     return;
 
   loaded_whitelists_[id] = whitelist;
   NotifyWhitelistsChanged();
 }