summaryrefslogtreecommitdiffstats
path: root/content/browser/loader/resource_loader_unittest.cc
diff options
context:
space:
mode:
authorrobliao <robliao@chromium.org>2014-11-26 10:01:50 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-26 18:02:22 +0000
commite9651b35346a242b6e167e8eaa7c43b76897ddca (patch)
tree15da447dd08d0c4c3cbf797311859b3ff5a7cf1b /content/browser/loader/resource_loader_unittest.cc
parent53ea14eaff0ff06bb2c94a51ece83689c0cc7b40 (diff)
downloadchromium_src-e9651b35346a242b6e167e8eaa7c43b76897ddca.zip
chromium_src-e9651b35346a242b6e167e8eaa7c43b76897ddca.tar.gz
chromium_src-e9651b35346a242b6e167e8eaa7c43b76897ddca.tar.bz2
Revert of Revert of "Remove SSLClientAuthHandler's RDH dependency." (https://codereview.chromium.org/59687300… (patchset #2 id:20001 of https://codereview.chromium.org/755933002/)
Reason for revert: Leak in SSLUITestWithClientCert.TestWSSClientCert http://build.chromium.org/p/chromium.memory/builders/Linux%20Chromium%20OS%20ASan%20LSan%20Tests%20%281%29/builds/4654/steps/browser_tests/logs/TestWSSClientCert First reported leak: Indirect leak of 104 byte(s) in 1 object(s) allocated from: #0 0x57659b in operator new(unsigned long) (/tmp/run_tha_test0QXqvt/out/Release/browser_tests+0x57659b) #1 0x2c7762d in ProfileIOData::ResourceContext::CreateClientCertStore() chrome/browser/profiles/profile_io_data.cc:920:7 #2 0x6c908bd in content::ResourceLoader::OnCertificateRequested(net::URLRequest*, net::SSLCertRequestInfo*) content/browser/loader/resource_loader.cc:298:7 #3 0x3e3e15f in net::URLRequest::NotifyCertificateRequested(net::SSLCertRequestInfo*) net/url_request/url_request.cc:1109:5 #4 0x405ea0d in net::URLRequestHttpJob::OnStartCompleted(int) net/url_request/url_request_http_job.cc:925:5 #5 0x3ccd86c in Run base/callback.h:396:12 #6 0x3ccd86c in net::HttpCache::Transaction::DoCallback(int) net/http/http_cache_transaction.cc:710 #7 0x3cca160 in HandleResult net/http/http_cache_transaction.cc:716:5 #8 0x3cca160 in net::HttpCache::Transaction::DoLoop(int) net/http/http_cache_transaction.cc:977 #9 0x3cc7a68 in net::HttpCache::Transaction::OnIOComplete(int) net/http/http_cache_transaction.cc:2934:3 #10 0xc78765a in Run base/callback.h:396:12 #11 0xc78765a in DevToolsNetworkTransaction::OnCallback(int) chrome/browser/devtools/devtools_network_transaction.cc:73 #12 0x3ceab0c in Run base/callback.h:396:12 #13 0x3ceab0c in DoCallback net/http/http_network_transaction.cc:577 #14 0x3ceab0c in net::HttpNetworkTransaction::OnIOComplete(int) net/http/http_network_transaction.cc:594 #15 0x394b58f in Run base/callback.h:396:12 #16 0x394b58f in base::debug::TaskAnnotator::RunTask(char const*, char const*, base::PendingTask const&) base/debug/task_annotator.cc:63 #17 0x388dd3c in base::MessageLoop::RunTask(base::PendingTask const&) base/message_loop/message_loop.cc:448:3 #18 0x388e49b in base::MessageLoop::DeferOrRunPendingTask(base::PendingTask const&) base/message_loop/message_loop.cc:458:5 #19 0x388ef57 in base::MessageLoop::DoWork() base/message_loop/message_loop.cc:567:13 #20 0x3932db7 in base::MessagePumpLibevent::Run(base::MessagePump::Delegate*) base/message_loop/message_pump_libevent.cc:232:21 #21 0x38c0c1c in base::RunLoop::Run() base/run_loop.cc:55:3 #22 0x388c843 in base::MessageLoop::Run() base/message_loop/message_loop.cc:310:3 #23 0x6af33c1 in content::BrowserThreadImpl::IOThreadRun(base::MessageLoop*) content/browser/browser_thread_impl.cc:218:3 #24 0x6af375e in content::BrowserThreadImpl::Run(base::MessageLoop*) content/browser/browser_thread_impl.cc:253:14 #25 0x390cec1 in base::Thread::ThreadMain() base/threading/thread.cc:228:5 #26 0x3901e17 in base::(anonymous namespace)::ThreadFunc(void*) base/threading/platform_thread_posix.cc:80:3 #27 0x7f99b0016e99 in start_thread /build/buildd/eglibc-2.15/nptl/pthread_create.c:308 Original issue's description: > Revert of "Remove SSLClientAuthHandler's RDH dependency." (https://codereview.chromium.org/596873002) > > Reason for revert: > Causes browser crash if URL request is cancelled during client cert loading. > > BUG=422765, 427844, 376003 > TBR=davidben@chromium.org > > Committed: https://crrev.com/e18bf1d9005b08bba3637b16d744245e5467af0e > Cr-Commit-Position: refs/heads/master@{#305707} TBR=pneubeck@chromium.org,davidben@chromium.org,mattm@chromium.org NOTREECHECKS=true NOTRY=true BUG=422765, 427844, 376003 Review URL: https://codereview.chromium.org/750633005 Cr-Commit-Position: refs/heads/master@{#305828}
Diffstat (limited to 'content/browser/loader/resource_loader_unittest.cc')
-rw-r--r--content/browser/loader/resource_loader_unittest.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc
index 8910dec..2af4ffc 100644
--- a/content/browser/loader/resource_loader_unittest.cc
+++ b/content/browser/loader/resource_loader_unittest.cc
@@ -231,7 +231,6 @@ class SelectCertificateBrowserClient : public TestContentBrowserClient {
void SelectClientCertificate(
int render_process_id,
int render_view_id,
- const net::HttpNetworkSession* network_session,
net::SSLCertRequestInfo* cert_request_info,
const base::Callback<void(net::X509Certificate*)>& callback) override {
++call_count_;