| Index: extensions/browser/extensions_browser_client.h
|
| diff --git a/extensions/browser/extensions_browser_client.h b/extensions/browser/extensions_browser_client.h
|
| index c8dd9ee4a15a946cdafc76c81661ab7c4e3e5100..03e3e0814064d2eaac0b8cd54f06c8c7ee62c5a9 100644
|
| --- a/extensions/browser/extensions_browser_client.h
|
| +++ b/extensions/browser/extensions_browser_client.h
|
| @@ -10,7 +10,6 @@
|
| #include <vector>
|
|
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "build/build_config.h"
|
| #include "extensions/browser/extension_event_histogram_value.h"
|
| #include "extensions/browser/extension_prefs_observer.h"
|
| @@ -158,7 +157,8 @@ class ExtensionsBrowserClient {
|
| virtual ProcessManagerDelegate* GetProcessManagerDelegate() const = 0;
|
|
|
| // Creates a new ExtensionHostDelegate instance.
|
| - virtual scoped_ptr<ExtensionHostDelegate> CreateExtensionHostDelegate() = 0;
|
| + virtual std::unique_ptr<ExtensionHostDelegate>
|
| + CreateExtensionHostDelegate() = 0;
|
|
|
| // Returns true if the client version has updated since the last run. Called
|
| // once each time the extensions system is loaded per browser_context. The
|
| @@ -196,7 +196,7 @@ class ExtensionsBrowserClient {
|
| // Creates a RuntimeAPIDelegate responsible for handling extensions
|
| // management-related events such as update and installation on behalf of the
|
| // core runtime API implementation.
|
| - virtual scoped_ptr<RuntimeAPIDelegate> CreateRuntimeAPIDelegate(
|
| + virtual std::unique_ptr<RuntimeAPIDelegate> CreateRuntimeAPIDelegate(
|
| content::BrowserContext* context) const = 0;
|
|
|
| // Returns the manager of resource bundles used in extensions. Returns NULL if
|
| @@ -206,9 +206,10 @@ class ExtensionsBrowserClient {
|
|
|
| // Propagate a event to all the renderers in every browser context. The
|
| // implementation must be safe to call from any thread.
|
| - virtual void BroadcastEventToRenderers(events::HistogramValue histogram_value,
|
| - const std::string& event_name,
|
| - scoped_ptr<base::ListValue> args) = 0;
|
| + virtual void BroadcastEventToRenderers(
|
| + events::HistogramValue histogram_value,
|
| + const std::string& event_name,
|
| + std::unique_ptr<base::ListValue> args) = 0;
|
|
|
| // Returns the embedder's net::NetLog.
|
| virtual net::NetLog* GetNetLog() = 0;
|
| @@ -227,7 +228,7 @@ class ExtensionsBrowserClient {
|
|
|
| // Embedders can override this function to handle extension errors.
|
| virtual void ReportError(content::BrowserContext* context,
|
| - scoped_ptr<ExtensionError> error);
|
| + std::unique_ptr<ExtensionError> error);
|
|
|
| // Returns the ExtensionWebContentsObserver for the given |web_contents|.
|
| virtual ExtensionWebContentsObserver* GetExtensionWebContentsObserver(
|
|
|