Make safe browsing work in a multi-profile environment.

content/browser/renderer_host/resource_dispatcher_host.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.
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 
 #include <set>
 #include <vector>
@@ skipping 477 matching lines @@
                                            route_id,
                                            this);
   }
 
   // Insert a buffered event handler before the actual one.
   handler = new BufferedResourceHandler(handler, this, request);
 
   if (delegate_) {
     bool sub = request_data.resource_type != ResourceType::MAIN_FRAME;
     handler = delegate_->RequestBeginning(
-        handler, request, sub, child_id, route_id);
+        handler, request, filter_->resource_context(), sub, child_id,
+        route_id);
   }
 
   // Make extra info and read footer (contains request ID).
   ResourceDispatcherHostRequestInfo* extra_info =
       new ResourceDispatcherHostRequestInfo(
           handler,
           process_type,
           child_id,
           route_id,
           request_data.origin_pid,
@@ skipping 195 matching lines @@
       new DownloadResourceHandler(this,
                                   child_id,
                                   route_id,
                                   request_id_,
                                   url,
                                   download_file_manager_.get(),
                                   request,
                                   prompt_for_save_location,
                                   save_info));
 
-  if (delegate_)
-    handler = delegate_->DownloadStarting(handler, child_id, route_id);
+  if (delegate_ && context.safe_browsing_enabled())

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

Isn't the check performed at the delegate too? It isn't the case now, but the
delegate could also take other actions even when safe browsing is disabled.

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

Done.

+    handler = delegate_->DownloadStarting(handler, filter_->resource_context(),
+                                          child_id, route_id);
 
   const net::URLRequestContext* request_context = context.request_context();
 
   if (!request_context->job_factory()->IsHandledURL(url)) {
     VLOG(1) << "Download request for unsupported protocol: "
             << url.possibly_invalid_spec();
     return;
   }
 
   request->set_method("GET");
@@ skipping 1279 matching lines @@
   return HTTP_AUTH_RESOURCE_BLOCKED_CROSS;
 }
 
 bool ResourceDispatcherHost::allow_cross_origin_auth_prompt() {
   return allow_cross_origin_auth_prompt_;
 }
 
 void ResourceDispatcherHost::set_allow_cross_origin_auth_prompt(bool value) {
   allow_cross_origin_auth_prompt_ = value;
 }