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

chrome/browser/safe_browsing/safe_browsing_util.cc

 // 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.
 
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/google/google_util.h"
@@ skipping 146 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";
 // We don't use the bad binary digest list anymore.  Use a fake listname to be
 // sure we don't request it accidentally.
 const char kBinHashList[] = "goog-badbin-digestvar-disabled";
 const char kCsdWhiteList[] = "goog-csdwhite-sha256";
 const char kDownloadWhiteList[] = "goog-downloadwhite-digest256";
 
-int GetListId(const std::string& name) {
-  int id;
+ListType GetListId(const std::string& name) {
+  ListType id;
   if (name == safe_browsing_util::kMalwareList) {
     id = MALWARE;
   } else if (name == safe_browsing_util::kPhishingList) {
     id = PHISH;
   } else if (name == safe_browsing_util::kBinUrlList) {
     id = BINURL;
   } else if (name == safe_browsing_util::kBinHashList) {
     id = BINHASH;
   } else if (name == safe_browsing_util::kCsdWhiteList) {
     id = CSDWHITELIST;
   } else if (name == safe_browsing_util::kDownloadWhiteList) {
     id = DOWNLOADWHITELIST;
   } else {
     id = INVALID;
   }
   return id;
 }
 
-bool GetListName(int list_id, std::string* list) {
+bool GetListName(ListType list_id, std::string* list) {
   switch (list_id) {
     case MALWARE:
       *list = safe_browsing_util::kMalwareList;
       break;
     case PHISH:
       *list = safe_browsing_util::kPhishingList;
       break;
     case BINURL:
       *list = safe_browsing_util::kBinUrlList;
       break;
@@ skipping 285 matching lines @@
 #endif
   if (is_client_side_detection)
     client_name.append("_csd");
 
   GURL report_url(report_page + base::StringPrintf(kReportParams,
                                                    client_name.c_str(),
                                                    current_esc.c_str()));
   return google_util::AppendGoogleLocaleParam(report_url);
 }
 
-void StringToSBFullHash(const std::string& hash_in, SBFullHash* hash_out) {
+SBFullHash StringToSBFullHash(const std::string& hash_in) {
   DCHECK_EQ(crypto::kSHA256Length, hash_in.size());
-  memcpy(hash_out->full_hash, hash_in.data(), crypto::kSHA256Length);
+  SBFullHash hash_out;
+  memcpy(hash_out.full_hash, hash_in.data(), crypto::kSHA256Length);
+  return hash_out;
 }
 
 std::string SBFullHashToString(const SBFullHash& hash) {
   DCHECK_EQ(crypto::kSHA256Length, sizeof(hash.full_hash));
   return std::string(hash.full_hash, sizeof(hash.full_hash));
 }
+
 }  // namespace safe_browsing_util