Store list information in ListInfo (was: StoreIdAndFIleName)

components/safe_browsing_db/util.h

Index: components/safe_browsing_db/util.h
diff --git a/components/safe_browsing_db/util.h b/components/safe_browsing_db/util.h
index 865e2538c3c09f9cdf0d06e880b6ead9207a6066..0d805a01b2fb9ca9b846f7868ac59df92f59aef6 100644
--- a/components/safe_browsing_db/util.h
+++ b/components/safe_browsing_db/util.h
@@ -16,47 +16,12 @@
 
 #include "base/strings/string_piece.h"
 #include "base/time/time.h"
+#include "components/safe_browsing_db/v4_protocol_manager_util.h"
 
 class GURL;
 
 namespace safe_browsing {
 
-// Different types of threats that SafeBrowsing protects against.
-enum SBThreatType {
-  // No threat at all.
-  SB_THREAT_TYPE_SAFE,
-
-  // The URL is being used for phishing.
-  SB_THREAT_TYPE_URL_PHISHING,
-
-  // The URL hosts malware.
-  SB_THREAT_TYPE_URL_MALWARE,
-
-  // The URL hosts unwanted programs.
-  SB_THREAT_TYPE_URL_UNWANTED,
-
-  // The download URL is malware.
-  SB_THREAT_TYPE_BINARY_MALWARE_URL,
-
-  // Url detected by the client-side phishing model.  Note that unlike the
-  // above values, this does not correspond to a downloaded list.
-  SB_THREAT_TYPE_CLIENT_SIDE_PHISHING_URL,
-
-  // The Chrome extension or app (given by its ID) is malware.
-  SB_THREAT_TYPE_EXTENSION,
-
-  // Url detected by the client-side malware IP list. This IP list is part
-  // of the client side detection model.
-  SB_THREAT_TYPE_CLIENT_SIDE_MALWARE_URL,
-
-  // Url leads to a blacklisted resource script. Note that no warnings should be
-  // shown on this threat type, but an incident report might be sent.
-  SB_THREAT_TYPE_BLACKLISTED_RESOURCE,
-
-  // Url abuses a permission API.
-  SB_THREAT_TYPE_API_ABUSE,
-};
-
 // Metadata that indicates what kind of URL match this is.
 enum class ThreatPatternType {
   NONE = 0,                        // Pattern type didn't appear in the metadata