Factor out ResourceDispatcherHost dependent code around SSLManager

content/browser/ssl/ssl_manager.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef CONTENT_BROWSER_SSL_SSL_MANAGER_H_
 #define CONTENT_BROWSER_SSL_SSL_MANAGER_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/ssl/ssl_policy_backend.h"
+#include "content/browser/ssl/ssl_error_handler.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/global_request_id.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/net_errors.h"
 
 class LoadFromMemoryCacheDetails;
 class NavigationControllerImpl;
-class ResourceDispatcherHost;
 class ResourceRedirectDetails;
 class ResourceRequestDetails;
 class SSLPolicy;
 
 namespace content {
 class NavigationEntryImpl;
 }
 
 namespace net {
 class SSLInfo;
-class URLRequest;
 }  // namespace net
 
 // The SSLManager SSLManager controls the SSL UI elements in a TabContents.  It
 // listens for various events that influence when these elements should or
 // should not be displayed and adjusts them accordingly.
 //
 // There is one SSLManager per tab.
 // The security state (secure/insecure) is stored in the navigation entry.
 // Along with it are stored any SSL error code and the associated cert.
 
 class SSLManager : public content::NotificationObserver {
  public:
   // Entry point for SSLCertificateErrors.  This function begins the process
   // of resolving a certificate error during an SSL connection.  SSLManager
   // will adjust the security UI and either call |Cancel| or
-  // |ContinueDespiteLastError| on the net::URLRequest.
+  // |ContinueDespiteLastError| on the request associated with |id|.

[wtc, 2012/02/24 00:44:38]

The references to |Cancel| and |ContinueDespiteLastError|
in this comment should be updated to be more general.

[Takashi Toyoshima, 2012/02/28 20:55:43]

Done.

   //
   // Called on the IO thread.
-  static void OnSSLCertificateError(ResourceDispatcherHost* resource_dispatcher,
-                                    net::URLRequest* request,
+  static void OnSSLCertificateError(SSLErrorHandler::Delegate* delegate,
+                                    const content::GlobalRequestID& id,
                                     const net::SSLInfo& ssl_info,
                                     bool fatal);
 
   // Called when SSL state for a host or tab changes.  Broadcasts the
   // SSL_INTERNAL_STATE_CHANGED notification.
   static void NotifySSLInternalStateChanged(
       NavigationControllerImpl* controller);
 
   // Construct an SSLManager for the specified tab.
   // If |delegate| is NULL, SSLPolicy::GetDefaultPolicy() is used.
@@ skipping 46 matching lines @@
   // for the security UI of this tab.
   NavigationControllerImpl* controller_;
 
   // Handles registering notifications with the NotificationService.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLManager);
 };
 
 #endif  // CONTENT_BROWSER_SSL_SSL_MANAGER_H_