| 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 ef91ae9ecc333b825bfa4da05575ff5013ddd755..fdc3564d1c7d484a49446ab06c7bbbc228ae1907 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_service.h
|
| +++ b/chrome/browser/supervised_user/supervised_user_service.h
|
| @@ -15,7 +15,6 @@
|
| #include "base/callback.h"
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_vector.h"
|
| #include "base/observer_list.h"
|
| #include "base/scoped_observer.h"
|
| #include "base/strings/string16.h"
|
| @@ -458,7 +457,7 @@ class SupervisedUserService : public KeyedService,
|
| std::vector<scoped_refptr<SupervisedUserSiteList>> whitelists_;
|
|
|
| // Used to create permission requests.
|
| - ScopedVector<PermissionRequestCreator> permissions_creators_;
|
| + std::vector<std::unique_ptr<PermissionRequestCreator>> permissions_creators_;
|
|
|
| // Used to report inappropriate URLs to SafeSarch API.
|
| std::unique_ptr<SafeSearchURLReporter> url_reporter_;
|
| @@ -475,6 +474,8 @@ class SupervisedUserService : public KeyedService,
|
| std::unique_ptr<syncer::SyncSetupInProgressHandle> sync_blocker_;
|
|
|
| base::WeakPtrFactory<SupervisedUserService> weak_ptr_factory_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(SupervisedUserService);
|
| };
|
|
|
| #endif // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
|
|
|