Switch SSLTabHelper to use WebContentsUserData.

chrome/browser/ssl/ssl_add_cert_handler.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 "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"
 #include "net/base/cert_database.h"
 #include "net/base/net_errors.h"
 #include "net/base/x509_certificate.h"
 #include "net/url_request/url_request.h"
 
 using content::BrowserThread;
 using content::WebContents;
@@ skipping 60 matching lines @@
 
   Release();
 }
 
 void SSLAddCertHandler::CallVerifyClientCertificateError(int cert_error) {
   WebContents* tab = tab_util::GetWebContentsByID(
       render_process_host_id_, render_view_id_);
   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,
                                                  int cert_error) {
   WebContents* tab = tab_util::GetWebContentsByID(
       render_process_host_id_, render_view_id_);
   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);
 }