Get rid of TabContentsSSLHelper dependency from content.

Review URL: http://codereview.chromium.org/7037020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85786 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 0 insertions, 123 deletions

diff --git a/content/browser/DEPS b/content/browser/DEPS
index 67dba860..616c5d1 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -84,7 +84,6 @@ include_rules = [
   "+chrome/browser/ssl/ssl_add_cert_handler.h",

   "+chrome/browser/ssl/ssl_client_auth_handler.h",

   "+chrome/browser/ssl/ssl_manager.h",

-  "+chrome/browser/tab_contents/tab_contents_ssl_helper.h",

 

   # http://crbug.com/76792

   "+chrome/browser/tab_contents/infobar_delegate.h",

diff --git a/content/browser/renderer_host/render_view_host_delegate.cc b/content/browser/renderer_host/render_view_host_delegate.cc
index c2fcd8a..da831b2 100644
--- a/content/browser/renderer_host/render_view_host_delegate.cc
+++ b/content/browser/renderer_host/render_view_host_delegate.cc
@@ -25,11 +25,6 @@ RenderViewHostDelegate::GetBookmarkDragDelegate() {
   return NULL;
 }
 
-RenderViewHostDelegate::SSL*
-RenderViewHostDelegate::GetSSLDelegate() {
-  return NULL;
-}
-
 bool RenderViewHostDelegate::OnMessageReceived(const IPC::Message& message) {
   return false;
 }
diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h
index 365c679..7a62fbc 100644
--- a/content/browser/renderer_host/render_view_host_delegate.h
+++ b/content/browser/renderer_host/render_view_host_delegate.h
@@ -37,8 +37,6 @@ class RenderViewHost;
 class ResourceRedirectDetails;
 class ResourceRequestDetails;
 class SkBitmap;
-class SSLClientAuthHandler;
-class SSLAddCertHandler;
 class TabContents;
 struct ViewHostMsg_CreateWindow_Params;
 struct ViewHostMsg_FrameNavigate_Params;
@@ -251,47 +249,6 @@ class RenderViewHostDelegate : public IPC::Channel::Listener {
     virtual ~BookmarkDrag() {}
   };
 
-  // SSL -----------------------------------------------------------------------
-  // Interface for UI and other RenderViewHost-specific interactions with SSL.
-
-  class SSL {
-   public:
-    // Displays a dialog to select client certificates from |request_info|,
-    // returning them to |handler|.
-    virtual void ShowClientCertificateRequestDialog(
-        scoped_refptr<SSLClientAuthHandler> handler) = 0;
-
-    // Called when |handler| encounters an error in verifying a
-    // received client certificate. Note that, because CAs often will
-    // not send us intermediate certificates, the verification we can
-    // do is minimal: we verify the certificate is parseable, that we
-    // have the corresponding private key, and that the certificate
-    // has not expired.
-    virtual void OnVerifyClientCertificateError(
-        scoped_refptr<SSLAddCertHandler> handler, int error_code) = 0;
-
-    // Called when |handler| requests the user's confirmation in adding a
-    // client certificate.
-    virtual void AskToAddClientCertificate(
-        scoped_refptr<SSLAddCertHandler> handler) = 0;
-
-    // Called when |handler| successfully adds a client certificate.
-    virtual void OnAddClientCertificateSuccess(
-        scoped_refptr<SSLAddCertHandler> handler) = 0;
-
-    // Called when |handler| encounters an error adding a client certificate.
-    virtual void OnAddClientCertificateError(
-        scoped_refptr<SSLAddCertHandler> handler, int error_code) = 0;
-
-    // Called when |handler| has completed, so the delegate may release any
-    // state accumulated.
-    virtual void OnAddClientCertificateFinished(
-        scoped_refptr<SSLAddCertHandler> handler) = 0;
-
-   protected:
-    virtual ~SSL() {}
-  };
-
   // ---------------------------------------------------------------------------
 
   // Returns the current delegate associated with a feature. May return NULL if
@@ -300,7 +257,6 @@ class RenderViewHostDelegate : public IPC::Channel::Listener {
   virtual RendererManagement* GetRendererManagementDelegate();
 
   virtual BookmarkDrag* GetBookmarkDragDelegate();
-  virtual SSL* GetSSLDelegate();
 
   // IPC::Channel::Listener implementation.
   // This is used to give the delegate a chance to filter IPC messages.
diff --git a/content/browser/renderer_host/render_view_host_notification_task.h b/content/browser/renderer_host/render_view_host_notification_task.h
index c5e79da..d30c28b 100644
--- a/content/browser/renderer_host/render_view_host_notification_task.h
+++ b/content/browser/renderer_host/render_view_host_notification_task.h
@@ -96,32 +96,6 @@ inline void CallRenderViewHostRendererManagementDelegateHelper(
               params));
 }
 
