| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "net/http/http_network_transaction.h" | 5 #include "net/http/http_network_transaction.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 647 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 658 } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE); | 658 } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE); |
| 659 | 659 |
| 660 return rv; | 660 return rv; |
| 661 } | 661 } |
| 662 | 662 |
| 663 int HttpNetworkTransaction::DoCreateStream() { | 663 int HttpNetworkTransaction::DoCreateStream() { |
| 664 next_state_ = STATE_CREATE_STREAM_COMPLETE; | 664 next_state_ = STATE_CREATE_STREAM_COMPLETE; |
| 665 | 665 |
| 666 if (ForWebSocketHandshake()) { | 666 if (ForWebSocketHandshake()) { |
| 667 stream_request_.reset( | 667 stream_request_.reset( |
| 668 session_->websocket_handshake_stream_factory() | 668 session_->http_stream_factory_for_websocket() |
| 669 ->RequestWebSocketHandshakeStream( | 669 ->RequestWebSocketHandshakeStream( |
| 670 *request_, | 670 *request_, |
| 671 priority_, | 671 priority_, |
| 672 server_ssl_config_, | 672 server_ssl_config_, |
| 673 proxy_ssl_config_, | 673 proxy_ssl_config_, |
| 674 this, | 674 this, |
| 675 websocket_handshake_stream_base_create_helper_, | 675 websocket_handshake_stream_base_create_helper_, |
| 676 net_log_)); | 676 net_log_)); |
| 677 } else { | 677 } else { |
| 678 stream_request_.reset( | 678 stream_request_.reset( |
| (...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1540 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, | 1540 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, |
| 1541 state); | 1541 state); |
| 1542 break; | 1542 break; |
| 1543 } | 1543 } |
| 1544 return description; | 1544 return description; |
| 1545 } | 1545 } |
| 1546 | 1546 |
| 1547 #undef STATE_CASE | 1547 #undef STATE_CASE |
| 1548 | 1548 |
| 1549 } // namespace net | 1549 } // namespace net |
| OLD | NEW |