| 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 <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| (...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 840 tracked_objects::ScopedTracker tracking_profile12_5( | 840 tracked_objects::ScopedTracker tracking_profile12_5( |
| 841 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 841 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 842 "466432 IOThread::InitAsync::QuicConfiguration")); | 842 "466432 IOThread::InitAsync::QuicConfiguration")); |
| 843 ConfigureQuic(command_line); | 843 ConfigureQuic(command_line); |
| 844 if (command_line.HasSwitch( | 844 if (command_line.HasSwitch( |
| 845 switches::kEnableUserAlternateProtocolPorts)) { | 845 switches::kEnableUserAlternateProtocolPorts)) { |
| 846 globals_->enable_user_alternate_protocol_ports = true; | 846 globals_->enable_user_alternate_protocol_ports = true; |
| 847 } | 847 } |
| 848 globals_->enable_brotli.set( | 848 globals_->enable_brotli.set( |
| 849 base::FeatureList::IsEnabled(features::kBrotliEncoding)); | 849 base::FeatureList::IsEnabled(features::kBrotliEncoding)); |
| 850 if (command_line.HasSwitch(switches::kEnableTokenBinding)) { | 850 globals_->enable_token_binding = |
| 851 globals_->enable_token_binding = true; | 851 base::FeatureList::IsEnabled(features::kTokenBinding); |
| 852 } | |
| 853 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 | 852 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 |
| 854 // is fixed. | 853 // is fixed. |
| 855 tracked_objects::ScopedTracker tracking_profile13( | 854 tracked_objects::ScopedTracker tracking_profile13( |
| 856 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 855 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 857 "466432 IOThread::InitAsync::InitializeNetworkOptions")); | 856 "466432 IOThread::InitAsync::InitializeNetworkOptions")); |
| 858 InitializeNetworkOptions(command_line); | 857 InitializeNetworkOptions(command_line); |
| 859 | 858 |
| 860 TRACE_EVENT_BEGIN0("startup", | 859 TRACE_EVENT_BEGIN0("startup", |
| 861 "IOThread::Init:ProxyScriptFetcherRequestContext"); | 860 "IOThread::Init:ProxyScriptFetcherRequestContext"); |
| 862 globals_->proxy_script_fetcher_context.reset( | 861 globals_->proxy_script_fetcher_context.reset( |
| (...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1797 std::move(job_factory); | 1796 std::move(job_factory); |
| 1798 | 1797 |
| 1799 context->set_job_factory( | 1798 context->set_job_factory( |
| 1800 globals->proxy_script_fetcher_url_request_job_factory.get()); | 1799 globals->proxy_script_fetcher_url_request_job_factory.get()); |
| 1801 | 1800 |
| 1802 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1801 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
| 1803 // system URLRequestContext too. There's no reason this should be tied to a | 1802 // system URLRequestContext too. There's no reason this should be tied to a |
| 1804 // profile. | 1803 // profile. |
| 1805 return context; | 1804 return context; |
| 1806 } | 1805 } |
| OLD | NEW |