Refactor SSLClientAuthHandler and certificate selection

chrome/browser/gtk/ssl_client_certificate_selector.cc

 // Copyright (c) 2010 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 "chrome/browser/ssl/ssl_client_auth_handler.h"
+#include "chrome/browser/ssl_client_certificate_selector.h"
 
 #include <cert.h>
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
 #include "base/logging.h"
 #include "base/nss_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/gtk/gtk_util.h"
+#include "chrome/browser/ssl/ssl_client_auth_handler.h"
 #include "chrome/third_party/mozilla_security_manager/nsNSSCertHelper.h"
 #include "chrome/third_party/mozilla_security_manager/nsNSSCertificate.h"
 #include "chrome/third_party/mozilla_security_manager/nsUsageArrayHelper.h"
 #include "gfx/native_widget_types.h"
 #include "grit/generated_resources.h"
 #include "net/base/x509_certificate.h"
 
 // PSM = Mozilla's Personal Security Manager.
 namespace psm = mozilla_security_manager;
 
@@ skipping 22 matching lines @@
                                         const char* nickname);
   static std::string FormatDetailsText(CERTCertificate* cert);
 
   static void OnComboBoxChanged(GtkComboBox* combo_box,
                                 SSLClientCertificateSelector* cert_selector);
   static void OnResponse(GtkDialog* dialog, gint response_id,
                          SSLClientCertificateSelector* cert_selector);
   static void OnDestroy(GtkDialog* dialog,
                         SSLClientCertificateSelector* cert_selector);
 
-  SSLClientAuthHandler* delegate_;
+  scoped_refptr<SSLClientAuthHandler> delegate_;
   scoped_refptr<net::SSLCertRequestInfo> cert_request_info_;
 
   std::vector<std::string> details_strings_;
 
   GtkWidget* dialog_;
   GtkWidget* cert_combo_box_;
   GtkTextBuffer* cert_details_buffer_;
 };
 
 SSLClientCertificateSelector::SSLClientCertificateSelector(
@@ skipping 244 matching lines @@
     GtkDialog* dialog,
     SSLClientCertificateSelector* cert_selector) {
   delete cert_selector;
 }
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // SSLClientAuthHandler platform specific implementation:
 
-void SSLClientAuthHandler::DoSelectCertificate() {
-  // TODO(mattm): Pipe parent gfx::NativeWindow param into here somehow.
-  (new SSLClientCertificateSelector(NULL, cert_request_info_, this))->Show();
+namespace browser {
+
+void ShowSSLClientCertificateSelector(
+    gfx::NativeWindow parent,
+    net::SSLCertRequestInfo* cert_request_info,
+    SSLClientAuthHandler* delegate) {
+  (new SSLClientCertificateSelector(parent,
+                                    cert_request_info,
+                                    delegate))->Show();
 }
+
+}  // namespace browser