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

Side by Side Diff: net/http/http_network_session.cc

Issue 2517603003: Moves QuicTag typedefs, and QuicTag utility methods to quic_tag.{h,cc}. No behavior change. (Closed)
Patch Set: Created 4 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
« no previous file with comments | « no previous file | net/net.gypi » ('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) 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_session.h" 5 #include "net/http/http_network_session.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/atomic_sequence_num.h" 9 #include "base/atomic_sequence_num.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/debug/stack_trace.h" 11 #include "base/debug/stack_trace.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/memory/memory_coordinator_client_registry.h" 13 #include "base/memory/memory_coordinator_client_registry.h"
14 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
15 #include "base/profiler/scoped_tracker.h" 15 #include "base/profiler/scoped_tracker.h"
16 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
17 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "net/base/network_throttle_manager.h" 19 #include "net/base/network_throttle_manager.h"
20 #include "net/http/http_auth_handler_factory.h" 20 #include "net/http/http_auth_handler_factory.h"
21 #include "net/http/http_response_body_drainer.h" 21 #include "net/http/http_response_body_drainer.h"
22 #include "net/http/http_stream_factory_impl.h" 22 #include "net/http/http_stream_factory_impl.h"
23 #include "net/http/url_security_manager.h" 23 #include "net/http/url_security_manager.h"
24 #include "net/proxy/proxy_service.h" 24 #include "net/proxy/proxy_service.h"
25 #include "net/quic/chromium/quic_stream_factory.h" 25 #include "net/quic/chromium/quic_stream_factory.h"
26 #include "net/quic/core/crypto/quic_random.h" 26 #include "net/quic/core/crypto/quic_random.h"
27 #include "net/quic/core/quic_clock.h" 27 #include "net/quic/core/quic_clock.h"
28 #include "net/quic/core/quic_crypto_client_stream_factory.h" 28 #include "net/quic/core/quic_crypto_client_stream_factory.h"
29 #include "net/quic/core/quic_protocol.h" 29 #include "net/quic/core/quic_protocol.h"
30 #include "net/quic/core/quic_tag.h"
30 #include "net/quic/core/quic_utils.h" 31 #include "net/quic/core/quic_utils.h"
31 #include "net/socket/client_socket_factory.h" 32 #include "net/socket/client_socket_factory.h"
32 #include "net/socket/client_socket_pool_manager_impl.h" 33 #include "net/socket/client_socket_pool_manager_impl.h"
33 #include "net/socket/next_proto.h" 34 #include "net/socket/next_proto.h"
34 #include "net/socket/ssl_client_socket.h" 35 #include "net/socket/ssl_client_socket.h"
35 #include "net/spdy/spdy_session_pool.h" 36 #include "net/spdy/spdy_session_pool.h"
36 37
37 namespace net { 38 namespace net {
38 39
39 namespace { 40 namespace {
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 std::unique_ptr<base::Value> HttpNetworkSession::QuicInfoToValue() const { 290 std::unique_ptr<base::Value> HttpNetworkSession::QuicInfoToValue() const {
290 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); 291 std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
291 dict->Set("sessions", quic_stream_factory_.QuicStreamFactoryInfoToValue()); 292 dict->Set("sessions", quic_stream_factory_.QuicStreamFactoryInfoToValue());
292 dict->SetBoolean("quic_enabled", params_.enable_quic); 293 dict->SetBoolean("quic_enabled", params_.enable_quic);
293 dict->SetBoolean("enable_quic_port_selection", 294 dict->SetBoolean("enable_quic_port_selection",
294 params_.enable_quic_port_selection); 295 params_.enable_quic_port_selection);
295 std::unique_ptr<base::ListValue> connection_options(new base::ListValue); 296 std::unique_ptr<base::ListValue> connection_options(new base::ListValue);
296 for (QuicTagVector::const_iterator it = 297 for (QuicTagVector::const_iterator it =
297 params_.quic_connection_options.begin(); 298 params_.quic_connection_options.begin();
298 it != params_.quic_connection_options.end(); ++it) { 299 it != params_.quic_connection_options.end(); ++it) {
299 connection_options->AppendString("'" + QuicUtils::TagToString(*it) + "'"); 300 connection_options->AppendString("'" + QuicTagToString(*it) + "'");
300 } 301 }
301 dict->Set("connection_options", std::move(connection_options)); 302 dict->Set("connection_options", std::move(connection_options));
302 303
303 std::unique_ptr<base::ListValue> origins_to_force_quic_on( 304 std::unique_ptr<base::ListValue> origins_to_force_quic_on(
304 new base::ListValue); 305 new base::ListValue);
305 for (const auto& origin : params_.origins_to_force_quic_on) { 306 for (const auto& origin : params_.origins_to_force_quic_on) {
306 origins_to_force_quic_on->AppendString("'" + origin.ToString() + "'"); 307 origins_to_force_quic_on->AppendString("'" + origin.ToString() + "'");
307 } 308 }
308 dict->Set("origins_to_force_quic_on", std::move(origins_to_force_quic_on)); 309 dict->Set("origins_to_force_quic_on", std::move(origins_to_force_quic_on));
309 310
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 break; 417 break;
417 case base::MemoryState::SUSPENDED: 418 case base::MemoryState::SUSPENDED:
418 // Note: Not supported at present. Fall through. 419 // Note: Not supported at present. Fall through.
419 case base::MemoryState::UNKNOWN: 420 case base::MemoryState::UNKNOWN:
420 NOTREACHED(); 421 NOTREACHED();
421 break; 422 break;
422 } 423 }
423 } 424 }
424 425
425 } // namespace net 426 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698