Safe-browsing SBAddPrefix from vector to deque.

chrome/browser/safe_browsing/safe_browsing_store_file.h

Index: chrome/browser/safe_browsing/safe_browsing_store_file.h
diff --git a/chrome/browser/safe_browsing/safe_browsing_store_file.h b/chrome/browser/safe_browsing/safe_browsing_store_file.h
index 452f2de808c809a184d12204565efd17f47f5988..f515d602f52caff87056f3fa28f5292e4ede9ae9 100644
--- a/chrome/browser/safe_browsing/safe_browsing_store_file.h
+++ b/chrome/browser/safe_browsing/safe_browsing_store_file.h
@@ -116,7 +116,7 @@ class SafeBrowsingStoreFile : public SafeBrowsingStore {
 
   // 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;
 
@@ -138,7 +138,7 @@ class SafeBrowsingStoreFile : public SafeBrowsingStore {
   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;
 
@@ -162,7 +162,7 @@ class SafeBrowsingStoreFile : public SafeBrowsingStore {
   // 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
@@ -222,7 +222,7 @@ class SafeBrowsingStoreFile : public SafeBrowsingStore {
     // 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_);
@@ -241,7 +241,7 @@ class SafeBrowsingStoreFile : public SafeBrowsingStore {
 
   // 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_;
@@ -271,10 +271,6 @@ class SafeBrowsingStoreFile : public SafeBrowsingStore {
   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