Blacklist API change for allowing multiple rule matches...

chrome/browser/net/chrome_url_request_context.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.
 
 #include "chrome/browser/net/chrome_url_request_context.h"
 
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/privacy_blacklist/blacklist.h"
@@ skipping 373 matching lines @@
 const std::string& ChromeURLRequestContext::GetUserAgent(
     const GURL& url) const {
   return webkit_glue::GetUserAgent(url);
 }
 
 bool ChromeURLRequestContext::interceptCookie(const URLRequest* request,
                                               std::string* cookie) {
   const URLRequest::UserData* d =
       request->GetUserData((void*)&Blacklist::kRequestDataKey);
   if (d) {
-    const Blacklist::Entry* entry =
-        static_cast<const Blacklist::RequestData*>(d)->entry();
-    if (entry->attributes() & Blacklist::kDontStoreCookies) {
+    const Blacklist::Match* match = static_cast<const Blacklist::Match*>(d);
+    if (match->attributes() & Blacklist::kDontStoreCookies) {
       cookie->clear();
       return false;
     }
-    if (entry->attributes() & Blacklist::kDontPersistCookies) {
+    if (match->attributes() & Blacklist::kDontPersistCookies) {
       *cookie = Blacklist::StripCookieExpiry(*cookie);
     }
   }
   return true;
 }
 
 bool ChromeURLRequestContext::allowSendingCookies(const URLRequest* request)
     const {
   const URLRequest::UserData* d =
       request->GetUserData((void*)&Blacklist::kRequestDataKey);
   if (d) {
-    const Blacklist::Entry* entry =
-      static_cast<const Blacklist::RequestData*>(d)->entry();
-    if (entry->attributes() & Blacklist::kDontSendCookies)
+    const Blacklist::Match* match = static_cast<const Blacklist::Match*>(d);
+    if (match->attributes() & Blacklist::kDontSendCookies)
       return false;
   }
   return true;
 }
 
 void ChromeURLRequestContext::OnAcceptLanguageChange(
     const std::string& accept_language) {
   DCHECK(MessageLoop::current() ==
          ChromeThread::GetMessageLoop(ChromeThread::IO));
   accept_language_ =
@@ skipping 33 matching lines @@
   // Do not delete the cookie store in the case of the media context, as it is
   // owned by the original context.
   if (!is_media_)
     delete cookie_store_;
 
   // Do not delete the proxy service in the case of OTR or media contexts, as
   // it is owned by the original URLRequestContext.
   if (!is_off_the_record_ && !is_media_)
     delete proxy_service_;
 }