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

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

Issue 11419041: Add tests for redirect responses from SafeBrowsingProtocolManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reintroduce newline Created 8 years, 1 month 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
Index: chrome/browser/safe_browsing/safe_browsing_service.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index f22ac5e68a662bc5bbd193bc5f4a7e239e43a3f7..28ac0eba4344600668e74c53cc638e4416b79ae0 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -529,11 +529,13 @@ void SafeBrowsingService::GetChunks(GetChunksCallback callback) {
}
void SafeBrowsingService::AddChunks(const std::string& list,
- SBChunkList* chunks) {
+ SBChunkList* chunks,
+ AddChunksCallback callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
DCHECK(enabled_);
safe_browsing_thread_->message_loop()->PostTask(FROM_HERE, base::Bind(
- &SafeBrowsingService::HandleChunkForDatabase, this, list, chunks));
+ &SafeBrowsingService::HandleChunkForDatabase, this, list, chunks,
+ callback));
}
void SafeBrowsingService::DeleteChunks(
@@ -902,10 +904,10 @@ void SafeBrowsingService::OnGetAllChunksFromDatabase(
callback.Run(lists, database_error);
}
-void SafeBrowsingService::OnChunkInserted() {
+void SafeBrowsingService::OnAddChunksComplete(AddChunksCallback callback) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
if (enabled_)
- protocol_manager_->OnChunkInserted();
+ callback.Run();
}
void SafeBrowsingService::DatabaseLoadComplete() {
@@ -939,7 +941,8 @@ void SafeBrowsingService::DatabaseLoadComplete() {
}
void SafeBrowsingService::HandleChunkForDatabase(
- const std::string& list_name, SBChunkList* chunks) {
+ 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);
@@ -947,7 +950,7 @@ void SafeBrowsingService::HandleChunkForDatabase(
}
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
- base::Bind(&SafeBrowsingService::OnChunkInserted, this));
+ base::Bind(&SafeBrowsingService::OnAddChunksComplete, this, callback));
}
void SafeBrowsingService::DeleteDatabaseChunks(

Powered by Google App Engine
This is Rietveld 408576698