Supervised User whitelists: update to json format v2

chrome/browser/supervised_user/supervised_user_whitelist_service.h

Index: chrome/browser/supervised_user/supervised_user_whitelist_service.h
diff --git a/chrome/browser/supervised_user/supervised_user_whitelist_service.h b/chrome/browser/supervised_user/supervised_user_whitelist_service.h
index cf80bfb1904df6c774c74a7810d2c09788c5bc4d..a1f57e0e3aae65cae16e9431e0d84b618a84b7a1 100644
--- a/chrome/browser/supervised_user/supervised_user_whitelist_service.h
+++ b/chrome/browser/supervised_user/supervised_user_whitelist_service.h
@@ -12,6 +12,7 @@
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/strings/string16.h"

[Bernhard Bauer, 2015/11/18 12:10:40]

Same here: you can forward-declare string16.

[Marc Treib, 2015/11/18 12:44:19]

Dito.

 #include "base/time/time.h"
 #include "chrome/browser/supervised_user/supervised_users.h"
 #include "sync/api/syncable_service.h"
@@ -64,6 +65,7 @@ class SupervisedUserWhitelistService : public syncer::SyncableService {
   // Loads an already existing whitelist on disk (i.e. without downloading it as
   // a component).
   void LoadWhitelistForTesting(const std::string& id,
+                               const base::string16& title,
                                const base::FilePath& path);
 
   // Unloads a whitelist. Public for testing.
@@ -112,6 +114,7 @@ class SupervisedUserWhitelistService : public syncer::SyncableService {
   void NotifyWhitelistsChanged();
 
   void OnWhitelistReady(const std::string& id,
+                        const base::string16& title,
                         const base::FilePath& whitelist_path);
   void OnWhitelistLoaded(
       const std::string& id,