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 "chrome/browser/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/base64.h" | 9 #include "base/base64.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
14 #include "base/debug/leak_tracker.h" | 14 #include "base/debug/leak_tracker.h" |
15 #include "base/environment.h" | |
15 #include "base/logging.h" | 16 #include "base/logging.h" |
16 #include "base/metrics/field_trial.h" | 17 #include "base/metrics/field_trial.h" |
17 #include "base/prefs/pref_registry_simple.h" | 18 #include "base/prefs/pref_registry_simple.h" |
18 #include "base/prefs/pref_service.h" | 19 #include "base/prefs/pref_service.h" |
19 #include "base/profiler/scoped_tracker.h" | 20 #include "base/profiler/scoped_tracker.h" |
20 #include "base/stl_util.h" | 21 #include "base/stl_util.h" |
21 #include "base/strings/string_number_conversions.h" | 22 #include "base/strings/string_number_conversions.h" |
22 #include "base/strings/string_piece.h" | 23 #include "base/strings/string_piece.h" |
23 #include "base/strings/string_split.h" | 24 #include "base/strings/string_split.h" |
24 #include "base/strings/string_util.h" | 25 #include "base/strings/string_util.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
73 #include "net/http/http_auth_filter.h" | 74 #include "net/http/http_auth_filter.h" |
74 #include "net/http/http_auth_handler_factory.h" | 75 #include "net/http/http_auth_handler_factory.h" |
75 #include "net/http/http_network_layer.h" | 76 #include "net/http/http_network_layer.h" |
76 #include "net/http/http_server_properties_impl.h" | 77 #include "net/http/http_server_properties_impl.h" |
77 #include "net/proxy/proxy_config_service.h" | 78 #include "net/proxy/proxy_config_service.h" |
78 #include "net/proxy/proxy_script_fetcher_impl.h" | 79 #include "net/proxy/proxy_script_fetcher_impl.h" |
79 #include "net/proxy/proxy_service.h" | 80 #include "net/proxy/proxy_service.h" |
80 #include "net/quic/crypto/crypto_protocol.h" | 81 #include "net/quic/crypto/crypto_protocol.h" |
81 #include "net/quic/quic_protocol.h" | 82 #include "net/quic/quic_protocol.h" |
82 #include "net/quic/quic_utils.h" | 83 #include "net/quic/quic_utils.h" |
84 #include "net/socket/ssl_client_socket_openssl.h" | |
83 #include "net/socket/tcp_client_socket.h" | 85 #include "net/socket/tcp_client_socket.h" |
84 #include "net/spdy/spdy_session.h" | 86 #include "net/spdy/spdy_session.h" |
85 #include "net/ssl/channel_id_service.h" | 87 #include "net/ssl/channel_id_service.h" |
86 #include "net/ssl/default_channel_id_store.h" | 88 #include "net/ssl/default_channel_id_store.h" |
87 #include "net/url_request/data_protocol_handler.h" | 89 #include "net/url_request/data_protocol_handler.h" |
88 #include "net/url_request/file_protocol_handler.h" | 90 #include "net/url_request/file_protocol_handler.h" |
89 #include "net/url_request/ftp_protocol_handler.h" | 91 #include "net/url_request/ftp_protocol_handler.h" |
90 #include "net/url_request/static_http_user_agent_settings.h" | 92 #include "net/url_request/static_http_user_agent_settings.h" |
91 #include "net/url_request/url_fetcher.h" | 93 #include "net/url_request/url_fetcher.h" |
92 #include "net/url_request/url_request_backoff_manager.h" | 94 #include "net/url_request/url_request_backoff_manager.h" |
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
546 #endif | 548 #endif |
547 | 549 |
548 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 | 550 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 |
549 // is fixed. | 551 // is fixed. |
550 tracked_objects::ScopedTracker tracking_profile2( | 552 tracked_objects::ScopedTracker tracking_profile2( |
551 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 553 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
552 "466432 IOThread::InitAsync::CommandLineForCurrentProcess")); | 554 "466432 IOThread::InitAsync::CommandLineForCurrentProcess")); |
553 const base::CommandLine& command_line = | 555 const base::CommandLine& command_line = |
554 *base::CommandLine::ForCurrentProcess(); | 556 *base::CommandLine::ForCurrentProcess(); |
555 | 557 |
558 if (command_line.HasSwitch(switches::kSSLKeyLogFile)) { | |
559 scoped_ptr<base::Environment> env(base::Environment::Create()); | |
560 std::string switch_value = command_line.GetSwitchValueNative( | |
561 switches::kSSLKeyLogFile); | |
562 env->SetVar("SSLKEYLOGFILE", switch_value); | |
Bryan McQuade
2015/10/13 14:33:36
Thanks for putting this patch together!
I don't k
davidben
2015/10/13 16:07:39
I think something on HttpNetworkSession::Params is
| |
563 } | |
564 | |
556 DCHECK(!globals_); | 565 DCHECK(!globals_); |
557 globals_ = new Globals; | 566 globals_ = new Globals; |
558 | 567 |
559 // Add an observer that will emit network change events to the ChromeNetLog. | 568 // Add an observer that will emit network change events to the ChromeNetLog. |
560 // Assuming NetworkChangeNotifier dispatches in FIFO order, we should be | 569 // Assuming NetworkChangeNotifier dispatches in FIFO order, we should be |
561 // logging the network change before other IO thread consumers respond to it. | 570 // logging the network change before other IO thread consumers respond to it. |
562 network_change_observer_.reset( | 571 network_change_observer_.reset( |
563 new LoggingNetworkChangeObserver(net_log_)); | 572 new LoggingNetworkChangeObserver(net_log_)); |
564 | 573 |
565 // Setup the HistogramWatcher to run on the IO thread. | 574 // Setup the HistogramWatcher to run on the IO thread. |
(...skipping 1026 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1592 globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass(); | 1601 globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass(); |
1593 | 1602 |
1594 context->set_job_factory( | 1603 context->set_job_factory( |
1595 globals->proxy_script_fetcher_url_request_job_factory.get()); | 1604 globals->proxy_script_fetcher_url_request_job_factory.get()); |
1596 | 1605 |
1597 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1606 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
1598 // system URLRequestContext too. There's no reason this should be tied to a | 1607 // system URLRequestContext too. There's no reason this should be tied to a |
1599 // profile. | 1608 // profile. |
1600 return context; | 1609 return context; |
1601 } | 1610 } |
OLD | NEW |