| Index: components/content_settings/core/browser/content_settings_registry.h
|
| diff --git a/components/content_settings/core/browser/content_settings_registry.h b/components/content_settings/core/browser/content_settings_registry.h
|
| index dfaaf72becaee4a52c94179867c5f706c862342a..71bc415c7ba1d29491ce4baeb5a11d6e9c97033f 100644
|
| --- a/components/content_settings/core/browser/content_settings_registry.h
|
| +++ b/components/content_settings/core/browser/content_settings_registry.h
|
| @@ -7,9 +7,10 @@
|
|
|
| #include <string>
|
|
|
| +#include "base/containers/scoped_ptr_map.h"
|
| #include "base/lazy_instance.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_vector.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| #include "components/content_settings/core/browser/content_settings_info.h"
|
| #include "components/content_settings/core/browser/website_settings_info.h"
|
| #include "components/content_settings/core/common/content_settings.h"
|
| @@ -50,7 +51,8 @@ class ContentSettingsRegistry {
|
| WebsiteSettingsInfo::SyncStatus sync_status,
|
| const std::vector<std::string>& whitelisted_schemes);
|
|
|
| - ScopedVector<ContentSettingsInfo> content_settings_info_;
|
| + base::ScopedPtrMap<ContentSettingsType, scoped_ptr<ContentSettingsInfo>>
|
| + content_settings_info_;
|
| WebsiteSettingsRegistry* website_settings_registry_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ContentSettingsRegistry);
|
|
|