---

yaml --- r: 2108 b: refs/heads/master c: aad0875 h: refs/heads/master v: v3
marcosholgado · Oct 2, 2008 · 1294951 · 1294951
1 parent 5fd4129
commit 1294951
Show file tree

Hide file tree

Showing 11 changed files with 1,344 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa87dd3130e941327c40cceb145c4fc58954ecb6
+refs/heads/master: aad08754d7ff3be93fd415a36a588fadd2e34bd0
diff --git a/trunk/chrome/browser/SConscript b/trunk/chrome/browser/SConscript
@@ -249,6 +249,7 @@ if env['PLATFORM'] == 'win32':
       'safe_browsing/protocol_manager.cc',
       'safe_browsing/safe_browsing_blocking_page.cc',
       'safe_browsing/safe_browsing_database.cc',
+      'safe_browsing/safe_browsing_database_bloom.cc',
       'safe_browsing/safe_browsing_database_impl.cc',
       'safe_browsing/safe_browsing_service.cc',
       'sandbox_policy.cc',

diff --git a/trunk/chrome/browser/browser.vcproj b/trunk/chrome/browser/browser.vcproj
@@ -1933,6 +1933,14 @@
 				RelativePath=".\safe_browsing\safe_browsing_database.h"
 				>
 			</File>
+			<File
+				RelativePath=".\safe_browsing\safe_browsing_database_bloom.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\safe_browsing\safe_browsing_database_bloom.h"
+				>
+			</File>
 			<File
 				RelativePath=".\safe_browsing\safe_browsing_database_impl.cc"
 				>

diff --git a/trunk/chrome/browser/safe_browsing/protocol_manager.cc b/trunk/chrome/browser/safe_browsing/protocol_manager.cc
@@ -526,6 +526,7 @@ void SafeBrowsingProtocolManager::OnChunkInserted() {
 
   if (chunk_request_urls_.empty()) {
     UMA_HISTOGRAM_LONG_TIMES(L"SB.Update", Time::Now() - last_update_);
+    sb_service_->UpdateFinished();
   } else {
     IssueChunkRequest();
   }

diff --git a/trunk/chrome/browser/safe_browsing/safe_browsing_database.cc b/trunk/chrome/browser/safe_browsing/safe_browsing_database.cc
@@ -8,6 +8,7 @@
 #include "base/logging.h"
 #include "base/sha2.h"
 #include "chrome/browser/safe_browsing/safe_browsing_database_impl.h"
+#include "chrome/browser/safe_browsing/safe_browsing_database_bloom.h"
 #include "googleurl/src/gurl.h"
 
 // Filename suffix for the bloom filter.
@@ -90,3 +91,4 @@ void SafeBrowsingDatabase::WriteBloomFilter() {
   SB_DLOG(INFO) << "SafeBrowsingDatabase wrote bloom filter in " <<
       (Time::Now() - before).InMilliseconds() << " ms";
 }
+
diff --git a/trunk/chrome/browser/safe_browsing/safe_browsing_database.h b/trunk/chrome/browser/safe_browsing/safe_browsing_database.h
@@ -79,6 +79,8 @@ class SafeBrowsingDatabase {
   // Called when the user's machine has resumed from a lower power state.
   virtual void HandleResume() = 0;
 
+  virtual void UpdateFinished() { }
+
  protected:
   static std::wstring BloomFilterFilename(const std::wstring& db_filename);
 
@@ -93,10 +95,9 @@ class SafeBrowsingDatabase {
 
   // Implementation specific bloom filter building.
   virtual void BuildBloomFilter() = 0;
-  virtual void AddHostToBloomFilter(int host_key) = 0;
 
   // Measuring false positive rate. Call this each time we look in the filter.
-  virtual void IncrementBloomFilterReadCount() = 0;
+  virtual void IncrementBloomFilterReadCount() {};
 
   std::wstring bloom_filter_filename_;
   scoped_ptr<BloomFilter> bloom_filter_;