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

chrome/browser/safe_browsing/safe_browsing_util.h

Index: chrome/browser/safe_browsing/safe_browsing_util.h
diff --git a/chrome/browser/safe_browsing/safe_browsing_util.h b/chrome/browser/safe_browsing/safe_browsing_util.h
index 2c3f975be3512bf0c33a5da0cdfdeedfbb65a4ec..b20de7d3408ab3a629a406cf22ca0dc99839dd67 100644
--- a/chrome/browser/safe_browsing/safe_browsing_util.h
+++ b/chrome/browser/safe_browsing/safe_browsing_util.h
@@ -9,6 +9,7 @@
 
 #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>
 
@@ -302,10 +303,10 @@ enum ListType {
 };
 
 // Maps a list name to ListType.
-int GetListId(const std::string& name);
-// Maps a ListId to list name. Return false if fails.
-bool GetListName(int list_id, std::string* list);
+ListType GetListId(const std::string& name);
 
+// Maps a ListId to list name. Return false if fails.
+bool GetListName(ListType list_id, std::string* list);
 
 // Canonicalizes url as per Google Safe Browsing Specification.
 // See section 6.1 in
@@ -342,8 +343,9 @@ 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_