1 files changed, 4 insertions, 71 deletions
diff --git a/content/browser/ssl/ssl_client_auth_handler.cc b/content/browser/ssl/ssl_client_auth_handler.cc
index 03db71a..09e07cb 100644
--- a/content/browser/ssl/ssl_client_auth_handler.cc
+++ b/content/browser/ssl/ssl_client_auth_handler.cc
@@ -7,10 +7,8 @@
 #include "base/bind.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
-#include "content/browser/ssl/ssl_client_auth_notification_details.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
-#include "content/public/browser/notification_service.h"
 #include "net/base/x509_certificate.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/url_request/url_request.h"
@@ -58,27 +56,10 @@ void SSLClientAuthHandler::SelectCertificate() {
           render_process_host_id, render_view_host_id));
 }
 
-// Sends an SSL_CLIENT_AUTH_CERT_SELECTED notification and notifies the IO
-// thread that we have selected a cert.
 void SSLClientAuthHandler::CertificateSelected(net::X509Certificate* cert) {
-  VLOG(1) << this << " CertificateSelected " << cert;
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  SSLClientAuthNotificationDetails details(cert_request_info_, this, cert);
-  content::NotificationService* service =
-      content::NotificationService::current();
-  service->Notify(content::NOTIFICATION_SSL_CLIENT_AUTH_CERT_SELECTED,
-                  content::Source<net::HttpNetworkSession>(
-                      http_network_session()),
-                  content::Details<SSLClientAuthNotificationDetails>(&details));
-
-  CertificateSelectedNoNotify(cert);
-}
-
-// Notifies the IO thread that we have selected a cert.
-void SSLClientAuthHandler::CertificateSelectedNoNotify(
-    net::X509Certificate* cert) {
-  VLOG(1) << this << " CertificateSelectedNoNotify " << cert;
+  VLOG(1) << this << " CertificateSelected " << cert;
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
@@ -107,55 +88,7 @@ void SSLClientAuthHandler::DoCertificateSelected(net::X509Certificate* cert) {
 void SSLClientAuthHandler::DoSelectCertificate(
     int render_process_host_id, int render_view_host_id) {
   content::GetContentClient()->browser()->SelectClientCertificate(
-      render_process_host_id, render_view_host_id, this);
-}
-
-SSLClientAuthObserver::SSLClientAuthObserver(
-    net::SSLCertRequestInfo* cert_request_info,
-    SSLClientAuthHandler* handler)
-    : cert_request_info_(cert_request_info), handler_(handler) {
-}
-
-SSLClientAuthObserver::~SSLClientAuthObserver() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-}
-
-void SSLClientAuthObserver::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  VLOG(1) << "SSLClientAuthObserver::Observe " << this << " " << handler_.get();
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(type == content::NOTIFICATION_SSL_CLIENT_AUTH_CERT_SELECTED);
-
-  SSLClientAuthNotificationDetails* auth_details =
-      content::Details<SSLClientAuthNotificationDetails>(details).ptr();
-
-  if (auth_details->IsSameHandler(handler_.get())) {
-    VLOG(1) << "got notification from ourself " << handler_.get();
-    return;
-  }
-
-  if (!auth_details->IsSameHost(cert_request_info_))
-    return;
-
-  VLOG(1) << this << " got matching notification for "
-          << handler_.get() << ", selecting cert "
-          << auth_details->selected_cert();
-  StopObserving();
-  handler_->CertificateSelectedNoNotify(auth_details->selected_cert());
-  OnCertSelectedByNotification();
-}
-
-void SSLClientAuthObserver::StartObserving() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  notification_registrar_.Add(
-      this, content::NOTIFICATION_SSL_CLIENT_AUTH_CERT_SELECTED,
-      content::Source<net::HttpNetworkSession>(
-          handler_->http_network_session()));
-}
-
-void SSLClientAuthObserver::StopObserving() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  notification_registrar_.RemoveAll();
+      render_process_host_id, render_view_host_id, http_network_session_,
+      cert_request_info_,
+      base::Bind(&SSLClientAuthHandler::CertificateSelected, this));
 }