| Index: net/test/spawned_test_server/base_test_server.h
|
| diff --git a/net/test/spawned_test_server/base_test_server.h b/net/test/spawned_test_server/base_test_server.h
|
| index 60d37e1206f6da69bfec03f1bcef186bc0d60c34..48568010f65577a07c24b369a5bfda14618e300a 100644
|
| --- a/net/test/spawned_test_server/base_test_server.h
|
| +++ b/net/test/spawned_test_server/base_test_server.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
| #include <utility>
|
| #include <vector>
|
| @@ -15,7 +16,6 @@
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "net/base/host_port_pair.h"
|
| #include "net/ssl/ssl_client_cert_type.h"
|
|
|
| @@ -343,7 +343,7 @@ class BaseTestServer {
|
| HostPortPair host_port_pair_;
|
|
|
| // Holds the data sent from the server (e.g., port number).
|
| - scoped_ptr<base::DictionaryValue> server_data_;
|
| + std::unique_ptr<base::DictionaryValue> server_data_;
|
|
|
| // If |type_| is TYPE_HTTPS or TYPE_WSS, the TLS settings to use for the test
|
| // server.
|
| @@ -363,7 +363,7 @@ class BaseTestServer {
|
| // Disable creation of anonymous FTP user?
|
| bool no_anonymous_ftp_user_;
|
|
|
| - scoped_ptr<ScopedPortException> allowed_port_;
|
| + std::unique_ptr<ScopedPortException> allowed_port_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BaseTestServer);
|
| };
|
|
|