Add the goog-unwanted-shavar list to a new SafeBrowsing PrefixSet.

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 b6ee9d06081dc00cae01a55564576c0a87309218..de877b041283bd0201336d546c7bf9c637159e78 100644
--- a/chrome/browser/safe_browsing/safe_browsing_util.h
+++ b/chrome/browser/safe_browsing/safe_browsing_util.h
@@ -133,8 +133,8 @@ enum SBThreatType {
   // The URL hosts malware.
   SB_THREAT_TYPE_URL_MALWARE,
 
-  // The URL hosts harmful programs.
-  SB_THREAT_TYPE_URL_HARMFUL,
+  // The URL hosts unwanted programs.
+  SB_THREAT_TYPE_URL_UNWANTED,
 
   // The download URL is malware.
   SB_THREAT_TYPE_BINARY_MALWARE_URL,
@@ -170,9 +170,11 @@ extern const char kExtensionBlacklist[];
 extern const char kSideEffectFreeWhitelist[];
 // SafeBrowsing csd malware IP blacklist name.
 extern const char kIPBlacklist[];
+// SafeBrowsing unwanted URL list.
+extern const char kUnwantedUrlList[];
 
 // This array must contain all Safe Browsing lists.
-extern const char* kAllLists[8];
+extern const char* kAllLists[9];
 
 enum ListType {
   INVALID = -1,
@@ -192,6 +194,8 @@ enum ListType {
   // See above comment. Leave 11 available.
   IPBLACKLIST = 12,
   // See above comment.  Leave 13 available.
+  UNWANTEDURL = 14,
+  // See above comment.  Leave 15 available.
 };
 
 // Maps a list name to ListType.