commit c645303c79f837036c90f732de8be5538c0f57b8
author gunsch <gunsch@chromium.org> Thu Mar 12 01:16:28 2015
committer Commit bot <commit-bot@chromium.org> Thu Mar 12 01:17:02 2015
tree ed277c81f4856a6aae7d3094e1a2c5f94b4a5529
parent 9ba1fff0983ed31ddc84444d599be25b56465d5e

Chromecast buildfix: ClientCertificateDelegate changes.

See: https://codereview.chromium.org/859213006/

R=davidben@chromium.org,lcwu@chromium.org
BUG=None

Review URL: https://codereview.chromium.org/999243002

Cr-Commit-Position: refs/heads/master@{#320201}

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 9793e68..4c244c3 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::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 @@
   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 @@
                  base::Unretained(this), requesting_url,
                  web_contents->GetRenderProcessHost()->GetID()),
       base::Bind(&content::ClientCertificateDelegate::ContinueWithCertificate,
-                 delegate.Pass()));
+                 base::Owned(delegate.release())));
 }
 
 net::X509Certificate*