| Index: extensions/browser/extension_registry.h
|
| diff --git a/extensions/browser/extension_registry.h b/extensions/browser/extension_registry.h
|
| index 405d07261e64e1b6bdda0ab4be0baaf6e957ee1e..09c8a70ab4b5575c43b55e673ab6c41f526cb97b 100644
|
| --- a/extensions/browser/extension_registry.h
|
| +++ b/extensions/browser/extension_registry.h
|
| @@ -70,7 +70,7 @@ class ExtensionRegistry : public KeyedService {
|
|
|
| // Returns the set of all installed extensions, regardless of state (enabled,
|
| // disabled, etc). Equivalent to GenerateInstalledExtensionSet(EVERYTHING).
|
| - scoped_ptr<ExtensionSet> GenerateInstalledExtensionsSet() const;
|
| + std::unique_ptr<ExtensionSet> GenerateInstalledExtensionsSet() const;
|
|
|
| // Returns a set of all extensions in the subsets specified by |include_mask|.
|
| // * enabled_extensions() --> ExtensionRegistry::ENABLED
|
| @@ -78,7 +78,7 @@ class ExtensionRegistry : public KeyedService {
|
| // * terminated_extensions() --> ExtensionRegistry::TERMINATED
|
| // * blacklisted_extensions() --> ExtensionRegistry::BLACKLISTED
|
| // * blocked_extensions() --> ExtensionRegistry::BLOCKED
|
| - scoped_ptr<ExtensionSet> GenerateInstalledExtensionsSet(
|
| + std::unique_ptr<ExtensionSet> GenerateInstalledExtensionsSet(
|
| int include_mask) const;
|
|
|
| // The usual observer interface.
|
|
|