| Index: extensions/browser/test_extensions_browser_client.h
|
| diff --git a/extensions/browser/test_extensions_browser_client.h b/extensions/browser/test_extensions_browser_client.h
|
| index 2b0dafb0b7d54a68beb060045b8f84ae71dfe19b..e66fe98910ef7c1c5ff974fd74bf1c503132fba2 100644
|
| --- a/extensions/browser/test_extensions_browser_client.h
|
| +++ b/extensions/browser/test_extensions_browser_client.h
|
| @@ -35,7 +35,7 @@ class TestExtensionsBrowserClient : public ExtensionsBrowserClient {
|
| void set_extension_system_factory(ExtensionSystemProvider* factory) {
|
| extension_system_factory_ = factory;
|
| }
|
| - void set_extension_cache(scoped_ptr<ExtensionCache> extension_cache) {
|
| + void set_extension_cache(std::unique_ptr<ExtensionCache> extension_cache) {
|
| extension_cache_ = std::move(extension_cache);
|
| }
|
|
|
| @@ -85,7 +85,7 @@ class TestExtensionsBrowserClient : public ExtensionsBrowserClient {
|
| content::BrowserContext* context,
|
| std::vector<ExtensionPrefsObserver*>* observers) const override;
|
| ProcessManagerDelegate* GetProcessManagerDelegate() const override;
|
| - scoped_ptr<ExtensionHostDelegate> CreateExtensionHostDelegate() override;
|
| + std::unique_ptr<ExtensionHostDelegate> CreateExtensionHostDelegate() override;
|
| bool DidVersionUpdate(content::BrowserContext* context) override;
|
| void PermitExternalProtocolHandler() override;
|
| bool IsRunningInForcedAppMode() override;
|
| @@ -97,13 +97,14 @@ class TestExtensionsBrowserClient : public ExtensionsBrowserClient {
|
| ExtensionFunctionRegistry* registry) const override;
|
| void RegisterMojoServices(content::RenderFrameHost* render_frame_host,
|
| const Extension* extension) const override;
|
| - scoped_ptr<RuntimeAPIDelegate> CreateRuntimeAPIDelegate(
|
| + std::unique_ptr<RuntimeAPIDelegate> CreateRuntimeAPIDelegate(
|
| content::BrowserContext* context) const override;
|
| const ComponentExtensionResourceManager*
|
| GetComponentExtensionResourceManager() override;
|
| - void BroadcastEventToRenderers(events::HistogramValue histogram_value,
|
| - const std::string& event_name,
|
| - scoped_ptr<base::ListValue> args) override;
|
| + void BroadcastEventToRenderers(
|
| + events::HistogramValue histogram_value,
|
| + const std::string& event_name,
|
| + std::unique_ptr<base::ListValue> args) override;
|
| net::NetLog* GetNetLog() override;
|
| ExtensionCache* GetExtensionCache() override;
|
| bool IsBackgroundUpdateAllowed() override;
|
| @@ -123,7 +124,7 @@ class TestExtensionsBrowserClient : public ExtensionsBrowserClient {
|
| // Not owned, defaults to NULL.
|
| ExtensionSystemProvider* extension_system_factory_;
|
|
|
| - scoped_ptr<ExtensionCache> extension_cache_;
|
| + std::unique_ptr<ExtensionCache> extension_cache_;
|
|
|
| base::Callback<update_client::UpdateClient*(void)> update_client_factory_;
|
|
|
|
|