chrome/browser/safe_browsing/safe_browsing_store_file.h - Issue 220493003: Safebrowsing: change gethash caching to match api 2.3 rules, fix some corner cases.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/safe_browsing/safe_browsing_store_file.h

Issue 220493003: Safebrowsing: change gethash caching to match api 2.3 rules, fix some corner cases. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: changes for review #2 Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/safe_browsing/safe_browsing_database_unittest.cc ('K') | « chrome/browser/safe_browsing/safe_browsing_store.h ('k') | chrome/browser/safe_browsing/safe_browsing_store_file.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 c8a2429f21fd7ae74e7f71819ff5ba4ceebaa1e5..b55ac06aad3fe52a2e71325f01de2a8d4a2898ec 100644

--- a/chrome/browser/safe_browsing/safe_browsing_store_file.h

+++ b/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,9 @@ 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|.

+ // Store updates in file store. Kept prefixes will be added to |builder| and

+ // kept full hashes to |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,9 +183,8 @@ 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,

+ // Update store file and return |add_full_hashes_result|.

+ virtual bool DoUpdate(safe_browsing::PrefixSetBuilder* builder,

std::vector<SBAddFullHash>* add_full_hashes_result);

// Enumerate different format-change events for histogramming