Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

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

Issue 2088763004: Remove resource_context.h include from resource_loader.cc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 6 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
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 c057348b366e9d7a41ef0fdf261ca769e18f9883..b320a33ef9bc85aa1c530410c0dbfba60615b137 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -910,6 +910,35 @@ chrome_browser_net::Predictor* ProfileIOData::GetPredictor() {
return nullptr;
}
+std::unique_ptr<net::ClientCertStore> ProfileIOData::CreateClientCertStore() {
+ if (!client_cert_store_factory_.is_null())
+ return client_cert_store_factory_.Run();
+#if defined(OS_CHROMEOS)
+ return std::unique_ptr<net::ClientCertStore>(
+ new chromeos::ClientCertStoreChromeOS(
+ certificate_provider_ ? certificate_provider_->Copy() : nullptr,
+ base::WrapUnique(new chromeos::ClientCertFilterChromeOS(
+ use_system_key_slot_, username_hash_)),
+ base::Bind(&CreateCryptoModuleBlockingPasswordDelegate,
+ chrome::kCryptoModulePasswordClientAuth)));
+#elif defined(USE_NSS_CERTS)
+ return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreNSS(
+ base::Bind(&CreateCryptoModuleBlockingPasswordDelegate,
+ chrome::kCryptoModulePasswordClientAuth)));
+#elif defined(OS_WIN)
+ return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreWin());
+#elif defined(OS_MACOSX)
+ return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreMac());
+#elif defined(OS_ANDROID)
+ // Android does not use the ClientCertStore infrastructure. On Android client
+ // cert matching is done by the OS as part of the call to show the cert
+ // selection dialog.
+ return nullptr;
+#else
+#error Unknown platform.
+#endif
+}
+
void ProfileIOData::set_data_reduction_proxy_io_data(
std::unique_ptr<data_reduction_proxy::DataReductionProxyIOData>
data_reduction_proxy_io_data) const {
@@ -946,38 +975,6 @@ net::URLRequestContext* ProfileIOData::ResourceContext::GetRequestContext() {
return request_context_;
}
-std::unique_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 std::unique_ptr<net::ClientCertStore>(
- new chromeos::ClientCertStoreChromeOS(
- io_data_->certificate_provider_
- ? io_data_->certificate_provider_->Copy()
- : nullptr,
- base::WrapUnique(new chromeos::ClientCertFilterChromeOS(
- io_data_->use_system_key_slot(), io_data_->username_hash())),
- base::Bind(&CreateCryptoModuleBlockingPasswordDelegate,
- chrome::kCryptoModulePasswordClientAuth)));
-#elif defined(USE_NSS_CERTS)
- return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreNSS(
- base::Bind(&CreateCryptoModuleBlockingPasswordDelegate,
- chrome::kCryptoModulePasswordClientAuth)));
-#elif defined(OS_WIN)
- return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreWin());
-#elif defined(OS_MACOSX)
- return std::unique_ptr<net::ClientCertStore>(new net::ClientCertStoreMac());
-#elif defined(OS_ANDROID)
- // Android does not use the ClientCertStore infrastructure. On Android client
- // cert matching is done by the OS as part of the call to show the cert
- // selection dialog.
- return nullptr;
-#else
-#error Unknown platform.
-#endif
-}
-
void ProfileIOData::ResourceContext::CreateKeygenHandler(
uint32_t key_size_in_bits,
const std::string& challenge_string,
« no previous file with comments | « chrome/browser/profiles/profile_io_data.h ('k') | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698