Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4628)

Unified Diff: chrome/browser/safe_browsing/database_manager.cc

Issue 11419041: Add tests for redirect responses from SafeBrowsingProtocolManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another merge Created 8 years 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
« no previous file with comments | « chrome/browser/safe_browsing/database_manager.h ('k') | chrome/browser/safe_browsing/protocol_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/database_manager.cc
diff --git a/chrome/browser/safe_browsing/database_manager.cc b/chrome/browser/safe_browsing/database_manager.cc
index f2da285818686c0ed101da419ded4d3093dc202d..5c82eed240a38109d70a36411a4a7c63a110b822 100644
--- a/chrome/browser/safe_browsing/database_manager.cc
+++ b/chrome/browser/safe_browsing/database_manager.cc
@@ -317,12 +317,14 @@ void SafeBrowsingDatabaseManager::GetChunks(GetChunksCallback callback) {
}
void SafeBrowsingDatabaseManager::AddChunks(const std::string& list,
- SBChunkList* chunks) {
+ SBChunkList* chunks,
+ AddChunksCallback callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
DCHECK(enabled_);
+ DCHECK(!callback.is_null());
safe_browsing_thread_->message_loop()->PostTask(FROM_HERE, base::Bind(
- &SafeBrowsingDatabaseManager::HandleChunkForDatabase, this, list,
- chunks));
+ &SafeBrowsingDatabaseManager::AddDatabaseChunks, this, list,
+ chunks, callback));
}
void SafeBrowsingDatabaseManager::DeleteChunks(
@@ -601,10 +603,11 @@ void SafeBrowsingDatabaseManager::OnGetAllChunksFromDatabase(
callback.Run(lists, database_error);
}
-void SafeBrowsingDatabaseManager::OnChunkInserted() {
+void SafeBrowsingDatabaseManager::OnAddChunksComplete(
+ AddChunksCallback callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
if (enabled_)
- sb_service_->protocol_manager()->OnChunkInserted();
+ callback.Run();
}
void SafeBrowsingDatabaseManager::DatabaseLoadComplete() {
@@ -637,8 +640,9 @@ void SafeBrowsingDatabaseManager::DatabaseLoadComplete() {
}
}
-void SafeBrowsingDatabaseManager::HandleChunkForDatabase(
- const std::string& list_name, SBChunkList* chunks) {
+void SafeBrowsingDatabaseManager::AddDatabaseChunks(
+ const std::string& list_name, SBChunkList* chunks,
+ AddChunksCallback callback) {
DCHECK_EQ(MessageLoop::current(), safe_browsing_thread_->message_loop());
if (chunks) {
GetDatabase()->InsertChunks(list_name, *chunks);
@@ -646,7 +650,8 @@ void SafeBrowsingDatabaseManager::HandleChunkForDatabase(
}
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
- base::Bind(&SafeBrowsingDatabaseManager::OnChunkInserted, this));
+ base::Bind(&SafeBrowsingDatabaseManager::OnAddChunksComplete, this,
+ callback));
}
void SafeBrowsingDatabaseManager::DeleteDatabaseChunks(
« no previous file with comments | « chrome/browser/safe_browsing/database_manager.h ('k') | chrome/browser/safe_browsing/protocol_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698