Index: extensions/browser/extension_registry.cc |
diff --git a/extensions/browser/extension_registry.cc b/extensions/browser/extension_registry.cc |
index 49c499a005bc1c24c2014c8ce1ac28d1c1dfc8b6..7054673ab348c0940770823c80b59ea8aa5f16e0 100644 |
--- a/extensions/browser/extension_registry.cc |
+++ b/extensions/browser/extension_registry.cc |
@@ -19,14 +19,14 @@ ExtensionRegistry* ExtensionRegistry::Get(content::BrowserContext* context) { |
return ExtensionRegistryFactory::GetForBrowserContext(context); |
} |
-scoped_ptr<ExtensionSet> ExtensionRegistry::GenerateInstalledExtensionsSet() |
- const { |
+std::unique_ptr<ExtensionSet> |
+ExtensionRegistry::GenerateInstalledExtensionsSet() const { |
return GenerateInstalledExtensionsSet(EVERYTHING); |
} |
-scoped_ptr<ExtensionSet> ExtensionRegistry::GenerateInstalledExtensionsSet( |
+std::unique_ptr<ExtensionSet> ExtensionRegistry::GenerateInstalledExtensionsSet( |
int include_mask) const { |
- scoped_ptr<ExtensionSet> installed_extensions(new ExtensionSet); |
+ std::unique_ptr<ExtensionSet> installed_extensions(new ExtensionSet); |
if (include_mask & IncludeFlag::ENABLED) |
installed_extensions->InsertAll(enabled_extensions_); |
if (include_mask & IncludeFlag::DISABLED) |