Chromium Code Reviews| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 55 #include "net/socket/ssl_client_socket_pool.h" | 55 #include "net/socket/ssl_client_socket_pool.h" |
| 56 #include "net/socket/transport_client_socket_pool.h" | 56 #include "net/socket/transport_client_socket_pool.h" |
| 57 #include "net/spdy/hpack_huffman_aggregator.h" | 57 #include "net/spdy/hpack_huffman_aggregator.h" |
| 58 #include "net/spdy/spdy_http_stream.h" | 58 #include "net/spdy/spdy_http_stream.h" |
| 59 #include "net/spdy/spdy_session.h" | 59 #include "net/spdy/spdy_session.h" |
| 60 #include "net/spdy/spdy_session_pool.h" | 60 #include "net/spdy/spdy_session_pool.h" |
| 61 #include "net/ssl/ssl_cert_request_info.h" | 61 #include "net/ssl/ssl_cert_request_info.h" |
| 62 #include "net/ssl/ssl_connection_status_flags.h" | 62 #include "net/ssl/ssl_connection_status_flags.h" |
| 63 #include "url/gurl.h" | 63 #include "url/gurl.h" |
| 64 | 64 |
| 65 #if defined(SPDY_PROXY_AUTH_ORIGIN) | |
| 66 #include <algorithm> | |
|
bengr
2014/07/11 20:42:53
is this not needed?
Not at Google. Contact bengr
2014/07/16 22:41:34
Not sure what it is used for. I am able to build a
| |
| 67 #include "net/proxy/proxy_server.h" | |
| 68 #endif | |
| 69 | |
| 70 | |
| 71 using base::Time; | 65 using base::Time; |
| 72 using base::TimeDelta; | 66 using base::TimeDelta; |
| 73 | 67 |
| 74 namespace net { | 68 namespace net { |
| 75 | 69 |
| 76 namespace { | 70 namespace { |
| 77 | 71 |
| 78 void ProcessAlternateProtocol( | 72 void ProcessAlternateProtocol( |
| 79 HttpNetworkSession* session, | 73 HttpNetworkSession* session, |
| 80 const HttpResponseHeaders& headers, | 74 const HttpResponseHeaders& headers, |
| (...skipping 1503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1584 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, | 1578 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, |
| 1585 state); | 1579 state); |
| 1586 break; | 1580 break; |
| 1587 } | 1581 } |
| 1588 return description; | 1582 return description; |
| 1589 } | 1583 } |
| 1590 | 1584 |
| 1591 #undef STATE_CASE | 1585 #undef STATE_CASE |
| 1592 | 1586 |
| 1593 } // namespace net | 1587 } // namespace net |
| OLD | NEW |