Add support for a module whitelist (goog-whitemodule-digest256) to the safe browsing db

components/safe_browsing_db/util.cc

 // Copyright (c) 2015 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.
 
 #include "components/safe_browsing_db/util.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string_util.h"
@@ skipping 32 matching lines @@
 // Listnames that browser can process.
 const char kMalwareList[] = "goog-malware-shavar";
 const char kPhishingList[] = "goog-phish-shavar";
 const char kBinUrlList[] = "goog-badbinurl-shavar";
 const char kCsdWhiteList[] = "goog-csdwhite-sha256";
 const char kDownloadWhiteList[] = "goog-downloadwhite-digest256";
 const char kExtensionBlacklist[] = "goog-badcrxids-digestvar";
 const char kIPBlacklist[] = "goog-badip-digest256";
 const char kUnwantedUrlList[] = "goog-unwanted-shavar";
 const char kInclusionWhitelist[] = "goog-csdinclusionwhite-sha256";
+const char kModuleWhitelist[] = "goog-whitemodule-sha256";
 
-const char* kAllLists[9] = {
-    kMalwareList,
-    kPhishingList,
-    kBinUrlList,
-    kCsdWhiteList,
-    kDownloadWhiteList,
-    kExtensionBlacklist,
-    kIPBlacklist,
-    kUnwantedUrlList,
-    kInclusionWhitelist,
+const char* kAllLists[10] = {
+    kMalwareList,        kPhishingList,       kBinUrlList,  kCsdWhiteList,

[Nathan Parker, 2016/02/08 02:47:40]

Is this clang-autoformat's work?  I think either that or vertical would be best.

[proberge, 2016/02/08 16:23:59]

Yes, it was autoformat.

+    kDownloadWhiteList,  kExtensionBlacklist, kIPBlacklist, kUnwantedUrlList,
+    kInclusionWhitelist, kModuleWhitelist,
 };
 
 ListType GetListId(const base::StringPiece& name) {
   ListType id;
   if (name == kMalwareList) {
     id = MALWARE;
   } else if (name == kPhishingList) {
     id = PHISH;
   } else if (name == kBinUrlList) {
     id = BINURL;
   } else if (name == kCsdWhiteList) {
     id = CSDWHITELIST;
   } else if (name == kDownloadWhiteList) {
     id = DOWNLOADWHITELIST;
   } else if (name == kExtensionBlacklist) {
     id = EXTENSIONBLACKLIST;
   } else if (name == kIPBlacklist) {
     id = IPBLACKLIST;
   } else if (name == kUnwantedUrlList) {
     id = UNWANTEDURL;
   } else if (name == kInclusionWhitelist) {
     id = INCLUSIONWHITELIST;
+  } else if (name == kModuleWhitelist) {
+    id = MODULEWHITELIST;
   } else {
     id = INVALID;
   }
   return id;
 }
 
 bool GetListName(ListType list_id, std::string* list) {
   switch (list_id) {
     case MALWARE:
       *list = kMalwareList;
@@ skipping 15 matching lines @@
       break;
     case IPBLACKLIST:
       *list = kIPBlacklist;
       break;
     case UNWANTEDURL:
       *list = kUnwantedUrlList;
       break;
     case INCLUSIONWHITELIST:
       *list = kInclusionWhitelist;
       break;
+    case MODULEWHITELIST:
+      *list = kModuleWhitelist;
+      break;
     default:
       return false;
   }
   DCHECK(IsKnownList(*list));
   return true;
 }
 
 
 SBFullHash SBFullHashForString(const base::StringPiece& str) {
   SBFullHash h;
@@ skipping 276 matching lines @@
   GenerateHostsToCheck(url, &hosts);
   GeneratePathsToCheck(url, &paths);
   for (size_t h = 0; h < hosts.size(); ++h) {
     for (size_t p = 0; p < paths.size(); ++p) {
       urls->push_back(hosts[h] + paths[p]);
     }
   }
 }
 
 }  // namespace safe_browsing