| Index: extensions/browser/api/networking_private/networking_private_delegate_factory.h
|
| diff --git a/extensions/browser/api/networking_private/networking_private_delegate_factory.h b/extensions/browser/api/networking_private/networking_private_delegate_factory.h
|
| index e048d72b3e84087acde4c33e9508d96fdee80429..9aa3063a020b0dddbee64e833ea7bb6a5f45ebf2 100644
|
| --- a/extensions/browser/api/networking_private/networking_private_delegate_factory.h
|
| +++ b/extensions/browser/api/networking_private/networking_private_delegate_factory.h
|
| @@ -4,8 +4,9 @@
|
| #ifndef EXTENSIONS_BROWSER_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_DELEGATE_FACTORY_H_
|
| #define EXTENSIONS_BROWSER_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_DELEGATE_FACTORY_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/singleton.h"
|
| #include "build/build_config.h"
|
| #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
|
| @@ -36,7 +37,7 @@ class NetworkingPrivateDelegateFactory
|
| VerifyDelegateFactory();
|
| virtual ~VerifyDelegateFactory();
|
|
|
| - virtual scoped_ptr<NetworkingPrivateDelegate::VerifyDelegate>
|
| + virtual std::unique_ptr<NetworkingPrivateDelegate::VerifyDelegate>
|
| CreateDelegate() = 0;
|
|
|
| private:
|
| @@ -48,7 +49,7 @@ class NetworkingPrivateDelegateFactory
|
| UIDelegateFactory();
|
| virtual ~UIDelegateFactory();
|
|
|
| - virtual scoped_ptr<NetworkingPrivateDelegate::UIDelegate>
|
| + virtual std::unique_ptr<NetworkingPrivateDelegate::UIDelegate>
|
| CreateDelegate() = 0;
|
|
|
| private:
|
| @@ -56,8 +57,8 @@ class NetworkingPrivateDelegateFactory
|
| };
|
|
|
| // Provide optional factories for creating delegate instances.
|
| - void SetVerifyDelegateFactory(scoped_ptr<VerifyDelegateFactory> factory);
|
| - void SetUIDelegateFactory(scoped_ptr<UIDelegateFactory> factory);
|
| + void SetVerifyDelegateFactory(std::unique_ptr<VerifyDelegateFactory> factory);
|
| + void SetUIDelegateFactory(std::unique_ptr<UIDelegateFactory> factory);
|
|
|
| static NetworkingPrivateDelegate* GetForBrowserContext(
|
| content::BrowserContext* browser_context);
|
| @@ -77,8 +78,8 @@ class NetworkingPrivateDelegateFactory
|
| bool ServiceIsCreatedWithBrowserContext() const override;
|
| bool ServiceIsNULLWhileTesting() const override;
|
|
|
| - scoped_ptr<VerifyDelegateFactory> verify_factory_;
|
| - scoped_ptr<UIDelegateFactory> ui_factory_;
|
| + std::unique_ptr<VerifyDelegateFactory> verify_factory_;
|
| + std::unique_ptr<UIDelegateFactory> ui_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateDelegateFactory);
|
| };
|
|
|