[safe browsing] Serialize full hashes with prefix set.

chrome/browser/safe_browsing/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 65 matching lines @@
  private:
   friend class PrefixSetBuilder;
 
   friend class PrefixSetTest;
   FRIEND_TEST_ALL_PREFIXES(PrefixSetTest, AllBig);
   FRIEND_TEST_ALL_PREFIXES(PrefixSetTest, EdgeCases);
   FRIEND_TEST_ALL_PREFIXES(PrefixSetTest, Empty);
   FRIEND_TEST_ALL_PREFIXES(PrefixSetTest, FullHashBuild);
   FRIEND_TEST_ALL_PREFIXES(PrefixSetTest, IntMinMax);
   FRIEND_TEST_ALL_PREFIXES(PrefixSetTest, OneElement);
+  FRIEND_TEST_ALL_PREFIXES(PrefixSetTest, ReadWrite);
   FRIEND_TEST_ALL_PREFIXES(PrefixSetTest, ReadWriteSigned);
+  FRIEND_TEST_ALL_PREFIXES(PrefixSetTest, Version3);
 
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingStoreFileTest, BasicStore);
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingStoreFileTest, DeleteChunks);
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingStoreFileTest, DetectsCorruption);
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingStoreFileTest, Empty);
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingStoreFileTest, PrefixMinMax);
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingStoreFileTest, SubKnockout);
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingStoreFileTest, Version7);
   FRIEND_TEST_ALL_PREFIXES(SafeBrowsingStoreFileTest, Version8);
 
@@ skipping 16 matching lines @@
   // 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 the contents of |index| and
-  // |deltas| using |swap()|.
-  PrefixSet(IndexVector* index, std::vector<uint16>* deltas);
+  // Helper for |LoadFile()|.  Steals vector contents using |swap()|.
+  PrefixSet(IndexVector* index,
+            std::vector<uint16>* 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.
@@ skipping 35 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  // CHROME_BROWSER_SAFE_BROWSING_PREFIX_SET_H_