chrome/browser/profiles/profile_io_data.cc - Issue 124113003: Remove calls of PrerenderTracker::TryCancel and TryCancelOnIOThread in ChromeResourceDispatcherHost…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 124113003: Remove calls of PrerenderTracker::TryCancel and TryCancelOnIOThread in ChromeResourceDispatcherHost… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: simplify Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/prerender/prerender_browsertest.cc ('K') | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h » ('j') | chrome/browser/ui/login/login_prompt.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_io_data.cc

===================================================================

--- chrome/browser/profiles/profile_io_data.cc (revision 243099)

+++ chrome/browser/profiles/profile_io_data.cc (working copy)

@@ -852,6 +852,8 @@

scoped_ptr<net::ClientCertStore>

ProfileIOData::ResourceContext::CreateClientCertStore() {

+ if (!io_data_->client_cert_store_factory_.is_null())

+ return io_data_->client_cert_store_factory_.Run();

#if defined(OS_CHROMEOS)

return scoped_ptr<net::ClientCertStore>(new net::ClientCertStoreChromeOS(

io_data_->username_hash(),