Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / safe_browsing / safe_browsing_store_file.h

diff --git a/src/chrome/browser/safe_browsing/safe_browsing_store_file.h b/src/chrome/browser/safe_browsing/safe_browsing_store_file.h
index c8a2429..a890559 100644 (file)
--- a/src/chrome/browser/safe_browsing/safe_browsing_store_file.h
+++ b/src/chrome/browser/safe_browsing/safe_browsing_store_file.h
@@ -143,7 +143,6 @@ class SafeBrowsingStoreFile : public SafeBrowsingStore {
 
   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) OVERRIDE;
@@ -152,10 +151,7 @@ class SafeBrowsingStoreFile : public SafeBrowsingStore {
   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,
       safe_browsing::PrefixSetBuilder* builder,
       std::vector<SBAddFullHash>* add_full_hashes_result) OVERRIDE;
   virtual bool CancelUpdate() OVERRIDE;
@@ -185,50 +181,11 @@ class SafeBrowsingStoreFile : public SafeBrowsingStore {
   static bool DeleteStore(const base::FilePath& basename);
 
  private:
-  // Update store file with pending full hashes.
-  virtual bool DoUpdate(const std::vector<SBAddFullHash>& pending_adds,
-                        safe_browsing::PrefixSetBuilder* builder,
+  // Does the actual update for FinishUpdate(), so that FinishUpdate() can clean
+  // up correctly in case of error.
+  virtual bool DoUpdate(safe_browsing::PrefixSetBuilder* builder,
                         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
-
-    // The type of format found in the file.  The expected case (new
-    // file format) is intentionally not covered.
-    FORMAT_EVENT_FOUND_SQLITE,
-    FORMAT_EVENT_FOUND_UNKNOWN,
-
-    // The number of SQLite-format files deleted should be the same as
-    // FORMAT_EVENT_FOUND_SQLITE.  It can differ if the delete fails,
-    // or if a failure prevents the update from succeeding.
-    FORMAT_EVENT_SQLITE_DELETED,  // Obsolete
-    FORMAT_EVENT_SQLITE_DELETE_FAILED,  // Obsolete
-
-    // Found and deleted (or failed to delete) the ancient "Safe
-    // Browsing" file.
-    FORMAT_EVENT_DELETED_ORIGINAL,
-    FORMAT_EVENT_DELETED_ORIGINAL_FAILED,
-
-    // The checksum did not check out in CheckValidity() or in
-    // FinishUpdate().  This most likely indicates that the machine
-    // crashed before the file was fully sync'ed to disk.
-    FORMAT_EVENT_VALIDITY_CHECKSUM_FAILURE,
-    FORMAT_EVENT_UPDATE_CHECKSUM_FAILURE,
-
-    // Memory space for histograms is determined by the max.  ALWAYS
-    // ADD NEW VALUES BEFORE THIS ONE.
-    FORMAT_EVENT_MAX
-  };
-
-  // Helper to record an event related to format conversion from
-  // SQLite to file.
-  static void RecordFormatEvent(FormatEventType event_type);
-
   // Some very lucky users have an original-format file still in their
   // profile.  Check for it and delete, recording a histogram for the
   // result (no histogram for not-found).  Logically this