| Index: chrome/browser/extensions/extension_management.h
|
| diff --git a/chrome/browser/extensions/extension_management.h b/chrome/browser/extensions/extension_management.h
|
| index b3010588ad5882142261f73c0f34e7b157268c50..9d9831e827caef39c83efe78682b8faa96975bbe 100644
|
| --- a/chrome/browser/extensions/extension_management.h
|
| +++ b/chrome/browser/extensions/extension_management.h
|
| @@ -12,7 +12,6 @@
|
| #include "base/containers/scoped_ptr_hash_map.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_vector.h"
|
| #include "base/memory/singleton.h"
|
| #include "base/observer_list.h"
|
| #include "base/values.h"
|
| @@ -82,7 +81,8 @@ class ExtensionManagement : public KeyedService {
|
|
|
| // Get the list of ManagementPolicy::Provider controlled by extension
|
| // management policy settings.
|
| - std::vector<ManagementPolicy::Provider*> GetProviders() const;
|
| + const std::vector<std::unique_ptr<ManagementPolicy::Provider>>& GetProviders()
|
| + const;
|
|
|
| // Checks if extensions are blacklisted by default, by policy. When true,
|
| // this means that even extensions without an ID should be blacklisted (e.g.
|
| @@ -187,7 +187,7 @@ class ExtensionManagement : public KeyedService {
|
|
|
| base::ObserverList<Observer, true> observer_list_;
|
| PrefChangeRegistrar pref_change_registrar_;
|
| - ScopedVector<ManagementPolicy::Provider> providers_;
|
| + std::vector<std::unique_ptr<ManagementPolicy::Provider>> providers_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ExtensionManagement);
|
| };
|
|
|