| 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 "net/http/http_network_layer.h" | 5 #include "net/http/http_network_layer.h" |
| 6 | 6 |
| 7 #include "base/field_trial.h" | 7 #include "base/field_trial.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/string_split.h" |
| 9 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| 10 #include "net/http/http_network_session.h" | 11 #include "net/http/http_network_session.h" |
| 11 #include "net/http/http_network_transaction.h" | 12 #include "net/http/http_network_transaction.h" |
| 12 #include "net/socket/client_socket_factory.h" | 13 #include "net/socket/client_socket_factory.h" |
| 13 #include "net/spdy/spdy_framer.h" | 14 #include "net/spdy/spdy_framer.h" |
| 14 #include "net/spdy/spdy_session.h" | 15 #include "net/spdy/spdy_session.h" |
| 15 #include "net/spdy/spdy_session_pool.h" | 16 #include "net/spdy/spdy_session_pool.h" |
| 16 | 17 |
| 17 namespace net { | 18 namespace net { |
| 18 | 19 |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 pair.protocol = HttpAlternateProtocols::NPN_SPDY_2; | 218 pair.protocol = HttpAlternateProtocols::NPN_SPDY_2; |
| 218 HttpAlternateProtocols::ForceAlternateProtocol(pair); | 219 HttpAlternateProtocols::ForceAlternateProtocol(pair); |
| 219 } else if (option.empty() && it == spdy_options.begin()) { | 220 } else if (option.empty() && it == spdy_options.begin()) { |
| 220 continue; | 221 continue; |
| 221 } else { | 222 } else { |
| 222 LOG(DFATAL) << "Unrecognized spdy option: " << option; | 223 LOG(DFATAL) << "Unrecognized spdy option: " << option; |
| 223 } | 224 } |
| 224 } | 225 } |
| 225 } | 226 } |
| 226 } // namespace net | 227 } // namespace net |
| OLD | NEW |