Supervised User whitelists: update to json format v2

chrome/browser/component_updater/supervised_user_whitelist_installer.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_COMPONENT_UPDATER_SUPERVISED_USER_WHITELIST_INSTALLER_H_
 #define CHROME_BROWSER_COMPONENT_UPDATER_SUPERVISED_USER_WHITELIST_INSTALLER_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/strings/string16.h"

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

You can forward-declare string16.

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

Maybe I could, but I'd really rather not. Forward declarations for templates are
discouraged. Also on some platforms, string16 is a typedef for std::wstring, and
it's illegal to forward-declare stuff from std.

 
 namespace base {
 class FilePath;
 }
 
 class PrefRegistrySimple;
 class PrefService;
 class ProfileInfoCache;
 
 namespace component_updater {
 
 class ComponentUpdateService;
 class OnDemandUpdater;
 
 class SupervisedUserWhitelistInstaller {
  public:
   using WhitelistReadyCallback =
       base::Callback<void(const std::string& crx_id,
+                          const base::string16& title,
                           const base::FilePath& whitelist_path)>;
 
   virtual ~SupervisedUserWhitelistInstaller() {}
 
   static scoped_ptr<SupervisedUserWhitelistInstaller> Create(
       ComponentUpdateService* cus,
       ProfileInfoCache* profile_info_cache,
       PrefService* local_state);
 
   static void RegisterPrefs(PrefRegistrySimple* registry);
@@ skipping 37 matching lines @@
   // called from the implementation subclass, and declared here so that the
   // OnDemandUpdater can friend this class and the implementation subclass can
   // live in an anonymous namespace.
   static void TriggerComponentUpdate(OnDemandUpdater* updater,
                                      const std::string& crx_id);
 };
 
 }  // namespace component_updater
 
 #endif  // CHROME_BROWSER_COMPONENT_UPDATER_SUPERVISED_USER_WHITELIST_INSTALLER_H_