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" |
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
446 pref_proxy_config_tracker_.reset( | 446 pref_proxy_config_tracker_.reset( |
447 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 447 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
448 local_state)); | 448 local_state)); |
449 ChromeNetworkDelegate::InitializePrefsOnUIThread( | 449 ChromeNetworkDelegate::InitializePrefsOnUIThread( |
450 &system_enable_referrers_, | 450 &system_enable_referrers_, |
451 NULL, | 451 NULL, |
452 NULL, | 452 NULL, |
453 NULL, | 453 NULL, |
454 local_state); | 454 local_state); |
455 ssl_config_service_manager_.reset( | 455 ssl_config_service_manager_.reset( |
456 SSLConfigServiceManager::CreateDefaultManager(local_state)); | 456 ssl_config::SSLConfigServiceManager::CreateDefaultManager( |
| 457 local_state, |
| 458 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO))); |
457 | 459 |
458 base::Value* dns_client_enabled_default = new base::FundamentalValue( | 460 base::Value* dns_client_enabled_default = new base::FundamentalValue( |
459 chrome_browser_net::ConfigureAsyncDnsFieldTrial()); | 461 chrome_browser_net::ConfigureAsyncDnsFieldTrial()); |
460 local_state->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled, | 462 local_state->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled, |
461 dns_client_enabled_default); | 463 dns_client_enabled_default); |
462 chrome_browser_net::LogAsyncDnsPrefSource( | 464 chrome_browser_net::LogAsyncDnsPrefSource( |
463 local_state->FindPreference(prefs::kBuiltInDnsClientEnabled)); | 465 local_state->FindPreference(prefs::kBuiltInDnsClientEnabled)); |
464 | 466 |
465 dns_client_enabled_.Init(prefs::kBuiltInDnsClientEnabled, | 467 dns_client_enabled_.Init(prefs::kBuiltInDnsClientEnabled, |
466 local_state, | 468 local_state, |
(...skipping 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1578 globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass(); | 1580 globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass(); |
1579 | 1581 |
1580 context->set_job_factory( | 1582 context->set_job_factory( |
1581 globals->proxy_script_fetcher_url_request_job_factory.get()); | 1583 globals->proxy_script_fetcher_url_request_job_factory.get()); |
1582 | 1584 |
1583 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1585 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
1584 // system URLRequestContext too. There's no reason this should be tied to a | 1586 // system URLRequestContext too. There's no reason this should be tied to a |
1585 // profile. | 1587 // profile. |
1586 return context; | 1588 return context; |
1587 } | 1589 } |
OLD | NEW |