Small modifications to safebrowsing code to make it simpler to add the extension

chrome/browser/safe_browsing/safe_browsing_util.h

 // Copyright (c) 2012 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.
 //
 // Utilities for the SafeBrowsing code.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_UTIL_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_UTIL_H_
 
 #include <cstring>
 #include <deque>
+#include <set>

[Scott Hess - ex-Googler, 2013/01/11 23:44:05]

Is set used in this header?

[not at google - send to devlin, 2013/01/14 23:00:55]

Done.

 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "chrome/browser/safe_browsing/chunk_range.h"
 
 class GURL;
 
 class SBEntry;
 
@@ skipping 273 matching lines @@
   BINURL = 2,
   BINHASH = 3,
   CSDWHITELIST = 4,
   // SafeBrowsing lists are stored in pairs.  Keep ListType 5
   // available for a potential second list that we would store in the
   // csd-whitelist store file.
   DOWNLOADWHITELIST = 6,
 };
 
 // Maps a list name to ListType.
-int GetListId(const std::string& name);
+ListType GetListId(const std::string& name);
+
 // Maps a ListId to list name. Return false if fails.
-bool GetListName(int list_id, std::string* list);
-
+bool GetListName(ListType list_id, std::string* list);
 
 // Canonicalizes url as per Google Safe Browsing Specification.
 // See section 6.1 in
 // http://code.google.com/p/google-safe-browsing/wiki/Protocolv2Spec.
 void CanonicalizeUrl(const GURL& url, std::string* canonicalized_hostname,
                      std::string* canonicalized_path,
                      std::string* canonicalized_query);
 
 // Given a URL, returns all the hosts we need to check.  They are returned
 // in order of size (i.e. b.c is first, then a.b.c).
@@ skipping 16 matching lines @@
 
 bool IsPhishingList(const std::string& list_name);
 bool IsMalwareList(const std::string& list_name);
 bool IsBadbinurlList(const std::string& list_name);
 bool IsBadbinhashList(const std::string& list_name);
 
 GURL GeneratePhishingReportUrl(const std::string& report_page,
                                const std::string& url_to_report,
                                bool is_client_side_detection);
 
-void StringToSBFullHash(const std::string& hash_in, SBFullHash* hash_out);
+SBFullHash StringToSBFullHash(const std::string& hash_in);
 std::string SBFullHashToString(const SBFullHash& hash_out);
+
 }  // namespace safe_browsing_util
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_UTIL_H_