Reduce memory consumption by keeping the SafeBrowsing

database closed when not processing updates.

Review URL: http://codereview.chromium.org/10643

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5381 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 4 deletions

diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index 792a4d8..c09806d 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -595,9 +595,13 @@ void SafeBrowsingService::GetAllChunksFromDatabase() {
   DCHECK(MessageLoop::current() == db_thread_->message_loop());
   bool database_error = true;
   std::vector<SBListChunkRanges> lists;
-  if (GetDatabase() && GetDatabase()->UpdateStarted()) {
-    GetDatabase()->GetListsInfo(&lists);
-    database_error = false;
+  if (GetDatabase()) {
+    if (GetDatabase()->UpdateStarted()) {
+      GetDatabase()->GetListsInfo(&lists);
+      database_error = false;
+    } else {
+      GetDatabase()->UpdateFinished(false);
+    }
   }
 
   io_loop_->PostTask(FROM_HERE, NewRunnableMethod(
@@ -658,7 +662,11 @@ void SafeBrowsingService::OnResume() {
 
 void SafeBrowsingService::HandleResume() {
   DCHECK(MessageLoop::current() == db_thread_->message_loop());
-  GetDatabase()->HandleResume();
+  // We don't call GetDatabase() here, since we want to avoid unnecessary calls
+  // to Open, Reset, etc, or reload the bloom filter while we're coming out of
+  // a suspended state.
+  if (database_)
+    database_->HandleResume();
 }
 
 void SafeBrowsingService::RunQueuedClients() {