Switch to standard integer types in chrome/browser/, part 3 of 4.

chrome/browser/safe_browsing/safe_browsing_store.cc

 // Copyright (c) 2011 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_store.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 
@@ skipping 55 matching lines @@
     }
   }
 
   // Erase any leftover gap.
   adds->erase(add_out, add_iter);
   subs->erase(sub_out, sub_iter);
 }
 
 // Remove deleted items (|chunk_id| in |del_set|) from the container.
 template <typename ItemsT>
-void RemoveDeleted(ItemsT* items, const base::hash_set<int32>& del_set) {
+void RemoveDeleted(ItemsT* items, const base::hash_set<int32_t>& del_set) {
   DCHECK(items);
 
   // Move items from |iter| to |end_iter|, skipping items in |del_set|.
   typename ItemsT::iterator end_iter = items->begin();
   for (typename ItemsT::iterator iter = end_iter;
        iter != items->end(); ++iter) {
     if (del_set.count(iter->chunk_id) == 0) {
       *end_iter = *iter;
       ++end_iter;
     }
   }
   items->erase(end_iter, items->end());
 }
 
 }  // namespace
 
 namespace safe_browsing {
 
 void SBProcessSubs(SBAddPrefixes* add_prefixes,
                    SBSubPrefixes* sub_prefixes,
                    std::vector<SBAddFullHash>* add_full_hashes,
                    std::vector<SBSubFullHash>* sub_full_hashes,
-                   const base::hash_set<int32>& add_chunks_deleted,
-                   const base::hash_set<int32>& sub_chunks_deleted) {
+                   const base::hash_set<int32_t>& add_chunks_deleted,
+                   const base::hash_set<int32_t>& sub_chunks_deleted) {
   // It is possible to structure templates and template
   // specializations such that the following calls work without having
   // to qualify things.  It becomes very arbitrary, though, and less
   // clear how things are working.
 
   // Make sure things are sorted appropriately.
   DCHECK(sorted(add_prefixes->begin(), add_prefixes->end(),
                 SBAddPrefixLess<SBAddPrefix,SBAddPrefix>));
   DCHECK(sorted(sub_prefixes->begin(), sub_prefixes->end(),
                 SBAddPrefixLess<SBSubPrefix,SBSubPrefix>));
@@ skipping 15 matching lines @@
   // Remove items from the deleted chunks.  This is done after other
   // processing to allow subs to knock out adds (and be removed) even
   // if the add's chunk is deleted.
   RemoveDeleted(add_prefixes, add_chunks_deleted);
   RemoveDeleted(sub_prefixes, sub_chunks_deleted);
   RemoveDeleted(add_full_hashes, add_chunks_deleted);
   RemoveDeleted(sub_full_hashes, sub_chunks_deleted);
 }
 
 }  // namespace safe_browsing