Cosmetic cleanups in chrome/browser/policy/

chrome/browser/policy/url_blacklist_manager.h

Index: chrome/browser/policy/url_blacklist_manager.h
diff --git a/chrome/browser/policy/url_blacklist_manager.h b/chrome/browser/policy/url_blacklist_manager.h
index 1717b20ae9140a7037e43d77e1e0ae679e7489cc..aa4553f0ba56c540412349b7677740d7e0946b51 100644
--- a/chrome/browser/policy/url_blacklist_manager.h
+++ b/chrome/browser/policy/url_blacklist_manager.h
@@ -23,16 +23,21 @@ class NotificationDetails;
 class NotificationSource;
 class PrefService;
 
-namespace base {
-class ListValue;
-}
-
 namespace policy {
 
 // Contains a set of filters to block and allow certain URLs, and matches GURLs
 // against this set. The filters are currently kept in memory.
 class URLBlacklist {
  public:
+  // A constant mapped to a scheme that can be filtered.
+  enum SchemeFlag {
+    SCHEME_HTTP   = 1 << 0,
+    SCHEME_HTTPS  = 1 << 1,
+    SCHEME_FTP    = 1 << 2,
+
+    SCHEME_ALL    = (1 << 3) - 1,
+  };
+
   URLBlacklist();
   virtual ~URLBlacklist();
 
@@ -46,15 +51,6 @@ class URLBlacklist {
   // Returns true if the URL is blocked.
   bool IsURLBlocked(const GURL& url) const;
 
-  // A constant mapped to a scheme that can be filtered.
-  enum SchemeFlag {
-    SCHEME_HTTP   = 1 << 0,
-    SCHEME_HTTPS  = 1 << 1,
-    SCHEME_FTP    = 1 << 2,
-
-    SCHEME_ALL    = (1 << 3) - 1,
-  };
-
   // Returns true if |scheme| is a scheme that can be filtered. Returns true
   // and sets |flag| to SCHEME_ALL if |scheme| is empty.
   static bool SchemeToFlag(const std::string& scheme, SchemeFlag* flag);
@@ -71,8 +67,6 @@ class URLBlacklist {
                                  uint16* port,
                                  std::string* path);
  private:
-  void AddFilter(const std::string& filter, bool block);
-
   struct PathFilter {
     explicit PathFilter(const std::string& path, uint16 port, bool match)
         : path_prefix(path),
@@ -91,6 +85,8 @@ class URLBlacklist {
   typedef std::vector<PathFilter> PathFilterList;
   typedef base::hash_map<std::string, PathFilterList*> HostFilterTable;
 
+  void AddFilter(const std::string& filter, bool block);

[pastarmovj, 2011/09/20 13:14:08]

I hope rearranging the functions here was followed by the same rearrange in the
source file.

[Joao da Silva, 2011/09/20 18:51:17]

Done.

+
   HostFilterTable host_filters_;
 
   DISALLOW_COPY_AND_ASSIGN(URLBlacklist);