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

Side by Side Diff: net/socket_stream/socket_stream_unittest.cc

Issue 4192012: Convert implicit scoped_refptr constructor calls to explicit ones, part 1 (Closed) Base URL: http://git.chromium.org/git/chromium.git
Patch Set: fix presubmit Created 10 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/socket/tcp_client_socket_unittest.cc ('k') | net/spdy/spdy_network_transaction_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "net/base/auth.h" 10 #include "net/base/auth.h"
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 new SocketStreamEventRecorder(&callback)); 233 new SocketStreamEventRecorder(&callback));
234 // Necessary for NewCallback. 234 // Necessary for NewCallback.
235 SocketStreamTest* test = this; 235 SocketStreamTest* test = this;
236 delegate->SetOnConnected(NewCallback( 236 delegate->SetOnConnected(NewCallback(
237 test, &SocketStreamTest::DoSendWebSocketHandshake)); 237 test, &SocketStreamTest::DoSendWebSocketHandshake));
238 delegate->SetOnReceivedData(NewCallback( 238 delegate->SetOnReceivedData(NewCallback(
239 test, &SocketStreamTest::DoCloseFlushPendingWriteTest)); 239 test, &SocketStreamTest::DoCloseFlushPendingWriteTest));
240 240
241 MockHostResolver host_resolver; 241 MockHostResolver host_resolver;
242 242
243 scoped_refptr<SocketStream> socket_stream = 243 scoped_refptr<SocketStream> socket_stream(
244 new SocketStream(GURL("ws://example.com/demo"), delegate.get()); 244 new SocketStream(GURL("ws://example.com/demo"), delegate.get()));
245 245
246 socket_stream->set_context(new TestURLRequestContext()); 246 socket_stream->set_context(new TestURLRequestContext());
247 socket_stream->SetHostResolver(&host_resolver); 247 socket_stream->SetHostResolver(&host_resolver);
248 248
249 MockWrite data_writes[] = { 249 MockWrite data_writes[] = {
250 MockWrite(SocketStreamTest::kWebSocketHandshakeRequest), 250 MockWrite(SocketStreamTest::kWebSocketHandshakeRequest),
251 MockWrite(true, "\0message1\xff", 10), 251 MockWrite(true, "\0message1\xff", 10),
252 MockWrite(true, "\0message2\xff", 10) 252 MockWrite(true, "\0message2\xff", 10)
253 }; 253 };
254 MockRead data_reads[] = { 254 MockRead data_reads[] = {
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 324
325 scoped_ptr<SocketStreamEventRecorder> delegate( 325 scoped_ptr<SocketStreamEventRecorder> delegate(
326 new SocketStreamEventRecorder(&callback)); 326 new SocketStreamEventRecorder(&callback));
327 delegate->SetOnConnected(NewCallback(delegate.get(), 327 delegate->SetOnConnected(NewCallback(delegate.get(),
328 &SocketStreamEventRecorder::DoClose)); 328 &SocketStreamEventRecorder::DoClose));
329 delegate->SetAuthInfo(ASCIIToUTF16("foo"), ASCIIToUTF16("bar")); 329 delegate->SetAuthInfo(ASCIIToUTF16("foo"), ASCIIToUTF16("bar"));
330 delegate->SetOnAuthRequired( 330 delegate->SetOnAuthRequired(
331 NewCallback(delegate.get(), 331 NewCallback(delegate.get(),
332 &SocketStreamEventRecorder::DoRestartWithAuth)); 332 &SocketStreamEventRecorder::DoRestartWithAuth));
333 333
334 scoped_refptr<SocketStream> socket_stream = 334 scoped_refptr<SocketStream> socket_stream(
335 new SocketStream(GURL("ws://example.com/demo"), delegate.get()); 335 new SocketStream(GURL("ws://example.com/demo"), delegate.get()));
336 336
337 socket_stream->set_context(new TestURLRequestContext("myproxy:70")); 337 socket_stream->set_context(new TestURLRequestContext("myproxy:70"));
338 MockHostResolver host_resolver; 338 MockHostResolver host_resolver;
339 socket_stream->SetHostResolver(&host_resolver); 339 socket_stream->SetHostResolver(&host_resolver);
340 socket_stream->SetClientSocketFactory(&mock_socket_factory); 340 socket_stream->SetClientSocketFactory(&mock_socket_factory);
341 341
342 socket_stream->Connect(); 342 socket_stream->Connect();
343 343
344 callback.WaitForResult(); 344 callback.WaitForResult();
345 345
346 const std::vector<SocketStreamEvent>& events = delegate->GetSeenEvents(); 346 const std::vector<SocketStreamEvent>& events = delegate->GetSeenEvents();
347 EXPECT_EQ(3U, events.size()); 347 EXPECT_EQ(3U, events.size());
348 348
349 EXPECT_EQ(SocketStreamEvent::EVENT_AUTH_REQUIRED, events[0].event_type); 349 EXPECT_EQ(SocketStreamEvent::EVENT_AUTH_REQUIRED, events[0].event_type);
350 EXPECT_EQ(SocketStreamEvent::EVENT_CONNECTED, events[1].event_type); 350 EXPECT_EQ(SocketStreamEvent::EVENT_CONNECTED, events[1].event_type);
351 EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[2].event_type); 351 EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[2].event_type);
352 352
353 // TODO(eroman): Add back NetLogTest here... 353 // TODO(eroman): Add back NetLogTest here...
354 } 354 }
355 355
356 } // namespace net 356 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/tcp_client_socket_unittest.cc ('k') | net/spdy/spdy_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698