| Index: chrome/browser/safe_browsing/safe_browsing_database.h
|
| diff --git a/chrome/browser/safe_browsing/safe_browsing_database.h b/chrome/browser/safe_browsing/safe_browsing_database.h
|
| index 17aad1d1fc4dae6f182519ccea983cb0dad3b46a..3e2ca8d4147b5a03b9b5bc1f5b125a239b109560 100644
|
| --- a/chrome/browser/safe_browsing/safe_browsing_database.h
|
| +++ b/chrome/browser/safe_browsing/safe_browsing_database.h
|
| @@ -287,42 +287,37 @@ class SafeBrowsingDatabaseNew : public SafeBrowsingDatabase {
|
| // useds Sqlite.
|
| SafeBrowsingDatabaseNew();
|
|
|
| - virtual ~SafeBrowsingDatabaseNew();
|
| + ~SafeBrowsingDatabaseNew() override;
|
|
|
| // Implement SafeBrowsingDatabase interface.
|
| - virtual void Init(const base::FilePath& filename) override;
|
| - virtual bool ResetDatabase() override;
|
| - virtual bool ContainsBrowseUrl(
|
| - const GURL& url,
|
| - std::vector<SBPrefix>* prefix_hits,
|
| - std::vector<SBFullHashResult>* cache_hits) override;
|
| - virtual bool ContainsDownloadUrl(const std::vector<GURL>& urls,
|
| - std::vector<SBPrefix>* prefix_hits) override;
|
| - virtual bool ContainsCsdWhitelistedUrl(const GURL& url) override;
|
| - virtual bool ContainsDownloadWhitelistedUrl(const GURL& url) override;
|
| - virtual bool ContainsDownloadWhitelistedString(
|
| - const std::string& str) override;
|
| - virtual bool ContainsExtensionPrefixes(
|
| - const std::vector<SBPrefix>& prefixes,
|
| - std::vector<SBPrefix>* prefix_hits) override;
|
| - virtual bool ContainsSideEffectFreeWhitelistUrl(const GURL& url) override;
|
| - virtual bool ContainsMalwareIP(const std::string& ip_address) override;
|
| - virtual bool UpdateStarted(std::vector<SBListChunkRanges>* lists) override;
|
| - virtual void InsertChunks(const std::string& list_name,
|
| - const std::vector<SBChunkData*>& chunks) override;
|
| - virtual void DeleteChunks(
|
| - const std::vector<SBChunkDelete>& chunk_deletes) override;
|
| - virtual void UpdateFinished(bool update_succeeded) override;
|
| - virtual void CacheHashResults(
|
| - const std::vector<SBPrefix>& prefixes,
|
| - const std::vector<SBFullHashResult>& full_hits,
|
| - const base::TimeDelta& cache_lifetime) override;
|
| + void Init(const base::FilePath& filename) override;
|
| + bool ResetDatabase() override;
|
| + bool ContainsBrowseUrl(const GURL& url,
|
| + std::vector<SBPrefix>* prefix_hits,
|
| + std::vector<SBFullHashResult>* cache_hits) override;
|
| + bool ContainsDownloadUrl(const std::vector<GURL>& urls,
|
| + std::vector<SBPrefix>* prefix_hits) override;
|
| + bool ContainsCsdWhitelistedUrl(const GURL& url) override;
|
| + bool ContainsDownloadWhitelistedUrl(const GURL& url) override;
|
| + bool ContainsDownloadWhitelistedString(const std::string& str) override;
|
| + bool ContainsExtensionPrefixes(const std::vector<SBPrefix>& prefixes,
|
| + std::vector<SBPrefix>* prefix_hits) override;
|
| + bool ContainsSideEffectFreeWhitelistUrl(const GURL& url) override;
|
| + bool ContainsMalwareIP(const std::string& ip_address) override;
|
| + bool UpdateStarted(std::vector<SBListChunkRanges>* lists) override;
|
| + void InsertChunks(const std::string& list_name,
|
| + const std::vector<SBChunkData*>& chunks) override;
|
| + void DeleteChunks(const std::vector<SBChunkDelete>& chunk_deletes) override;
|
| + void UpdateFinished(bool update_succeeded) override;
|
| + void CacheHashResults(const std::vector<SBPrefix>& prefixes,
|
| + const std::vector<SBFullHashResult>& full_hits,
|
| + const base::TimeDelta& cache_lifetime) override;
|
|
|
| // Returns the value of malware_kill_switch_;
|
| - virtual bool IsMalwareIPMatchKillSwitchOn() override;
|
| + bool IsMalwareIPMatchKillSwitchOn() override;
|
|
|
| // Returns true if the CSD whitelist has everything whitelisted.
|
| - virtual bool IsCsdWhitelistKillSwitchOn() override;
|
| + bool IsCsdWhitelistKillSwitchOn() override;
|
|
|
| private:
|
| friend class SafeBrowsingDatabaseTest;
|
|
|