Add a WebContents getter callback in ResourceRequestInfo

content/browser/ssl/ssl_policy.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/ssl/ssl_policy.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
@@ skipping 214 matching lines @@
 
 void SSLPolicy::OnCertErrorInternal(SSLCertErrorHandler* handler,
                                     int options_mask) {
   bool overridable = (options_mask & OVERRIDABLE) != 0;
   bool strict_enforcement = (options_mask & STRICT_ENFORCEMENT) != 0;
   bool expired_previous_decision =
       (options_mask & EXPIRED_PREVIOUS_DECISION) != 0;
   CertificateRequestResultType result =
       CERTIFICATE_REQUEST_RESULT_TYPE_CONTINUE;
   GetContentClient()->browser()->AllowCertificateError(
-      handler->render_process_id(),
-      handler->render_frame_id(),
+      handler->web_contents_getter(),

[davidben, 2015/11/19 17:46:13]

Wow, this code is all kinds of silly. This gets called from
SSLPolicy::OnCertError, which gets called from
SSLCertErrorHandler::OnDispatched... which is calling something off of
manager_... which is a per-WebContents object that has a pointer back to the
WebContents through the NavigationControllerImpl!

Not going to ask you to refactor it all here, but probably you can get the
WebContents itself without having to go through the callback.

[davidben, 2015/11/19 17:50:25]

Oh! And even SSLPolicy is a per-WebContents object! Though it doesn't have a
pointer back up. Yeah, this is all totally silly. I'm not sure why there is an
SSLPolicy / SSLManager split, TBH.

[clamy, 2015/11/20 13:50:43]

Done. I now expose the manager from the handler, and we can get the WebContents
through the NavigationController.

       handler->cert_error(),
       handler->ssl_info(),
       handler->request_url(),
       handler->resource_type(),
       overridable,
       strict_enforcement,
       expired_previous_decision,
       base::Bind(&SSLPolicy::OnAllowCertificate,
                  base::Unretained(this),
                  make_scoped_refptr(handler)),
@@ skipping 20 matching lines @@
       entry->GetURL(), entry->GetSSL().cert_id, entry->GetSSL().cert_status);
 }
 
 void SSLPolicy::OriginRanInsecureContent(const std::string& origin, int pid) {
   GURL parsed_origin(origin);
   if (parsed_origin.SchemeIsCryptographic())
     backend_->HostRanInsecureContent(parsed_origin.host(), pid);
 }
 
 }  // namespace content