chrome/browser/profiles/profile_io_data.cc - Issue 663583006: Remove nss_util dependency from ClientCertStoreChromeOS.

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 663583006: Remove nss_util dependency from ClientCertStoreChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updating OWNERS Created 6 years, 2 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/chromeos/net/client_cert_filter_chromeos.h ('K') | « chrome/browser/chromeos/net/client_cert_filter_chromeos.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | net/ssl/client_cert_store_chromeos.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_io_data.cc

diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc

index 86e148ff0c0a05f623a50467fb9d5de8d8cd4c19..cec5cf298b0d80d0fdb88704290655f304421467 100644

--- a/chrome/browser/profiles/profile_io_data.cc

+++ b/chrome/browser/profiles/profile_io_data.cc

@@ -118,6 +118,7 @@

#include "chrome/browser/chromeos/fileapi/external_file_protocol_handler.h"

#include "chrome/browser/chromeos/login/startup_utils.h"

#include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"

+#include "chrome/browser/chromeos/net/client_cert_filter_chromeos.h"

#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"

#include "chrome/browser/chromeos/policy/policy_cert_service.h"

#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"

@@ -915,8 +916,8 @@ ProfileIOData::ResourceContext::CreateClientCertStore() {

return io_data_->client_cert_store_factory_.Run();

#if defined(OS_CHROMEOS)

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

- io_data_->use_system_key_slot(),

- io_data_->username_hash(),

+ make_scoped_ptr(new chromeos::ClientCertFilterChromeOS(

+ io_data_->use_system_key_slot(), io_data_->username_hash())),

base::Bind(&CreateCryptoModuleBlockingPasswordDelegate,

chrome::kCryptoModulePasswordClientAuth)));

#elif defined(USE_NSS)