Supervised User whitelists: update to json format v2

chrome/browser/supervised_user/supervised_user_whitelist_service.cc

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 458e573711a8efd7c6af3176397a2a86211a2fa2..07af6cbc0721b6a3cba92d51c4b9579993d14b73 100644
--- a/chrome/browser/supervised_user/supervised_user_whitelist_service.cc
+++ b/chrome/browser/supervised_user/supervised_user_whitelist_service.cc
@@ -111,10 +111,11 @@ SupervisedUserWhitelistService::GetWhitelistsFromCommandLine() {
 
 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) {
@@ -328,6 +329,7 @@ void SupervisedUserWhitelistService::NotifyWhitelistsChanged() {
 
 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.
@@ -335,7 +337,7 @@ void SupervisedUserWhitelistService::OnWhitelistReady(
     return;
 
   SupervisedUserSiteList::Load(
-      whitelist_path,
+      title, whitelist_path,
       base::Bind(&SupervisedUserWhitelistService::OnWhitelistLoaded,
                  weak_ptr_factory_.GetWeakPtr(), id, base::TimeTicks::Now()));
 }