| Index: net/server/web_socket_encoder_unittest.cc
|
| diff --git a/net/server/web_socket_encoder_unittest.cc b/net/server/web_socket_encoder_unittest.cc
|
| index 27babda7fac0f1282f33953ad97b5228f646a431..711a852a9f61ed291a33571ead72939e010560da 100644
|
| --- a/net/server/web_socket_encoder_unittest.cc
|
| +++ b/net/server/web_socket_encoder_unittest.cc
|
| @@ -12,7 +12,7 @@ namespace net {
|
|
|
| TEST(WebSocketEncoderHandshakeTest, EmptyRequestShouldBeRejected) {
|
| WebSocketDeflateParameters params;
|
| - scoped_ptr<WebSocketEncoder> server =
|
| + std::unique_ptr<WebSocketEncoder> server =
|
| WebSocketEncoder::CreateServer("", ¶ms);
|
|
|
| EXPECT_FALSE(server);
|
| @@ -21,7 +21,7 @@ TEST(WebSocketEncoderHandshakeTest, EmptyRequestShouldBeRejected) {
|
| TEST(WebSocketEncoderHandshakeTest,
|
| CreateServerWithoutClientMaxWindowBitsParameter) {
|
| WebSocketDeflateParameters params;
|
| - scoped_ptr<WebSocketEncoder> server =
|
| + std::unique_ptr<WebSocketEncoder> server =
|
| WebSocketEncoder::CreateServer("permessage-deflate", ¶ms);
|
|
|
| ASSERT_TRUE(server);
|
| @@ -32,7 +32,7 @@ TEST(WebSocketEncoderHandshakeTest,
|
| TEST(WebSocketEncoderHandshakeTest,
|
| CreateServerWithServerNoContextTakeoverParameter) {
|
| WebSocketDeflateParameters params;
|
| - scoped_ptr<WebSocketEncoder> server = WebSocketEncoder::CreateServer(
|
| + std::unique_ptr<WebSocketEncoder> server = WebSocketEncoder::CreateServer(
|
| "permessage-deflate; server_no_context_takeover", ¶ms);
|
| ASSERT_TRUE(server);
|
| EXPECT_TRUE(server->deflate_enabled());
|
| @@ -42,7 +42,7 @@ TEST(WebSocketEncoderHandshakeTest,
|
|
|
| TEST(WebSocketEncoderHandshakeTest, FirstExtensionShouldBeChosen) {
|
| WebSocketDeflateParameters params;
|
| - scoped_ptr<WebSocketEncoder> server = WebSocketEncoder::CreateServer(
|
| + std::unique_ptr<WebSocketEncoder> server = WebSocketEncoder::CreateServer(
|
| "permessage-deflate; server_no_context_takeover,"
|
| "permessage-deflate; server_max_window_bits=15",
|
| ¶ms);
|
| @@ -55,7 +55,7 @@ TEST(WebSocketEncoderHandshakeTest, FirstExtensionShouldBeChosen) {
|
|
|
| TEST(WebSocketEncoderHandshakeTest, FirstValidExtensionShouldBeChosen) {
|
| WebSocketDeflateParameters params;
|
| - scoped_ptr<WebSocketEncoder> server = WebSocketEncoder::CreateServer(
|
| + std::unique_ptr<WebSocketEncoder> server = WebSocketEncoder::CreateServer(
|
| "permessage-deflate; Xserver_no_context_takeover,"
|
| "permessage-deflate; server_max_window_bits=15",
|
| ¶ms);
|
| @@ -68,7 +68,7 @@ TEST(WebSocketEncoderHandshakeTest, FirstValidExtensionShouldBeChosen) {
|
|
|
| TEST(WebSocketEncoderHandshakeTest, AllExtensionsAreUnknownOrMalformed) {
|
| WebSocketDeflateParameters params;
|
| - scoped_ptr<WebSocketEncoder> server =
|
| + std::unique_ptr<WebSocketEncoder> server =
|
| WebSocketEncoder::CreateServer("unknown, permessage-deflate; x", ¶ms);
|
|
|
| ASSERT_TRUE(server);
|
| @@ -87,8 +87,8 @@ class WebSocketEncoderTest : public testing::Test {
|
| }
|
|
|
| protected:
|
| - scoped_ptr<WebSocketEncoder> server_;
|
| - scoped_ptr<WebSocketEncoder> client_;
|
| + std::unique_ptr<WebSocketEncoder> server_;
|
| + std::unique_ptr<WebSocketEncoder> client_;
|
| };
|
|
|
| class WebSocketEncoderCompressionTest : public WebSocketEncoderTest {
|
| @@ -108,8 +108,8 @@ class WebSocketEncoderCompressionTest : public WebSocketEncoderTest {
|
| };
|
|
|
| TEST_F(WebSocketEncoderTest, DeflateDisabledEncoder) {
|
| - scoped_ptr<WebSocketEncoder> server = WebSocketEncoder::CreateServer();
|
| - scoped_ptr<WebSocketEncoder> client = WebSocketEncoder::CreateClient("");
|
| + std::unique_ptr<WebSocketEncoder> server = WebSocketEncoder::CreateServer();
|
| + std::unique_ptr<WebSocketEncoder> client = WebSocketEncoder::CreateClient("");
|
|
|
| ASSERT_TRUE(server);
|
| ASSERT_TRUE(client);
|
|
|