Switch SSLTabHelper to use WebContentsUserData.

chrome/browser/ssl/ssl_add_cert_handler.cc

Index: chrome/browser/ssl/ssl_add_cert_handler.cc
diff --git a/chrome/browser/ssl/ssl_add_cert_handler.cc b/chrome/browser/ssl/ssl_add_cert_handler.cc
index 07ce962597d09f505f20ecab2ac105145031e8c4..60fe83546db7b7640e4c32f547afd06a8193a101 100644
--- a/chrome/browser/ssl/ssl_add_cert_handler.cc
+++ b/chrome/browser/ssl/ssl_add_cert_handler.cc
@@ -5,9 +5,8 @@
 #include "chrome/browser/ssl/ssl_add_cert_handler.h"
 
 #include "base/bind.h"
-#include "chrome/browser/tab_contents/tab_contents_ssl_helper.h"
+#include "chrome/browser/ssl/ssl_tab_helper.h"
 #include "chrome/browser/tab_contents/tab_util.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
@@ -88,8 +87,8 @@ void SSLAddCertHandler::CallVerifyClientCertificateError(int cert_error) {
   if (!tab)
     return;
 
-  TabContents* tab_contents = TabContents::FromWebContents(tab);
-  tab_contents->ssl_helper()->OnVerifyClientCertificateError(this, cert_error);
+  SSLTabHelper* ssl_tab_helper = SSLTabHelper::FromWebContents(tab);
+  ssl_tab_helper->OnVerifyClientCertificateError(this, cert_error);
 }
 
 void SSLAddCertHandler::CallAddClientCertificate(bool add_cert,
@@ -99,13 +98,13 @@ void SSLAddCertHandler::CallAddClientCertificate(bool add_cert,
   if (!tab)
     return;
 
-  TabContents* tab_contents = TabContents::FromWebContents(tab);
+  SSLTabHelper* ssl_tab_helper = SSLTabHelper::FromWebContents(tab);
   if (add_cert) {
     if (cert_error == net::OK) {
-      tab_contents->ssl_helper()->OnAddClientCertificateSuccess(this);
+      ssl_tab_helper->OnAddClientCertificateSuccess(this);
     } else {
-      tab_contents->ssl_helper()->OnAddClientCertificateError(this, cert_error);
+      ssl_tab_helper->OnAddClientCertificateError(this, cert_error);
     }
   }
-  tab_contents->ssl_helper()->OnAddClientCertificateFinished(this);
+  ssl_tab_helper->OnAddClientCertificateFinished(this);
 }