commit 21163ec85fc3ce85b2f022c7510a5caeb626ec7c
author davidben <davidben@chromium.org> Wed Oct 01 23:05:23 2014
committer Commit bot <commit-bot@chromium.org> Wed Oct 01 23:06:35 2014
tree 83b7d8be0265d37dacf6b310c46508e1e77474f4
parent ffacfd8c2841480e1e5775c124b63b351bddca69

Remove GlobalRequestId parameter from SSLErrorHandler::Delegate.

It's unused but for SocketStreamDispatcherHost which only use it to insert
a socket_id, so it's not even a child_id/request_id pair. Rewrite
SocketStreamDispatcherHost to make the SocketStreamHost the
SSLErrorHandler::Delegate and remove the now unused parameter.

BUG=376003

Review URL: https://codereview.chromium.org/593213002

Cr-Commit-Position: refs/heads/master@{#297733}

content/browser/loader/resource_loader.cc

diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index 863c592..3d63630 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -291,7 +291,6 @@
 
   SSLManager::OnSSLCertificateError(
       weak_ptr_factory_.GetWeakPtr(),
-      info->GetGlobalRequestID(),
       info->GetResourceType(),
       request_->url(),
       render_process_id,
@@ -386,8 +385,7 @@
   }
 }
 
-void ResourceLoader::CancelSSLRequest(const GlobalRequestID& id,
-                                      int error,
+void ResourceLoader::CancelSSLRequest(int error,
                                       const net::SSLInfo* ssl_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
@@ -404,7 +402,7 @@
   }
 }
 
-void ResourceLoader::ContinueSSLRequest(const GlobalRequestID& id) {
+void ResourceLoader::ContinueSSLRequest() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   DVLOG(1) << "ContinueSSLRequest() url: " << request_->url().spec();