Supervised User whitelists: update to json format v2

chrome/browser/supervised_user/supervised_user_whitelist_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_WHITELIST_SERVICE_H_
 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_WHITELIST_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #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"
 
 class PrefService;
 class SupervisedUserSiteList;
 
 namespace base {
 class DictionaryValue;
 class FilePath;
@@ skipping 32 matching lines @@
   // site lists.
   void AddSiteListsChangedCallback(const SiteListsChangedCallback& callback);
 
   // Returns a map (from CRX ID to name) of whitelists to be installed,
   // specified on the command line.
   static std::map<std::string, std::string> GetWhitelistsFromCommandLine();
 
   // 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.
   void UnloadWhitelist(const std::string& id);
 
   // Creates Sync data for a whitelist with the given |id| and |name|.
   // Public for testing.
   static syncer::SyncData CreateWhitelistSyncData(const std::string& id,
                                                   const std::string& name);
 
@@ skipping 28 matching lines @@
   void RegisterWhitelist(const std::string& id,
                          const std::string& name,
                          WhitelistSource source);
 
   void GetLoadedWhitelists(
       std::vector<scoped_refptr<SupervisedUserSiteList>>* whitelists);
 
   void NotifyWhitelistsChanged();
 
   void OnWhitelistReady(const std::string& id,
+                        const base::string16& title,
                         const base::FilePath& whitelist_path);
   void OnWhitelistLoaded(
       const std::string& id,
       base::TimeTicks start_time,
       const scoped_refptr<SupervisedUserSiteList>& whitelist);
 
   PrefService* prefs_;
   component_updater::SupervisedUserWhitelistInstaller* installer_;
 
   std::string client_id_;
   std::vector<SiteListsChangedCallback> site_lists_changed_callbacks_;
 
   // The set of registered whitelists. A whitelist might be registered but not
   // loaded yet, in which case it will not be in |loaded_whitelists_| yet.
   // On the other hand, every loaded whitelist has to be registered.
   std::set<std::string> registered_whitelists_;
   std::map<std::string, scoped_refptr<SupervisedUserSiteList> >
       loaded_whitelists_;
 
   base::WeakPtrFactory<SupervisedUserWhitelistService> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SupervisedUserWhitelistService);
 };
 
 #endif  // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_WHITELIST_SERVICE_H_