Index: extensions/shell/browser/shell_extensions_browser_client.h |
diff --git a/extensions/shell/browser/shell_extensions_browser_client.h b/extensions/shell/browser/shell_extensions_browser_client.h |
index da3e8be60df87213cb04cc74ab5525360abfcccd..0ef529ccf7bdafd29e3c7899cd300105963c5950 100644 |
--- a/extensions/shell/browser/shell_extensions_browser_client.h |
+++ b/extensions/shell/browser/shell_extensions_browser_client.h |
@@ -5,6 +5,8 @@ |
#ifndef EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_ |
#define EXTENSIONS_SHELL_BROWSER_SHELL_EXTENSIONS_BROWSER_CLIENT_H_ |
+#include <memory> |
+ |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
#include "build/build_config.h" |
@@ -65,7 +67,7 @@ class ShellExtensionsBrowserClient : 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; |
@@ -77,13 +79,14 @@ class ShellExtensionsBrowserClient : 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; |
@@ -102,10 +105,10 @@ class ShellExtensionsBrowserClient : public ExtensionsBrowserClient { |
PrefService* pref_service_; |
// Support for extension APIs. |
- scoped_ptr<ExtensionsAPIClient> api_client_; |
+ std::unique_ptr<ExtensionsAPIClient> api_client_; |
// The extension cache used for download and installation. |
- scoped_ptr<ExtensionCache> extension_cache_; |
+ std::unique_ptr<ExtensionCache> extension_cache_; |
DISALLOW_COPY_AND_ASSIGN(ShellExtensionsBrowserClient); |
}; |