Blacklist API change for allowing multiple rule matches...

chrome/browser/renderer_host/resource_dispatcher_host.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/renderer_host/resource_dispatcher_host.h"
 
 #include <vector>
 
@@ skipping 340 matching lines @@
           route_id,
           request_id,
           status,
           std::string()));  // No security info needed, connection was not
                             // established.
     }
     return;
   }
 
   // Note that context can still be NULL here when running unit tests.
-  const Blacklist::Entry* entry = context && context->blacklist() ?
+  Blacklist::Match* match = context && context->blacklist() ?
       context->blacklist()->findMatch(request_data.url) : NULL;
-  if (entry && entry->IsBlocked(request_data.url)) {
+  if (match && match->IsBlocked(request_data.url)) {
     // TODO(idanan): Send a ResourceResponse to replace the blocked resource.
+    delete match;
     return;
   }
 
   // Ensure the Chrome plugins are loaded, as they may intercept network
   // requests.  Does nothing if they are already loaded.
   // TODO(mpcomplete): This takes 200 ms!  Investigate parallelizing this by
   // starting the load earlier in a BG thread.
   plugin_service_->LoadChromePlugins(this);
 
   // Construct the event handler.
@@ skipping 10 matching lines @@
   }
 
   if (HandleExternalProtocol(request_id, process_id, route_id,
                              request_data.url, request_data.resource_type,
                              handler)) {
     return;
   }
 
   // Construct the request.
   URLRequest* request = new URLRequest(request_data.url, this);
-  if (entry && entry->attributes()) {
-    request->SetUserData((void*)&Blacklist::kRequestDataKey,
-                         new Blacklist::RequestData(entry));
+  if (match) {
+    request->SetUserData((void*)&Blacklist::kRequestDataKey, match);
   }
   request->set_method(request_data.method);
   request->set_first_party_for_cookies(request_data.first_party_for_cookies);
 
-  if (!entry || !(entry->attributes() & Blacklist::kDontSendReferrer))
+  if (!match || !(match->attributes() & Blacklist::kDontSendReferrer))
     request->set_referrer(request_data.referrer.spec());
 
   request->SetExtraRequestHeaders(request_data.headers);
 
   int load_flags = request_data.load_flags;
   // EV certificate verification could be expensive.  We don't want to spend
   // time performing EV certificate verification on all resources because
   // EV status is irrelevant to sub-frames and sub-resources.
   if (request_data.resource_type == ResourceType::MAIN_FRAME)
     load_flags |= net::LOAD_VERIFY_EV_CERT;
@@ skipping 1203 matching lines @@
     case ViewHostMsg_UploadProgress_ACK::ID:
     case ViewHostMsg_SyncLoad::ID:
       return true;
 
     default:
       break;
   }
 
   return false;
 }