-// For proxying calls to RenderViewHostDelegate::SSL
-
-class RenderViewHostToSSLDelegate {
- public:
-  typedef RenderViewHostDelegate::SSL MappedType;
-  static MappedType* Map(RenderViewHost* rvh) {
-    return rvh ? rvh->delegate()->GetSSLDelegate() : NULL;
-  }
-};
-
-template <typename Method, typename Params>
-inline void CallRenderViewHostSSLDelegateHelper(
-    int render_process_id,
-    int render_view_id,
-    Method method,
-    const Params& params) {
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      new RenderViewHostNotificationTask<
-          Method, Params, RenderViewHostToSSLDelegate>(
-              render_process_id,
-              render_view_id,
-              method,
-              params));
-}
-
 }  // namespace internal
 
 // ----------------------------------------------------------------------------
@@ -200,33 +174,5 @@ inline void CallRenderViewHostRendererManagementDelegate(int render_process_id,
 }
 
 // ----------------------------------------------------------------------------
-// Proxy calls to the specified RenderViewHost's SSL delegate.
-
-template <typename Method, typename A>
-inline void CallRenderViewHostSSLDelegate(int render_process_id,
-                                          int render_view_id,
-                                          Method method,
-                                          const A& a) {
-  internal::CallRenderViewHostSSLDelegateHelper(
-      render_process_id,
-      render_view_id,
-      method,
-      MakeTuple(a));
-}
-
-template <typename Method, typename A, typename B>
-inline void CallRenderViewHostSSLDelegate(int render_process_id,
-                                          int render_view_id,
-                                          Method method,
-                                          const A& a,
-                                          const B& b) {
-  internal::CallRenderViewHostSSLDelegateHelper(
-      render_process_id,
-      render_view_id,
-      method,
-      MakeTuple(a, b));
-}
-
-// ----------------------------------------------------------------------------
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_NOTIFICATION_TASK_H_
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 6d54d43..c4e571b 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -27,7 +27,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
 #include "chrome/browser/renderer_preferences_util.h"
-#include "chrome/browser/tab_contents/tab_contents_ssl_helper.h"
 #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/common/chrome_constants.h"
@@ -368,12 +367,6 @@ bool TabContents::HostsExtension() const {
   return GetURL().SchemeIs(chrome::kExtensionScheme);
 }
 
-TabContentsSSLHelper* TabContents::GetSSLHelper() {
-  if (ssl_helper_.get() == NULL)
-    ssl_helper_.reset(new TabContentsSSLHelper(this));
-  return ssl_helper_.get();
-}
-
 RenderProcessHost* TabContents::GetRenderProcessHost() const {
   return render_manager_.current_host()->process();
 }
@@ -1359,10 +1352,6 @@ TabContents::GetRendererManagementDelegate() {
   return &render_manager_;
 }
 
-RenderViewHostDelegate::SSL* TabContents::GetSSLDelegate() {
-  return GetSSLHelper();
-}
-
 RenderViewHostDelegate::BookmarkDrag* TabContents::GetBookmarkDragDelegate() {
   return bookmark_drag_;
 }
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index d3d472e..5a3f5fd 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -53,7 +53,6 @@ class SiteInstance;
 class SkBitmap;
 class TabContentsDelegate;
 class TabContentsObserver;
-class TabContentsSSLHelper;
 class TabContentsView;
 struct ThumbnailScore;
 class URLPattern;
@@ -119,9 +118,6 @@ class TabContents : public PageNavigator,
   // Returns true if contains content rendered by an extension.
   bool HostsExtension() const;
 
-  // Returns the TabContentsSSLHelper, creating it if necessary.
-  TabContentsSSLHelper* GetSSLHelper();
-
   // Return the currently active RenderProcessHost and RenderViewHost. Each of
   // these may change over time.
   RenderProcessHost* GetRenderProcessHost() const;
@@ -677,7 +673,6 @@ class TabContents : public PageNavigator,
   virtual RenderViewHostDelegate::View* GetViewDelegate();
   virtual RenderViewHostDelegate::RendererManagement*
       GetRendererManagementDelegate();
-  virtual RenderViewHostDelegate::SSL* GetSSLDelegate();
   virtual TabContents* GetAsTabContents();
   virtual ViewType::Type GetRenderViewType() const;
   virtual int GetBrowserWindowID() const;
@@ -811,9 +806,6 @@ class TabContents : public PageNavigator,
   // Registers and unregisters for pref notifications.
   PrefChangeRegistrar pref_change_registrar_;
 
-  // TabContentsSSLHelper, lazily created.
-  scoped_ptr<TabContentsSSLHelper> ssl_helper_;
-
   // Handles drag and drop event forwarding to extensions.
   BookmarkDrag* bookmark_drag_;