| 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 624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 635 net::NetworkChangeNotifier::ShutdownHistogramWatcher(); | 635 net::NetworkChangeNotifier::ShutdownHistogramWatcher(); |
| 636 | 636 |
| 637 // This must be reset before the ChromeNetLog is destroyed. | 637 // This must be reset before the ChromeNetLog is destroyed. |
| 638 network_change_observer_.reset(); | 638 network_change_observer_.reset(); |
| 639 | 639 |
| 640 system_proxy_config_service_.reset(); | 640 system_proxy_config_service_.reset(); |
| 641 delete globals_; | 641 delete globals_; |
| 642 globals_ = NULL; | 642 globals_ = NULL; |
| 643 | 643 |
| 644 base::debug::LeakTracker<SystemURLRequestContextGetter>::CheckForLeaks(); | 644 base::debug::LeakTracker<SystemURLRequestContextGetter>::CheckForLeaks(); |
| 645 |
| 646 if (net_log_) |
| 647 net_log_->ShutdownBeforeTaskScheduler(); |
| 645 } | 648 } |
| 646 | 649 |
| 647 // static | 650 // static |
| 648 void IOThread::RegisterPrefs(PrefRegistrySimple* registry) { | 651 void IOThread::RegisterPrefs(PrefRegistrySimple* registry) { |
| 649 registry->RegisterStringPref(prefs::kAuthSchemes, | 652 registry->RegisterStringPref(prefs::kAuthSchemes, |
| 650 "basic,digest,ntlm,negotiate"); | 653 "basic,digest,ntlm,negotiate"); |
| 651 registry->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, false); | 654 registry->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, false); |
| 652 registry->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); | 655 registry->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); |
| 653 registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); | 656 registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); |
| 654 registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, | 657 registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 898 if (command_line.HasSwitch(switches::kIgnoreUrlFetcherCertRequests)) | 901 if (command_line.HasSwitch(switches::kIgnoreUrlFetcherCertRequests)) |
| 899 net::URLFetcher::SetIgnoreCertificateRequests(true); | 902 net::URLFetcher::SetIgnoreCertificateRequests(true); |
| 900 | 903 |
| 901 params->http_09_on_non_default_ports_enabled = | 904 params->http_09_on_non_default_ports_enabled = |
| 902 http_09_on_non_default_ports_enabled; | 905 http_09_on_non_default_ports_enabled; |
| 903 } | 906 } |
| 904 | 907 |
| 905 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() { | 908 metrics::UpdateUsagePrefCallbackType IOThread::GetMetricsDataUseForwarder() { |
| 906 return base::Bind(&UpdateMetricsUsagePrefsOnUIThread); | 909 return base::Bind(&UpdateMetricsUsagePrefsOnUIThread); |
| 907 } | 910 } |
| OLD | NEW |