Add ResourceRequestInfo.

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/tab_contents/tab_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "content/browser/renderer_host/resource_dispatcher_host.h"
-#include "content/browser/renderer_host/resource_dispatcher_host_request_info.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;
 
 SSLAddCertHandler::SSLAddCertHandler(net::URLRequest* request,
                                      net::X509Certificate* cert,
                                      int render_process_host_id,
                                      int render_view_id)
     : cert_(cert),
       render_process_host_id_(render_process_host_id),
       render_view_id_(render_view_id) {
-  ResourceDispatcherHostRequestInfo* info =
-      ResourceDispatcherHost::InfoForRequest(request);
-  network_request_id_ = info->request_id();
+  network_request_id_
+      = content::ResourceRequestInfo::ForRequest(request)->GetRequestID();
   // Stay alive until the process completes and Finished() is called.
   AddRef();
   // Delay adding the certificate until the next mainloop iteration.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SSLAddCertHandler::Run, this));
 }
 
 SSLAddCertHandler::~SSLAddCertHandler() {}
 
@@ skipping 69 matching lines @@
       TabContentsWrapper::GetCurrentWrapperForContents(tab);
   if (add_cert) {
     if (cert_error == net::OK) {
       wrapper->ssl_helper()->OnAddClientCertificateSuccess(this);
     } else {
       wrapper->ssl_helper()->OnAddClientCertificateError(this, cert_error);
     }
   }
   wrapper->ssl_helper()->OnAddClientCertificateFinished(this);
 }