1 files changed, 9 insertions, 8 deletions
diff --git a/content/browser/renderer_host/async_resource_handler.cc b/content/browser/renderer_host/async_resource_handler.cc
index e31afe0..b73fb29 100644
--- a/content/browser/renderer_host/async_resource_handler.cc
+++ b/content/browser/renderer_host/async_resource_handler.cc
@@ -13,14 +13,14 @@
 #include "base/shared_memory.h"
 #include "content/browser/debugger/devtools_netlog_observer.h"
 #include "content/browser/host_zoom_map_impl.h"
-#include "content/browser/renderer_host/resource_dispatcher_host.h"
+#include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
 #include "content/browser/renderer_host/resource_message_filter.h"
-#include "content/browser/renderer_host/resource_request_info_impl.h"
 #include "content/browser/resource_context_impl.h"
 #include "content/common/resource_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
+#include "content/public/browser/resource_request_info.h"
 #include "content/public/common/resource_response.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
@@ -28,9 +28,8 @@
 #include "webkit/glue/resource_loader_bridge.h"
 
 using base::TimeTicks;
-using content::GlobalRequestID;
-using content::HostZoomMap;
-using content::ResourceRequestInfoImpl;
+
+namespace content {
 
 namespace {
 
@@ -83,10 +82,10 @@ AsyncResourceHandler::AsyncResourceHandler(
     ResourceMessageFilter* filter,
     int routing_id,
     const GURL& url,
-    ResourceDispatcherHost* resource_dispatcher_host)
+    ResourceDispatcherHostImpl* rdh)
     : filter_(filter),
       routing_id_(routing_id),
-      rdh_(resource_dispatcher_host),
+      rdh_(rdh),
       next_buffer_size_(kInitialReadBufSize),
       url_(url) {
 }
@@ -139,7 +138,7 @@ bool AsyncResourceHandler::OnResponseStarted(
   content::HostZoomMap* host_zoom_map =
       content::GetHostZoomMapForResourceContext(resource_context);
 
-  ResourceRequestInfoImpl* info = rdh_->InfoForRequest(request);
+  const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
   if (info->GetResourceType() == ResourceType::MAIN_FRAME && host_zoom_map) {
     GURL request_url(request->url());
     filter_->Send(new ViewMsg_SetZoomLevelForLoadingURL(
@@ -286,3 +285,5 @@ void AsyncResourceHandler::GlobalCleanup() {
     tmp->Release();
   }
 }
+
+}  // namespace content