Safe-browsing SBAddPrefix from vector to deque.

chrome/browser/safe_browsing/safe_browsing_store_file.h

 // 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.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_STORE_FILE_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_STORE_FILE_H_
 #pragma once
 
 #include <set>
 #include <vector>
@@ skipping 98 matching lines @@
   virtual ~SafeBrowsingStoreFile();
 
   virtual void Init(const FilePath& filename,
                     const base::Closure& corruption_callback) OVERRIDE;
 
   // Delete any on-disk files, including the permanent storage.
   virtual bool Delete() OVERRIDE;
 
   // Get all add hash prefixes and full-length hashes, respectively, from
   // the store.
-  virtual bool GetAddPrefixes(std::vector<SBAddPrefix>* add_prefixes) OVERRIDE;
+  virtual bool GetAddPrefixes(SBAddPrefixes* add_prefixes) OVERRIDE;
   virtual bool GetAddFullHashes(
       std::vector<SBAddFullHash>* add_full_hashes) OVERRIDE;
 
   virtual bool BeginChunk() OVERRIDE;
 
   virtual bool WriteAddPrefix(int32 chunk_id, SBPrefix prefix) OVERRIDE;
   virtual bool WriteAddHash(int32 chunk_id,
                             base::Time receive_time,
                             const SBFullHash& full_hash) OVERRIDE;
   virtual bool WriteSubPrefix(int32 chunk_id,
                               int32 add_chunk_id, SBPrefix prefix);
   virtual bool WriteSubHash(int32 chunk_id, int32 add_chunk_id,
                             const SBFullHash& full_hash) OVERRIDE;
   virtual bool FinishChunk() OVERRIDE;
 
   virtual bool BeginUpdate() OVERRIDE;
   // Store updates with pending add full hashes in file store and
   // return |add_prefixes_result| and |add_full_hashes_result|.
   virtual bool FinishUpdate(
       const std::vector<SBAddFullHash>& pending_adds,
       const std::set<SBPrefix>& prefix_misses,
-      std::vector<SBAddPrefix>* add_prefixes_result,
+      SBAddPrefixes* add_prefixes_result,
       std::vector<SBAddFullHash>* add_full_hashes_result) OVERRIDE;
   virtual bool CancelUpdate() OVERRIDE;
 
   virtual void SetAddChunk(int32 chunk_id) OVERRIDE;
   virtual bool CheckAddChunk(int32 chunk_id) OVERRIDE;
   virtual void GetAddChunks(std::vector<int32>* out) OVERRIDE;
   virtual void SetSubChunk(int32 chunk_id) OVERRIDE;
   virtual bool CheckSubChunk(int32 chunk_id) OVERRIDE;
   virtual void GetSubChunks(std::vector<int32>* out) OVERRIDE;
 
   virtual void DeleteAddChunk(int32 chunk_id) OVERRIDE;
   virtual void DeleteSubChunk(int32 chunk_id) OVERRIDE;
 
   // Returns the name of the temporary file used to buffer data for
   // |filename|.  Exported for unit tests.
   static const FilePath TemporaryFileForFilename(const FilePath& filename) {
     return FilePath(filename.value() + FILE_PATH_LITERAL("_new"));
   }
 
  private:
   // Update store file with pending full hashes.
   virtual bool DoUpdate(const std::vector<SBAddFullHash>& pending_adds,
                         const std::set<SBPrefix>& prefix_misses,
-                        std::vector<SBAddPrefix>* add_prefixes_result,
+                        SBAddPrefixes* add_prefixes_result,
                         std::vector<SBAddFullHash>* add_full_hashes_result);
 
   // Enumerate different format-change events for histogramming
   // purposes.  DO NOT CHANGE THE ORDERING OF THESE VALUES.
   // TODO(shess): Remove this once the format change is complete.
   enum FormatEventType {
     // Corruption detected, broken down by file format.
     FORMAT_EVENT_FILE_CORRUPT,
     FORMAT_EVENT_SQLITE_CORRUPT,  // Obsolete
 
@@ skipping 39 matching lines @@
   // Helper for creating a corruption callback for |old_store_|.
   // TODO(shess): Remove after migration.
   void HandleCorruptDatabase();
 
   // Clear temporary buffers used to accumulate chunk data.
   bool ClearChunkBuffers() {
     // NOTE: .clear() doesn't release memory.
     // TODO(shess): Figure out if this is overkill.  Some amount of
     // pre-reserved space is probably reasonable between each chunk
     // collected.
-    std::vector<SBAddPrefix>().swap(add_prefixes_);
+    SBAddPrefixes().swap(add_prefixes_);
     std::vector<SBSubPrefix>().swap(sub_prefixes_);
     std::vector<SBAddFullHash>().swap(add_hashes_);
     std::vector<SBSubFullHash>().swap(sub_hashes_);
     return true;
   }
 
   // Clear all buffers used during update.
   void ClearUpdateBuffers() {
     ClearChunkBuffers();
     chunks_written_ = 0;
     std::set<int32>().swap(add_chunks_cache_);
     std::set<int32>().swap(sub_chunks_cache_);
     base::hash_set<int32>().swap(add_del_cache_);
     base::hash_set<int32>().swap(sub_del_cache_);
   }
 
   // Buffers for collecting data between BeginChunk() and
   // FinishChunk().
-  std::vector<SBAddPrefix> add_prefixes_;
+  SBAddPrefixes add_prefixes_;
   std::vector<SBSubPrefix> sub_prefixes_;
   std::vector<SBAddFullHash> add_hashes_;
   std::vector<SBSubFullHash> sub_hashes_;
 
   // Count of chunks collected in |new_file_|.
   int chunks_written_;
 
   // Name of the main database file.
   FilePath filename_;
 
   // Handles to the main and scratch files.  |empty_| is true if the
   // main file didn't exist when the update was started.
   file_util::ScopedFILE file_;
   file_util::ScopedFILE new_file_;
   bool empty_;
 
   // Cache of chunks which have been seen.  Loaded from the database
   // on BeginUpdate() so that it can be queried during the
   // transaction.
   std::set<int32> add_chunks_cache_;
   std::set<int32> sub_chunks_cache_;
 
   // Cache the set of deleted chunks during a transaction, applied on
   // FinishUpdate().
   // TODO(shess): If the set is small enough, hash_set<> might be
   // slower than plain set<>.
   base::hash_set<int32> add_del_cache_;
   base::hash_set<int32> sub_del_cache_;
 
-  // Count number of add_prefix items added during the course of an
-  // update, for purposes of optimizing vector sizing at commit time.
-  size_t add_prefixes_added_;
-
   base::Closure corruption_callback_;
 
   // Tracks whether corruption has already been seen in the current
   // update, so that only one instance is recorded in the stats.
   // TODO(shess): Remove with format-migration support.
   bool corruption_seen_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingStoreFile);
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_STORE_FILE_H_