| Index: content/browser/ssl/ssl_manager.h
|
| diff --git a/content/browser/ssl/ssl_manager.h b/content/browser/ssl/ssl_manager.h
|
| index 6a8377500ac6a0c6661f4962550e60985f9b2a61..18c26c6ad3e06b50142b3ba0aaf95a2ac3dec80c 100644
|
| --- a/content/browser/ssl/ssl_manager.h
|
| +++ b/content/browser/ssl/ssl_manager.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef CONTENT_BROWSER_SSL_SSL_MANAGER_H_
|
| #define CONTENT_BROWSER_SSL_SSL_MANAGER_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "content/browser/ssl/ssl_error_handler.h"
|
| #include "content/browser/ssl/ssl_policy_backend.h"
|
| @@ -104,7 +104,7 @@ class CONTENT_EXPORT SSLManager {
|
| SSLPolicyBackend backend_;
|
|
|
| // The SSLPolicy instance for this manager.
|
| - scoped_ptr<SSLPolicy> policy_;
|
| + std::unique_ptr<SSLPolicy> policy_;
|
|
|
| // The NavigationController that owns this SSLManager. We are responsible
|
| // for the security UI of this tab.
|
|
|