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

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

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months 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/database_manager.cc
diff --git a/chrome/browser/safe_browsing/database_manager.cc b/chrome/browser/safe_browsing/database_manager.cc
index 8658ac825fee358a8c649bbeabfc5374bba2bcef..d28d38a5863c0fa36239c11bd8b6878e50839131 100644
--- a/chrome/browser/safe_browsing/database_manager.cc
+++ b/chrome/browser/safe_browsing/database_manager.cc
@@ -566,7 +566,8 @@ void SafeBrowsingDatabaseManager::CloseDatabase() {
}
SafeBrowsingDatabase* SafeBrowsingDatabaseManager::GetDatabase() {
- DCHECK_EQ(MessageLoop::current(), safe_browsing_thread_->message_loop());
+ DCHECK_EQ(base::MessageLoop::current(),
+ safe_browsing_thread_->message_loop());
if (database_)
return database_;
startup_metric_utils::ScopedSlowStartupUMA
@@ -650,7 +651,8 @@ void SafeBrowsingDatabaseManager::OnCheckDone(SafeBrowsingCheck* check) {
void SafeBrowsingDatabaseManager::GetAllChunksFromDatabase(
GetChunksCallback callback) {
- DCHECK_EQ(MessageLoop::current(), safe_browsing_thread_->message_loop());
+ DCHECK_EQ(base::MessageLoop::current(),
+ safe_browsing_thread_->message_loop());
bool database_error = true;
std::vector<SBListChunkRanges> lists;
@@ -717,7 +719,8 @@ void SafeBrowsingDatabaseManager::DatabaseLoadComplete() {
void SafeBrowsingDatabaseManager::AddDatabaseChunks(
const std::string& list_name, SBChunkList* chunks,
AddChunksCallback callback) {
- DCHECK_EQ(MessageLoop::current(), safe_browsing_thread_->message_loop());
+ DCHECK_EQ(base::MessageLoop::current(),
+ safe_browsing_thread_->message_loop());
if (chunks) {
GetDatabase()->InsertChunks(list_name, *chunks);
delete chunks;
@@ -730,7 +733,8 @@ void SafeBrowsingDatabaseManager::AddDatabaseChunks(
void SafeBrowsingDatabaseManager::DeleteDatabaseChunks(
std::vector<SBChunkDelete>* chunk_deletes) {
- DCHECK_EQ(MessageLoop::current(), safe_browsing_thread_->message_loop());
+ DCHECK_EQ(base::MessageLoop::current(),
+ safe_browsing_thread_->message_loop());
if (chunk_deletes) {
GetDatabase()->DeleteChunks(*chunk_deletes);
delete chunk_deletes;
@@ -765,7 +769,8 @@ SBThreatType SafeBrowsingDatabaseManager::GetThreatTypeFromListname(
void SafeBrowsingDatabaseManager::DatabaseUpdateFinished(
bool update_succeeded) {
- DCHECK_EQ(MessageLoop::current(), safe_browsing_thread_->message_loop());
+ DCHECK_EQ(base::MessageLoop::current(),
+ safe_browsing_thread_->message_loop());
GetDatabase()->UpdateFinished(update_succeeded);
DCHECK(database_update_in_progress_);
database_update_in_progress_ = false;
@@ -784,7 +789,8 @@ void SafeBrowsingDatabaseManager::NotifyDatabaseUpdateFinished(
}
void SafeBrowsingDatabaseManager::OnCloseDatabase() {
- DCHECK_EQ(MessageLoop::current(), safe_browsing_thread_->message_loop());
+ DCHECK_EQ(base::MessageLoop::current(),
+ safe_browsing_thread_->message_loop());
DCHECK(closing_database_);
// Because |closing_database_| is true, nothing on the IO thread will be
@@ -801,14 +807,16 @@ void SafeBrowsingDatabaseManager::OnCloseDatabase() {
}
void SafeBrowsingDatabaseManager::OnResetDatabase() {
- DCHECK_EQ(MessageLoop::current(), safe_browsing_thread_->message_loop());
+ DCHECK_EQ(base::MessageLoop::current(),
+ safe_browsing_thread_->message_loop());
GetDatabase()->ResetDatabase();
}
void SafeBrowsingDatabaseManager::CacheHashResults(
const std::vector<SBPrefix>& prefixes,
const std::vector<SBFullHashResult>& full_hashes) {
- DCHECK_EQ(MessageLoop::current(), safe_browsing_thread_->message_loop());
+ DCHECK_EQ(base::MessageLoop::current(),
+ safe_browsing_thread_->message_loop());
GetDatabase()->CacheHashResults(prefixes, full_hashes);
}
@@ -882,7 +890,8 @@ bool SafeBrowsingDatabaseManager::HandleOneCheck(
void SafeBrowsingDatabaseManager::CheckDownloadHashOnSBThread(
SafeBrowsingCheck* check) {
- DCHECK_EQ(MessageLoop::current(), safe_browsing_thread_->message_loop());
+ DCHECK_EQ(base::MessageLoop::current(),
+ safe_browsing_thread_->message_loop());
DCHECK(enable_download_protection_);
DCHECK_EQ(1u, check->full_hashes.size());
@@ -906,7 +915,8 @@ void SafeBrowsingDatabaseManager::CheckDownloadHashOnSBThread(
void SafeBrowsingDatabaseManager::CheckDownloadUrlOnSBThread(
SafeBrowsingCheck* check) {
- DCHECK_EQ(MessageLoop::current(), safe_browsing_thread_->message_loop());
+ DCHECK_EQ(base::MessageLoop::current(),
+ safe_browsing_thread_->message_loop());
DCHECK(enable_download_protection_);
std::vector<SBPrefix> prefix_hits;
@@ -930,7 +940,8 @@ void SafeBrowsingDatabaseManager::CheckDownloadUrlOnSBThread(
void SafeBrowsingDatabaseManager::CheckExtensionIDsOnSBThread(
SafeBrowsingCheck* check) {
- DCHECK_EQ(MessageLoop::current(), safe_browsing_thread_->message_loop());
+ DCHECK_EQ(base::MessageLoop::current(),
+ safe_browsing_thread_->message_loop());
std::vector<SBPrefix> prefixes;
for (std::vector<SBFullHash>::iterator it = check->full_hashes.begin();
@@ -1008,8 +1019,10 @@ void SafeBrowsingDatabaseManager::StartSafeBrowsingCheck(
safe_browsing_thread_->message_loop()->PostTask(FROM_HERE, task);
- MessageLoop::current()->PostDelayedTask(FROM_HERE,
+ base::MessageLoop::current()->PostDelayedTask(
+ FROM_HERE,
base::Bind(&SafeBrowsingDatabaseManager::TimeoutCallback,
- check->timeout_factory_->GetWeakPtr(), check),
+ check->timeout_factory_->GetWeakPtr(),
+ check),
check_timeout_);
}

Powered by Google App Engine
This is Rietveld 408576698