summaryrefslogtreecommitdiffstats
path: root/net/socket_stream
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 23:44:57 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 23:44:57 +0000
commitdd54bd86ae45868728991c656afd46237dd1efdd (patch)
tree24533f32d9590d6430de47c162b679a639ecd1f3 /net/socket_stream
parentc9bdcbdb323f5f7ca6d06f8c3e6426a9074d72b5 (diff)
downloadchromium_src-dd54bd86ae45868728991c656afd46237dd1efdd.zip
chromium_src-dd54bd86ae45868728991c656afd46237dd1efdd.tar.gz
chromium_src-dd54bd86ae45868728991c656afd46237dd1efdd.tar.bz2
Remove most usages of scoped_ptr<*SocketData> in net unittests.
This anti-pattern simply complicates tests and adds no value. Review URL: https://chromiumcodereview.appspot.com/10809022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147567 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
-rw-r--r--net/socket_stream/socket_stream_unittest.cc18
1 files changed, 8 insertions, 10 deletions
diff --git a/net/socket_stream/socket_stream_unittest.cc b/net/socket_stream/socket_stream_unittest.cc
index cc93035..63a19c3 100644
--- a/net/socket_stream/socket_stream_unittest.cc
+++ b/net/socket_stream/socket_stream_unittest.cc
@@ -333,14 +333,13 @@ TEST_F(SocketStreamTest, CloseFlushPendingWrite) {
AddWebSocketMessage("message1");
AddWebSocketMessage("message2");
- scoped_ptr<DelayedSocketData> data_provider(
- new DelayedSocketData(1,
- data_reads, arraysize(data_reads),
- data_writes, arraysize(data_writes)));
+ DelayedSocketData data_provider(
+ 1, data_reads, arraysize(data_reads),
+ data_writes, arraysize(data_writes));
MockClientSocketFactory* mock_socket_factory =
GetMockClientSocketFactory();
- mock_socket_factory->AddSocketDataProvider(data_provider.get());
+ mock_socket_factory->AddSocketDataProvider(&data_provider);
socket_stream->SetClientSocketFactory(mock_socket_factory);
@@ -469,14 +468,13 @@ TEST_F(SocketStreamTest, IOPending) {
AddWebSocketMessage("message1");
AddWebSocketMessage("message2");
- scoped_ptr<DelayedSocketData> data_provider(
- new DelayedSocketData(1,
- data_reads, arraysize(data_reads),
- data_writes, arraysize(data_writes)));
+ DelayedSocketData data_provider(
+ 1, data_reads, arraysize(data_reads),
+ data_writes, arraysize(data_writes));
MockClientSocketFactory* mock_socket_factory =
GetMockClientSocketFactory();
- mock_socket_factory->AddSocketDataProvider(data_provider.get());
+ mock_socket_factory->AddSocketDataProvider(&data_provider);
socket_stream->SetClientSocketFactory(mock_socket_factory);