| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/leak_tracker.h" | 10 #include "base/debug/leak_tracker.h" |
| (...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 524 base::debug::LeakTracker<SystemURLRequestContextGetter>::CheckForLeaks(); | 524 base::debug::LeakTracker<SystemURLRequestContextGetter>::CheckForLeaks(); |
| 525 | 525 |
| 526 // This will delete the |notification_service_|. Make sure it's done after | 526 // This will delete the |notification_service_|. Make sure it's done after |
| 527 // anything else can reference it. | 527 // anything else can reference it. |
| 528 BrowserProcessSubThread::CleanUp(); | 528 BrowserProcessSubThread::CleanUp(); |
| 529 } | 529 } |
| 530 | 530 |
| 531 // static | 531 // static |
| 532 void IOThread::RegisterPrefs(PrefService* local_state) { | 532 void IOThread::RegisterPrefs(PrefService* local_state) { |
| 533 local_state->RegisterStringPref(prefs::kAuthSchemes, | 533 local_state->RegisterStringPref(prefs::kAuthSchemes, |
| 534 "basic,digest,ntlm,negotiate"); | 534 "basic,digest,ntlm,negotiate", |
| 535 false /* don't sync pref */); |
| 535 local_state->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, | 536 local_state->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, |
| 536 false); | 537 false, |
| 537 local_state->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); | 538 false /* don't sync pref */); |
| 538 local_state->RegisterStringPref(prefs::kAuthServerWhitelist, ""); | 539 local_state->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, |
| 539 local_state->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, ""); | 540 false, |
| 540 local_state->RegisterStringPref(prefs::kGSSAPILibraryName, ""); | 541 false /* don't sync pref */); |
| 541 local_state->RegisterBooleanPref(prefs::kEnableReferrers, true); | 542 local_state->RegisterStringPref(prefs::kAuthServerWhitelist, |
| 543 "", |
| 544 false /* don't sync pref */); |
| 545 local_state->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, |
| 546 "", |
| 547 false /* don't sync pref */); |
| 548 local_state->RegisterStringPref(prefs::kGSSAPILibraryName, |
| 549 "", |
| 550 false /* don't sync pref */); |
| 551 local_state->RegisterBooleanPref(prefs::kEnableReferrers, |
| 552 true, |
| 553 false /* don't sync pref */); |
| 542 } | 554 } |
| 543 | 555 |
| 544 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( | 556 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( |
| 545 net::HostResolver* resolver) { | 557 net::HostResolver* resolver) { |
| 546 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL; | 558 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL; |
| 547 if (!auth_server_whitelist_.empty()) { | 559 if (!auth_server_whitelist_.empty()) { |
| 548 auth_filter_default_credentials = | 560 auth_filter_default_credentials = |
| 549 new net::HttpAuthFilterWhitelist(auth_server_whitelist_); | 561 new net::HttpAuthFilterWhitelist(auth_server_whitelist_); |
| 550 } | 562 } |
| 551 net::HttpAuthFilterWhitelist* auth_filter_delegate = NULL; | 563 net::HttpAuthFilterWhitelist* auth_filter_delegate = NULL; |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 649 system_params.network_delegate = globals_->system_network_delegate.get(); | 661 system_params.network_delegate = globals_->system_network_delegate.get(); |
| 650 system_params.net_log = net_log_; | 662 system_params.net_log = net_log_; |
| 651 globals_->system_http_transaction_factory.reset( | 663 globals_->system_http_transaction_factory.reset( |
| 652 new net::HttpNetworkLayer( | 664 new net::HttpNetworkLayer( |
| 653 new net::HttpNetworkSession(system_params))); | 665 new net::HttpNetworkSession(system_params))); |
| 654 globals_->system_ftp_transaction_factory.reset( | 666 globals_->system_ftp_transaction_factory.reset( |
| 655 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 667 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
| 656 globals_->system_request_context = | 668 globals_->system_request_context = |
| 657 ConstructSystemRequestContext(globals_, net_log_); | 669 ConstructSystemRequestContext(globals_, net_log_); |
| 658 } | 670 } |
| OLD | NEW |