Suffixed histograms for SB2.DatabaseKilobytes and SB2.PrefixSetKilobytes

chrome/browser/safe_browsing/safe_browsing_database.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_DATABASE_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 482 matching lines @@
   // Init()).
   void LoadPrefixSet(const base::FilePath& db_filename,
                      ThreadSafeStateManager::WriteTransaction* txn,
                      PrefixSetId prefix_set_id,
                      FailureType read_failure_type);
 
   // Writes the current prefix set "|db_filename| Prefix Set" on disk.
   // |write_failure_type| provides a caller-specific error code to be used on
   // failure.
   void WritePrefixSet(const base::FilePath& db_filename,
-                      const safe_browsing::PrefixSet* prefix_set,
+                      PrefixSetId prefix_set_id,
                       FailureType write_failure_type);
 
   // Loads the given full-length hashes to the given whitelist.  If the number
   // of hashes is too large or if the kill switch URL is on the whitelist
   // we will whitelist everything.
   void LoadWhitelist(const std::vector<SBAddFullHash>& full_hashes,
                      SBWhitelistId whitelist_id);
 
   // Parses the IP blacklist from the given full-length hashes.
   void LoadIpBlacklist(const std::vector<SBAddFullHash>& full_hashes);
 
   // Helpers for handling database corruption.
   // |OnHandleCorruptDatabase()| runs |ResetDatabase()| and sets
   // |corruption_detected_|, |HandleCorruptDatabase()| posts
   // |OnHandleCorruptDatabase()| to the current thread, to be run
   // after the current task completes.
   // TODO(shess): Wire things up to entirely abort the update
   // transaction when this happens.
   void HandleCorruptDatabase();
   void OnHandleCorruptDatabase();
 
   // Helpers for InsertChunks().
   void InsertAddChunk(SafeBrowsingStore* store,
                       safe_browsing_util::ListType list_id,
                       const SBChunkData& chunk);
   void InsertSubChunk(SafeBrowsingStore* store,
                       safe_browsing_util::ListType list_id,
                       const SBChunkData& chunk);
 
-  // Returns the size in bytes of the store after the update.
-  int64 UpdateHashPrefixStore(const base::FilePath& store_filename,
-                               SafeBrowsingStore* store,
-                               FailureType failure_type);
+  // Updates the |store| and stores the result on disk under |store_filename|.
+  void UpdateHashPrefixStore(const base::FilePath& store_filename,
+                             SafeBrowsingStore* store,
+                             FailureType failure_type);
 
   // Updates a PrefixStore store for URLs (|url_store|) which is backed on disk
   // by a "|db_filename| Prefix Set" file. Specific failure types are provided
   // to highlight the specific store who made the initial request on failure.
   // |store_full_hashes_in_prefix_set| dictates whether full_hashes from the
   // |url_store| should be cached in the |prefix_set| as well.
   void UpdatePrefixSetUrlStore(const base::FilePath& db_filename,
                                SafeBrowsingStore* url_store,
                                PrefixSetId prefix_set_id,
                                FailureType finish_failure_type,
                                FailureType write_failure_type,
                                bool store_full_hashes_in_prefix_set);
 
   void UpdateUrlStore(SafeBrowsingStore* url_store,
                       PrefixSetId prefix_set_id,
                       FailureType failure_type);
 
   void UpdateWhitelistStore(const base::FilePath& store_filename,
                             SafeBrowsingStore* store,
                             SBWhitelistId whitelist_id);
   void UpdateIpBlacklistStore();
 
   // Returns a raw pointer to ThreadSafeStateManager's PrefixGetHashCache for
   // testing. This should only be used in unit tests (where multi-threading and
   // synchronization are not problematic).
   PrefixGetHashCache* GetUnsynchronizedPrefixGetHashCacheForTesting();
 
+  // Records a file size histogram for the database or PrefixSet backed by
+  // |filename|.
+  void RecordFileSizeHistogram(const base::FilePath& file_path);
+
   base::ThreadChecker thread_checker_;
 
   ThreadSafeStateManager state_manager_;
 
   // The base filename passed to Init(), used to generate the store and prefix
   // set filenames used to store data on disk.
   base::FilePath filename_base_;
 
   // Underlying persistent store for chunk data.
   // For browsing related (phishing and malware URLs) chunks and prefixes.
@@ skipping 29 matching lines @@
 
   // Set to true if any chunks are added or deleted during an update.
   // Used to optimize away database update.
   bool change_detected_;
 
   // Used to schedule resetting the database because of corruption.
   base::WeakPtrFactory<SafeBrowsingDatabaseNew> reset_factory_;
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_DATABASE_H_