Make safe browsing work in a multi-profile environment.

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

 // Copyright (c) 2011 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/renderer_host/chrome_resource_dispatcher_host_delegate.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
 #include "chrome/browser/net/load_timing_observer.h"
@@ skipping 69 matching lines @@
         prerender::FINAL_STATUS_INVALID_HTTP_METHOD);
     return false;
   }
 
   return true;
 }
 
 ResourceHandler* ChromeResourceDispatcherHostDelegate::RequestBeginning(
     ResourceHandler* handler,
     net::URLRequest* request,
+    const content::ResourceContext& resource_context,
     bool is_subresource,
     int child_id,
     int route_id) {
   if (prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id))
     request->set_load_flags(request->load_flags() | net::LOAD_PRERENDERING);
 
   // Insert safe browsing at the front of the chain, so it gets to decide
   // on policies first.
-  if (safe_browsing_->enabled()) {
+  if (resource_context.safe_browsing_enabled()) {
     handler = CreateSafeBrowsingResourceHandler(
         handler, child_id, route_id, is_subresource);
   }
 
 #if defined(OS_CHROMEOS)
   // We check offline first, then check safe browsing so that we still can block
   // unsafe site after we remove offline page.
   handler = new OfflineResourceHandler(
       handler, child_id, route_id, resource_dispatcher_host_, request);
 #endif
   return handler;
 }
 
 ResourceHandler* ChromeResourceDispatcherHostDelegate::DownloadStarting(
     ResourceHandler* handler,
+    const content::ResourceContext& resource_context,
     int child_id,
     int route_id) {
-  if (!safe_browsing_->enabled())
+  if (resource_context.safe_browsing_enabled())

[Joao da Silva, 2011/06/22 13:38:03]

Probably missing a "not" here:
if (!resource_context.safe_browsing_enabled())

[Miranda Callahan, 2011/06/22 16:25:18]

Whoops, oh yes -- thanks!

     return handler;
 
   return CreateSafeBrowsingResourceHandler(handler, child_id, route_id, false);
 }
 
 bool ChromeResourceDispatcherHostDelegate::ShouldDeferStart(
     net::URLRequest* request,
     const content::ResourceContext& resource_context) {
   ResourceDispatcherHostRequestInfo* info =
       resource_dispatcher_host_->InfoForRequest(request);
@@ skipping 74 matching lines @@
 
 void ChromeResourceDispatcherHostDelegate::OnResponseStarted(
     net::URLRequest* request, ResourceResponse* response) {
   LoadTimingObserver::PopulateTimingInfo(request, response);
 }
 
 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected(
     net::URLRequest* request, ResourceResponse* response) {
   LoadTimingObserver::PopulateTimingInfo(request, response);
 }