| Index: content/public/browser/content_browser_client.cc
|
| diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
|
| index 8f3d06c1edb4a140a334f6c7aa6f8b5d4f4ef25e..50bb5c0a4fc0929fe784539caff3121d8aca5fcb 100644
|
| --- a/content/public/browser/content_browser_client.cc
|
| +++ b/content/public/browser/content_browser_client.cc
|
| @@ -5,6 +5,7 @@
|
| #include "content/public/browser/content_browser_client.h"
|
|
|
| #include "base/files/file_path.h"
|
| +#include "content/public/browser/client_certificate_delegate.h"
|
| #include "ui/gfx/image/image_skia.h"
|
| #include "url/gurl.h"
|
|
|
| @@ -177,11 +178,10 @@ QuotaPermissionContext* ContentBrowserClient::CreateQuotaPermissionContext() {
|
| }
|
|
|
| void ContentBrowserClient::SelectClientCertificate(
|
| - int render_process_id,
|
| - int render_frame_id,
|
| + WebContents* web_contents,
|
| net::SSLCertRequestInfo* cert_request_info,
|
| - const base::Callback<void(net::X509Certificate*)>& callback) {
|
| - callback.Run(nullptr);
|
| + scoped_ptr<ClientCertificateDelegate> delegate) {
|
| + delegate->CancelCertificateSelection();
|
| }
|
|
|
| net::URLRequestContext* ContentBrowserClient::OverrideRequestContextForURL(
|
|
|