| Index: extensions/shell/browser/shell_extension_system.h
|
| diff --git a/extensions/shell/browser/shell_extension_system.h b/extensions/shell/browser/shell_extension_system.h
|
| index 4448fb9385e606a70a90b6e2e58b90ab29ae44d9..7b6b444114da5cd00f26fb0f9d6de45b89ede792 100644
|
| --- a/extensions/shell/browser/shell_extension_system.h
|
| +++ b/extensions/shell/browser/shell_extension_system.h
|
| @@ -66,7 +66,7 @@ class ShellExtensionSystem : public ExtensionSystem {
|
| const UnloadedExtensionInfo::Reason reason) override;
|
| const OneShotEvent& ready() const override;
|
| ContentVerifier* content_verifier() override;
|
| - scoped_ptr<ExtensionSet> GetDependentExtensions(
|
| + std::unique_ptr<ExtensionSet> GetDependentExtensions(
|
| const Extension* extension) override;
|
| void InstallUpdate(const std::string& extension_id,
|
| const base::FilePath& temp_dir) override;
|
| @@ -79,10 +79,10 @@ class ShellExtensionSystem : public ExtensionSystem {
|
| // Data to be accessed on the IO thread. Must outlive process_manager_.
|
| scoped_refptr<InfoMap> info_map_;
|
|
|
| - scoped_ptr<ServiceWorkerManager> service_worker_manager_;
|
| - scoped_ptr<RuntimeData> runtime_data_;
|
| - scoped_ptr<QuotaService> quota_service_;
|
| - scoped_ptr<AppSorting> app_sorting_;
|
| + std::unique_ptr<ServiceWorkerManager> service_worker_manager_;
|
| + std::unique_ptr<RuntimeData> runtime_data_;
|
| + std::unique_ptr<QuotaService> quota_service_;
|
| + std::unique_ptr<AppSorting> app_sorting_;
|
|
|
| scoped_refptr<ValueStoreFactory> store_factory_;
|
|
|
|
|