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/content_settings/host_content_settings_map.h"
 #include "chrome/browser/external_protocol/external_protocol_handler.h"
@@ skipping 94 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);
 
-#if defined(ENABLE_SAFE_BROWSING)

[mattm, 2011/07/12 21:41:58]

dropped merges

[Miranda Callahan, 2011/07/13 18:13:51]

Done.

   // Insert safe browsing at the front of the chain, so it gets to decide
   // on policies first.
-  if (safe_browsing_->enabled()) {
+  ProfileIOData* io_data = reinterpret_cast<ProfileIOData*>(
+      resource_context.GetUserData(NULL));
+  if (io_data->safe_browsing_enabled()->GetValue()) {
     handler = CreateSafeBrowsingResourceHandler(
         handler, child_id, route_id, is_subresource);
   }
-#endif
 
 #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 defined(ENABLE_SAFE_BROWSING)
-  if (!safe_browsing_->enabled())
+  ProfileIOData* io_data = reinterpret_cast<ProfileIOData*>(
+      resource_context.GetUserData(NULL));
+  if (!io_data->safe_browsing_enabled()->GetValue())
     return handler;
 
   return CreateSafeBrowsingResourceHandler(handler, child_id, route_id, false);
-#else
-  return handler;
-#endif
 }
 
 bool ChromeResourceDispatcherHostDelegate::ShouldDeferStart(
     net::URLRequest* request,
     const content::ResourceContext& resource_context) {
   ResourceDispatcherHostRequestInfo* info =
       resource_dispatcher_host_->InfoForRequest(request);
   return prerender_tracker_->PotentiallyDelayRequestOnIOThread(
       request->url(), resource_context.prerender_manager(),
       info->child_id(), info->route_id(), info->request_id());
@@ skipping 47 matching lines @@
 }
 
 void ChromeResourceDispatcherHostDelegate::HandleExternalProtocol(
     const GURL& url, int child_id, int route_id) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableFunction(
           &ExternalProtocolHandler::LaunchUrl, url, child_id, route_id));
 }
 
-#if defined(ENABLE_SAFE_BROWSING)
 ResourceHandler*
     ChromeResourceDispatcherHostDelegate::CreateSafeBrowsingResourceHandler(
         ResourceHandler* handler, int child_id, int route_id,
         bool subresource) {
   return SafeBrowsingResourceHandler::Create(
       handler, child_id, route_id, subresource, safe_browsing_,
       resource_dispatcher_host_);
 }
-#endif
 
 bool ChromeResourceDispatcherHostDelegate::ShouldForceDownloadResource(
     const GURL& url, const std::string& mime_type) {
   // Special-case user scripts to get downloaded instead of viewed.
   return UserScript::IsURLUserScript(url, mime_type);
 }
 
 void ChromeResourceDispatcherHostDelegate::OnResponseStarted(
     net::URLRequest* request,
     ResourceResponse* response,
@@ skipping 13 matching lines @@
       info->route_id(), request->url(),
       map->GetContentSettings(request->url(), request->url())));
 }
 
 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected(
     net::URLRequest* request,
     ResourceResponse* response,
     ResourceMessageFilter* filter) {
   LoadTimingObserver::PopulateTimingInfo(request, response);
 }