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

components/safe_browsing_db/prefix_set.h

 // 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.
 //
 // A read-only set implementation for |SBPrefix| items.  Prefixes are
 // sorted and stored as 16-bit deltas from the previous prefix.  An
 // index structure provides quick random access, and also handles
 // cases where 16 bits cannot encode a delta.
 //
 // For example, the sequence {20, 25, 41, 65432, 150000, 160000} would
@@ skipping 31 matching lines @@
 //         4 byte version number
 //         4 byte |index_.size()|
 //         4 byte |deltas_.size()|
 //     n * 8 byte |&index_[0]..&index_[n]|
 //     m * 2 byte |&deltas_[0]..&deltas_[m]|
 //        16 byte digest
 
 #ifndef COMPONENTS_SAFE_BROWSING_DB_PREFIX_SET_H_
 #define COMPONENTS_SAFE_BROWSING_DB_PREFIX_SET_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <utility>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/safe_browsing_db/util.h"
 
 namespace base {
 class FilePath;
@@ skipping 36 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingStoreFileTest, SubKnockout);
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingStoreFileTest, Version7);
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingStoreFileTest, Version8);
 
   // Maximum number of consecutive deltas to encode before generating
   // a new index entry.  This helps keep the worst-case performance
   // for |Exists()| under control.
   static const size_t kMaxRun = 100;
 
   // Helpers to make |index_| easier to deal with.
-  typedef std::pair<SBPrefix, uint32> IndexPair;
+  typedef std::pair<SBPrefix, uint32_t> IndexPair;
   typedef std::vector<IndexPair> IndexVector;
   static bool PrefixLess(const IndexPair& a, const IndexPair& b);
 
   // Helper to let |PrefixSetBuilder| add a run of data.  |index_prefix| is
   // added to |index_|, with the other elements added into |deltas_|.
   void AddRun(SBPrefix index_prefix,
-              const uint16* run_begin, const uint16* run_end);
+              const uint16_t* run_begin,
+              const uint16_t* run_end);
 
   // |true| if |prefix| is one of the prefixes passed to the set's builder.
   // Provided for testing purposes.
   bool PrefixExists(SBPrefix prefix) const;
 
   // Regenerate the vector of prefixes passed to the constructor into
   // |prefixes|.  Prefixes will be added in sorted order.  Useful for testing.
   void GetPrefixes(std::vector<SBPrefix>* prefixes) const;
 
   // Used by |PrefixSetBuilder|.
   PrefixSet();
 
   // Helper for |LoadFile()|.  Steals vector contents using |swap()|.
   PrefixSet(IndexVector* index,
-            std::vector<uint16>* deltas,
+            std::vector<uint16_t>* deltas,
             std::vector<SBFullHash>* full_hashes);
 
   // Top-level index of prefix to offset in |deltas_|.  Each pair
   // indicates a base prefix and where the deltas from that prefix
   // begin in |deltas_|.  The deltas for a pair end at the next pair's
   // index into |deltas_|.
   IndexVector index_;
 
   // Deltas which are added to the prefix in |index_| to generate
   // prefixes.  Deltas are only valid between consecutive items from
   // |index_|, or the end of |deltas_| for the last |index_| pair.
-  std::vector<uint16> deltas_;
+  std::vector<uint16_t> deltas_;
 
   // Full hashes ordered by SBFullHashLess.
   std::vector<SBFullHash> full_hashes_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefixSet);
 };
 
 // Helper to incrementally build a PrefixSet from a stream of sorted prefixes.
 class PrefixSetBuilder {
  public:
@@ skipping 25 matching lines @@
   // Buffers prefixes until enough are avaliable to emit a run.
   std::vector<SBPrefix> buffer_;
 
   // The PrefixSet being built.
   scoped_ptr<PrefixSet> prefix_set_;
 };
 
 }  // namespace safe_browsing
 
 #endif  // COMPONENTS_SAFE_BROWSING_DB_PREFIX_SET_H_