| 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 99f3793c0157f18618222399755b10c33e6dcb0b..ff66f912d7aed54c85d0a58c95ec2ff1d91e956b 100644
|
| --- a/chrome/browser/profiles/profile_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_io_data.cc
|
| @@ -71,6 +71,8 @@
|
| #include "net/proxy/proxy_config_service_fixed.h"
|
| #include "net/proxy/proxy_script_fetcher_impl.h"
|
| #include "net/proxy/proxy_service.h"
|
| +#include "net/ssl/client_cert_store.h"
|
| +#include "net/ssl/client_cert_store_impl.h"
|
| #include "net/ssl/server_bound_cert_service.h"
|
| #include "net/url_request/data_protocol_handler.h"
|
| #include "net/url_request/file_protocol_handler.h"
|
| @@ -710,6 +712,18 @@ net::URLRequestContext* ProfileIOData::ResourceContext::GetRequestContext() {
|
| return request_context_;
|
| }
|
|
|
| +scoped_ptr<net::ClientCertStore>
|
| +ProfileIOData::ResourceContext::CreateClientCertStore() {
|
| +#if !defined(USE_OPENSSL)
|
| + return scoped_ptr<net::ClientCertStore>(new net::ClientCertStoreImpl());
|
| +#else
|
| + // OpenSSL 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 scoped_ptr<net::ClientCertStore>();
|
| +#endif
|
| +}
|
| +
|
| bool ProfileIOData::ResourceContext::AllowMicAccess(const GURL& origin) {
|
| return AllowContentAccess(origin, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
|
| }
|
|
|