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

Unified Diff: chromecast/browser/cast_content_browser_client.cc

Issue 999243002: Chromecast buildfix: ClientCertificateDelegate changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: explicitly continue with no cert on invalid url Created 5 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/browser/cast_content_browser_client.cc
diff --git a/chromecast/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc
index 9793e68b6f0885a7d5025d6f78afd7a83e6cbe08..4c244c300d6b3af2eab9793714d621961c592e06 100644
--- a/chromecast/browser/cast_content_browser_client.cc
+++ b/chromecast/browser/cast_content_browser_client.cc
@@ -32,6 +32,7 @@
#include "content/public/browser/client_certificate_delegate.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/resource_dispatcher_host.h"
+#include "content/public/browser/web_contents.h"
#include "content/public/common/content_descriptors.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/url_constants.h"
@@ -195,7 +196,7 @@ void CastContentBrowserClient::AllowCertificateError(
}
void CastContentBrowserClient::SelectClientCertificate(
- WebContents* web_contents,
+ content::WebContents* web_contents,
net::SSLCertRequestInfo* cert_request_info,
scoped_ptr<content::ClientCertificateDelegate> delegate) {
GURL requesting_url("https://" + cert_request_info->host_and_port.ToString());
@@ -203,7 +204,7 @@ void CastContentBrowserClient::SelectClientCertificate(
if (!requesting_url.is_valid()) {
LOG(ERROR) << "Invalid URL string: "
<< requesting_url.possibly_invalid_spec();
- delegate->SelectClientCertificate(nullptr);
+ delegate->ContinueWithCertificate(nullptr);
return;
}
@@ -223,7 +224,7 @@ void CastContentBrowserClient::SelectClientCertificate(
base::Unretained(this), requesting_url,
web_contents->GetRenderProcessHost()->GetID()),
base::Bind(&content::ClientCertificateDelegate::ContinueWithCertificate,
- delegate.Pass()));
+ base::Owned(delegate.release())));
}
net::X509Certificate*
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698