Supervised User whitelists: update to json format v2

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 93 matching lines @@
 
     const bool result = whitelists.insert(std::make_pair(id, name)).second;
     DCHECK(result);
   }
 
   return whitelists;
 }
 
 void SupervisedUserWhitelistService::LoadWhitelistForTesting(
     const std::string& id,
+    const base::string16& title,
     const base::FilePath& path) {
   bool result = registered_whitelists_.insert(id).second;
   DCHECK(result);
-  OnWhitelistReady(id, path);
+  OnWhitelistReady(id, title, path);
 }
 
 void SupervisedUserWhitelistService::UnloadWhitelist(const std::string& id) {
   bool result = registered_whitelists_.erase(id) > 0u;
   DCHECK(result);
   loaded_whitelists_.erase(id);
   NotifyWhitelistsChanged();
 }
 
 // static
@@ skipping 193 matching lines @@
 void SupervisedUserWhitelistService::NotifyWhitelistsChanged() {
   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::string16& title,
     const base::FilePath& whitelist_path) {
   // If we did not register the whitelist or it has been unregistered in the
   // mean time, ignore it.
   if (registered_whitelists_.count(id) == 0u)
     return;
 
   SupervisedUserSiteList::Load(
-      whitelist_path,
+      title, whitelist_path,
       base::Bind(&SupervisedUserWhitelistService::OnWhitelistLoaded,
                  weak_ptr_factory_.GetWeakPtr(), id, base::TimeTicks::Now()));
 }
 
 void SupervisedUserWhitelistService::OnWhitelistLoaded(
     const std::string& id,
     base::TimeTicks start_time,
     const scoped_refptr<SupervisedUserSiteList>& whitelist) {
   if (!whitelist) {
     LOG(WARNING) << "Couldn't load whitelist " << id;
     return;
   }
 
   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();
 }