Index: chrome/browser/safe_browsing/safe_browsing_store_sqlite.h |
diff --git a/chrome/browser/safe_browsing/safe_browsing_store_sqlite.h b/chrome/browser/safe_browsing/safe_browsing_store_sqlite.h |
index b577b083d2dfc3f6d78d23538b284de10e371ea8..f9d4381180391add7362810e6993c576904932b1 100644 |
--- a/chrome/browser/safe_browsing/safe_browsing_store_sqlite.h |
+++ b/chrome/browser/safe_browsing/safe_browsing_store_sqlite.h |
@@ -29,38 +29,19 @@ class SafeBrowsingStoreSqlite : public SafeBrowsingStore { |
virtual void Init(const FilePath& filename, |
Callback0::Type* corruption_callback); |
- virtual bool BeginChunk() { |
- return true; |
- } |
+ virtual bool BeginChunk(); |
// Get all Add prefixes out from the store. |
virtual bool GetAddPrefixes(std::vector<SBAddPrefix>* add_prefixes); |
- virtual bool WriteAddPrefix(int32 chunk_id, SBPrefix prefix) { |
- const std::vector<SBAddPrefix> prefixes(1, SBAddPrefix(chunk_id, prefix)); |
- return WriteAddPrefixes(prefixes); |
- } |
+ virtual bool WriteAddPrefix(int32 chunk_id, SBPrefix prefix); |
virtual bool WriteAddHash(int32 chunk_id, |
base::Time receive_time, |
- const SBFullHash& full_hash) { |
- const std::vector<SBAddFullHash> |
- hashes(1, SBAddFullHash(chunk_id, receive_time, full_hash)); |
- return WriteAddHashes(hashes); |
- } |
+ const SBFullHash& full_hash); |
virtual bool WriteSubPrefix(int32 chunk_id, |
- int32 add_chunk_id, SBPrefix prefix) { |
- const std::vector<SBSubPrefix> |
- prefixes(1, SBSubPrefix(chunk_id, add_chunk_id, prefix)); |
- return WriteSubPrefixes(prefixes); |
- } |
+ int32 add_chunk_id, SBPrefix prefix); |
virtual bool WriteSubHash(int32 chunk_id, int32 add_chunk_id, |
- const SBFullHash& full_hash) { |
- const std::vector<SBSubFullHash> |
- hashes(1, SBSubFullHash(chunk_id, add_chunk_id, full_hash)); |
- return WriteSubHashes(hashes); |
- } |
- virtual bool FinishChunk() { |
- return true; |
- } |
+ const SBFullHash& full_hash); |
+ virtual bool FinishChunk(); |
virtual bool BeginUpdate(); |
// TODO(shess): Should not be public. |
@@ -75,40 +56,20 @@ class SafeBrowsingStoreSqlite : public SafeBrowsingStore { |
std::vector<SBAddFullHash>* add_full_hashes_result); |
virtual bool CancelUpdate(); |
- virtual void SetAddChunk(int32 chunk_id) { |
- add_chunks_cache_.insert(chunk_id); |
- } |
- virtual bool CheckAddChunk(int32 chunk_id) { |
- return add_chunks_cache_.count(chunk_id) > 0; |
- } |
- virtual void GetAddChunks(std::vector<int32>* out) { |
- out->clear(); |
- out->insert(out->end(), add_chunks_cache_.begin(), add_chunks_cache_.end()); |
- } |
- |
- virtual void SetSubChunk(int32 chunk_id) { |
- sub_chunks_cache_.insert(chunk_id); |
- } |
- virtual bool CheckSubChunk(int32 chunk_id) { |
- return sub_chunks_cache_.count(chunk_id) > 0; |
- } |
- virtual void GetSubChunks(std::vector<int32>* out) { |
- out->clear(); |
- out->insert(out->end(), sub_chunks_cache_.begin(), sub_chunks_cache_.end()); |
- } |
- |
- virtual void DeleteAddChunk(int32 chunk_id) { |
- add_del_cache_.insert(chunk_id); |
- } |
- virtual void DeleteSubChunk(int32 chunk_id) { |
- sub_del_cache_.insert(chunk_id); |
- } |
+ virtual void SetAddChunk(int32 chunk_id); |
+ virtual bool CheckAddChunk(int32 chunk_id); |
+ virtual void GetAddChunks(std::vector<int32>* out); |
+ |
+ virtual void SetSubChunk(int32 chunk_id); |
+ virtual bool CheckSubChunk(int32 chunk_id); |
+ virtual void GetSubChunks(std::vector<int32>* out); |
+ |
+ virtual void DeleteAddChunk(int32 chunk_id); |
+ virtual void DeleteSubChunk(int32 chunk_id); |
// Returns the name of the SQLite journal file for |filename|. |
// Exported for unit tests. |
- static const FilePath JournalFileForFilename(const FilePath& filename) { |
- return FilePath(filename.value() + FILE_PATH_LITERAL("-journal")); |
- } |
+ static const FilePath JournalFileForFilename(const FilePath& filename); |
private: |
// For on-the-fly migration. |