| OLD | NEW |
| 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 Loading... |
| 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 Loading... |
| 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 |
| OLD | NEW |