Also match against the query string if present.

chrome/browser/privacy_blacklist/blacklist.h

Index: chrome/browser/privacy_blacklist/blacklist.h
diff --git a/chrome/browser/privacy_blacklist/blacklist.h b/chrome/browser/privacy_blacklist/blacklist.h
index 2fba5fb6ce58d3172d3ffcab9d2ed3e703a00ede..0f6bf6164155a5bf86969d6b7b03a21838dd1dea 100644
--- a/chrome/browser/privacy_blacklist/blacklist.h
+++ b/chrome/browser/privacy_blacklist/blacklist.h
@@ -173,7 +173,7 @@ class Blacklist {
   // Returns a pointer to a Match structure holding all matching entries.
   // If no matching Entry is found, returns null. Ownership belongs to the
   // caller.
-  Match* findMatch(const GURL&) const;
+  Match* FindMatch(const GURL&) const;
 
   // Helper to remove cookies from a header.
   static std::string StripCookies(const std::string&);
@@ -182,14 +182,17 @@ class Blacklist {
   static std::string StripCookieExpiry(const std::string&);
 
  private:
+  // Converts a GURL into the string to match against.
+  static std::string GetURLAsString(const GURL& url);

[brettw, 2010/01/12 15:53:51]

I'd suggest a name a little more specific. The problem with this name is that it
seems like it just converts the URL to a string, which it doesn't. It's specific
to this component.

Maybe GetURLAsLookupString or maybe ...BlacklistString

[jochen (gone - plz use gerrit), 2010/01/12 16:30:19]

Done.

+
   // Matches a pattern to a core URL which is host/path with all the other
-  // optional parts (scheme, user, password, port) stripped away. Used only
-  // internally but made static so that access can be given to tests.
+  // optional parts (scheme, user, password, port) stripped away.
   static bool Matches(const std::string& pattern, const std::string& url);
 
   EntryList blacklist_;
   ProviderList providers_;
 
+  FRIEND_TEST(BlacklistTest, Generic);
   FRIEND_TEST(BlacklistTest, PatternMatch);
   DISALLOW_COPY_AND_ASSIGN(Blacklist);
 };