| Index: chrome/browser/supervised_user/supervised_user_service.h
|
| diff --git a/chrome/browser/supervised_user/supervised_user_service.h b/chrome/browser/supervised_user/supervised_user_service.h
|
| index e9310a1c53523001c04065cbf8e6a5a9a243f498..91cf50c7ea61ca870bf8e10e99627978e9b835f0 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_service.h
|
| +++ b/chrome/browser/supervised_user/supervised_user_service.h
|
| @@ -8,13 +8,13 @@
|
| #include <stddef.h>
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/callback.h"
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/observer_list.h"
|
| #include "base/scoped_observer.h"
|
| @@ -183,9 +183,10 @@ class SupervisedUserService : public KeyedService,
|
| void RemoveObserver(SupervisedUserServiceObserver* observer);
|
|
|
| void AddPermissionRequestCreator(
|
| - scoped_ptr<PermissionRequestCreator> creator);
|
| + std::unique_ptr<PermissionRequestCreator> creator);
|
|
|
| - void SetSafeSearchURLReporter(scoped_ptr<SafeSearchURLReporter> reporter);
|
| + void SetSafeSearchURLReporter(
|
| + std::unique_ptr<SafeSearchURLReporter> reporter);
|
|
|
| // ProfileKeyedService override:
|
| void Shutdown() override;
|
| @@ -238,8 +239,8 @@ class SupervisedUserService : public KeyedService,
|
| // will retain a reference to the blacklist.
|
| void SetBlacklist(const SupervisedUserBlacklist* blacklist);
|
| bool HasBlacklist() const;
|
| - void SetManualHosts(scoped_ptr<std::map<std::string, bool>> host_map);
|
| - void SetManualURLs(scoped_ptr<std::map<GURL, bool>> url_map);
|
| + void SetManualHosts(std::unique_ptr<std::map<std::string, bool>> host_map);
|
| + void SetManualURLs(std::unique_ptr<std::map<GURL, bool>> url_map);
|
|
|
| void InitAsyncURLChecker(
|
| const scoped_refptr<net::URLRequestContextGetter>& context);
|
| @@ -397,9 +398,9 @@ class SupervisedUserService : public KeyedService,
|
| } blacklist_state_;
|
|
|
| SupervisedUserBlacklist blacklist_;
|
| - scoped_ptr<FileDownloader> blacklist_downloader_;
|
| + std::unique_ptr<FileDownloader> blacklist_downloader_;
|
|
|
| - scoped_ptr<SupervisedUserWhitelistService> whitelist_service_;
|
| + std::unique_ptr<SupervisedUserWhitelistService> whitelist_service_;
|
|
|
| std::vector<scoped_refptr<SupervisedUserSiteList>> whitelists_;
|
|
|
| @@ -407,7 +408,7 @@ class SupervisedUserService : public KeyedService,
|
| ScopedVector<PermissionRequestCreator> permissions_creators_;
|
|
|
| // Used to report inappropriate URLs to SafeSarch API.
|
| - scoped_ptr<SafeSearchURLReporter> url_reporter_;
|
| + std::unique_ptr<SafeSearchURLReporter> url_reporter_;
|
|
|
| base::ObserverList<SupervisedUserServiceObserver> observer_list_;
|
|
|
|
|