| Index: chrome/browser/extensions/chrome_extensions_browser_client.h
|
| diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.h b/chrome/browser/extensions/chrome_extensions_browser_client.h
|
| index 40ace2963e96887df983046c6b1f74c926fa141a..772fa2bfa649841775dac52dfd1c758f4dd45f77 100644
|
| --- a/chrome/browser/extensions/chrome_extensions_browser_client.h
|
| +++ b/chrome/browser/extensions/chrome_extensions_browser_client.h
|
| @@ -13,7 +13,6 @@
|
| #include "base/lazy_instance.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "build/build_config.h"
|
| #include "chrome/browser/extensions/chrome_notification_observer.h"
|
| #include "extensions/browser/extensions_browser_client.h"
|
| @@ -83,7 +82,7 @@ class ChromeExtensionsBrowserClient : 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;
|
| @@ -95,13 +94,14 @@ class ChromeExtensionsBrowserClient : 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;
|
| @@ -109,7 +109,7 @@ class ChromeExtensionsBrowserClient : public ExtensionsBrowserClient {
|
| ExtensionWebContentsObserver* GetExtensionWebContentsObserver(
|
| content::WebContents* web_contents) override;
|
| void ReportError(content::BrowserContext* context,
|
| - scoped_ptr<ExtensionError> error) override;
|
| + std::unique_ptr<ExtensionError> error) override;
|
| void CleanUpWebView(content::BrowserContext* browser_context,
|
| int embedder_process_id,
|
| int view_instance_id) override;
|
| @@ -128,14 +128,14 @@ class ChromeExtensionsBrowserClient : public ExtensionsBrowserClient {
|
| ChromeNotificationObserver notification_observer_;
|
|
|
| // Support for ProcessManager.
|
| - scoped_ptr<ChromeProcessManagerDelegate> process_manager_delegate_;
|
| + std::unique_ptr<ChromeProcessManagerDelegate> process_manager_delegate_;
|
|
|
| // Client for API implementations.
|
| - scoped_ptr<ChromeExtensionsAPIClient> api_client_;
|
| + std::unique_ptr<ChromeExtensionsAPIClient> api_client_;
|
|
|
| - scoped_ptr<ChromeComponentExtensionResourceManager> resource_manager_;
|
| + std::unique_ptr<ChromeComponentExtensionResourceManager> resource_manager_;
|
|
|
| - scoped_ptr<ExtensionCache> extension_cache_;
|
| + std::unique_ptr<ExtensionCache> extension_cache_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ChromeExtensionsBrowserClient);
|
| };
|
|
|