Send certificates to devtools when it's open instead of using certId

content/browser/devtools/protocol/network_handler.cc

Index: content/browser/devtools/protocol/network_handler.cc
diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc
index 34f0552a5cbf1b289d4911902e901983f3ee13a7..6d0eec3ba8ad306dd54c07e85d1a15fc8314148a 100644
--- a/content/browser/devtools/protocol/network_handler.cc
+++ b/content/browser/devtools/protocol/network_handler.cc
@@ -20,7 +20,6 @@
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/content_client.h"
 #include "net/cert/x509_cert_types.h"

[pfeldman, 2016/09/06 17:50:11]

I guess those are no longer needed.

[jam, 2016/09/06 18:00:34]

Done.

 #include "net/cert/x509_certificate.h"
@@ -410,52 +409,6 @@ Response NetworkHandler::EmulateNetworkConditions(
   return Response::FallThrough();
 }
 
-Response NetworkHandler::GetCertificateDetails(
-    int certificate_id,
-    scoped_refptr<CertificateDetails>* result) {
-  scoped_refptr<net::X509Certificate> cert;
-  content::CertStore* cert_store = CertStore::GetInstance();
-  cert_store->RetrieveCert(certificate_id, &cert);
-  if (!cert.get())
-    return Response::InvalidParams("certificateId");
-
-  std::string name(cert->subject().GetDisplayName());
-  std::string issuer(cert->issuer().GetDisplayName());
-  base::Time valid_from = cert->valid_start();
-  base::Time valid_to = cert->valid_expiry();
-
-  std::vector<std::string> dns_names;
-  std::vector<std::string> ip_addrs;
-  cert->GetSubjectAltName(&dns_names, &ip_addrs);
-
-  // IP addresses are in raw network bytes and must be converted to string form
-  std::vector<std::string> ip_addrs_string;
-  for (const std::string& ip : ip_addrs) {
-    net::IPAddress ip_addr(reinterpret_cast<const uint8_t*>(ip.c_str()),
-                           ip.length());
-    ip_addrs_string.push_back(ip_addr.ToString());
-  }
-
-  *result = CertificateDetails::Create()
-                ->set_subject(CertificateSubject::Create()
-                                  ->set_name(name)
-                                  ->set_san_dns_names(dns_names)
-                                  ->set_san_ip_addresses(ip_addrs_string))
-                ->set_issuer(issuer)
-                ->set_valid_from(valid_from.ToDoubleT())
-                ->set_valid_to(valid_to.ToDoubleT());
-  return Response::OK();
-}
-
-Response NetworkHandler::ShowCertificateViewer(int certificate_id) {
-  if (!host_)
-    return Response::InternalError("Could not connect to view");
-  WebContents* web_contents = WebContents::FromRenderFrameHost(host_);
-  web_contents->GetDelegate()->ShowCertificateViewerInDevTools(
-      web_contents, certificate_id);
-  return Response::OK();
-}
-
 }  // namespace network
 }  // namespace devtools
 }  // namespace content