Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Unified Diff: net/server/web_socket_encoder_unittest.cc

Issue 1893083002: Change scoped_ptr to std::unique_ptr in //net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-net-all: iwyu Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/server/web_socket_encoder.cc ('k') | net/ssl/channel_id_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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("", &params);
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", &params);
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", &params);
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",
&params);
@@ -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",
&params);
@@ -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", &params);
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);
« no previous file with comments | « net/server/web_socket_encoder.cc ('k') | net/ssl/channel_id_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698