Add ResourceRequestInfo.

content/browser/ssl/ssl_error_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 "content/browser/ssl/ssl_error_handler.h"
 
 #include "base/bind.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
-#include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
+#include "content/browser/renderer_host/resource_request_info_impl.h"
 #include "content/browser/ssl/ssl_cert_error_handler.h"
 #include "content/browser/tab_contents/navigation_controller_impl.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request.h"
 
 using content::BrowserThread;
 using content::RenderViewHostImpl;
+using content::ResourceRequestInfoImpl;
 using content::WebContents;
 
 SSLErrorHandler::SSLErrorHandler(ResourceDispatcherHost* rdh,
                                  net::URLRequest* request,
                                  ResourceType::Type resource_type)
     : manager_(NULL),
       request_id_(0, 0),
       resource_dispatcher_host_(rdh),
       request_url_(request->url()),
       resource_type_(resource_type),
       request_has_been_notified_(false) {
   DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  ResourceDispatcherHostRequestInfo* info =
+  ResourceRequestInfoImpl* info =
       ResourceDispatcherHost::InfoForRequest(request);
-  request_id_.child_id = info->child_id();
-  request_id_.request_id = info->request_id();
+  request_id_.child_id = info->GetChildID();
+  request_id_.request_id = info->GetRequestID();
 
-  if (!ResourceDispatcherHost::RenderViewForRequest(request,
-                                                    &render_process_id_,
-                                                    &render_view_id_))
+  if (!info->GetAssociatedRenderView(&render_process_id_, &render_view_id_))
     NOTREACHED();
 
   // This makes sure we don't disappear on the IO thread until we've given an
   // answer to the net::URLRequest.
   //
   // Release in CompleteCancelRequest, CompleteContinueRequest, or
   // CompleteTakeNoAction.
   AddRef();
 }
 
@@ skipping 133 matching lines @@
   // already have been deleted.
   DCHECK(!request_has_been_notified_);
   if (request_has_been_notified_)
     return;
 
   request_has_been_notified_ = true;
 
   // We're done with this object on the IO thread.
   Release();
 }