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

Side by Side Diff: chrome/browser/safe_browsing/local_database_manager.cc

Issue 2925693003: Making CSD ReportType enum consistent. (Closed)
Patch Set: Handling SBThreatType enums as well Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/safe_browsing/local_database_manager.h" 5 #include "chrome/browser/safe_browsing/local_database_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 159
160 SBThreatType GetThreatTypeFromListType(ListType list_type) { 160 SBThreatType GetThreatTypeFromListType(ListType list_type) {
161 switch (list_type) { 161 switch (list_type) {
162 case PHISH: 162 case PHISH:
163 return SB_THREAT_TYPE_URL_PHISHING; 163 return SB_THREAT_TYPE_URL_PHISHING;
164 case MALWARE: 164 case MALWARE:
165 return SB_THREAT_TYPE_URL_MALWARE; 165 return SB_THREAT_TYPE_URL_MALWARE;
166 case UNWANTEDURL: 166 case UNWANTEDURL:
167 return SB_THREAT_TYPE_URL_UNWANTED; 167 return SB_THREAT_TYPE_URL_UNWANTED;
168 case BINURL: 168 case BINURL:
169 return SB_THREAT_TYPE_BINARY_MALWARE_URL; 169 return SB_THREAT_TYPE_URL_BINARY_MALWARE;
170 case EXTENSIONBLACKLIST: 170 case EXTENSIONBLACKLIST:
171 return SB_THREAT_TYPE_EXTENSION; 171 return SB_THREAT_TYPE_EXTENSION;
172 case RESOURCEBLACKLIST: 172 case RESOURCEBLACKLIST:
173 return SB_THREAT_TYPE_BLACKLISTED_RESOURCE; 173 return SB_THREAT_TYPE_BLACKLISTED_RESOURCE;
174 default: 174 default:
175 DVLOG(1) << "Unknown safe browsing list id " << list_type; 175 DVLOG(1) << "Unknown safe browsing list id " << list_type;
176 return SB_THREAT_TYPE_SAFE; 176 return SB_THREAT_TYPE_SAFE;
177 } 177 }
178 } 178 }
179 179
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 Client* client) { 345 Client* client) {
346 DCHECK_CURRENTLY_ON(BrowserThread::IO); 346 DCHECK_CURRENTLY_ON(BrowserThread::IO);
347 if (!enabled_ || !enable_download_protection_) 347 if (!enabled_ || !enable_download_protection_)
348 return true; 348 return true;
349 349
350 // We need to check the database for url prefix, and later may fetch the url 350 // We need to check the database for url prefix, and later may fetch the url
351 // from the safebrowsing backends. These need to be asynchronous. 351 // from the safebrowsing backends. These need to be asynchronous.
352 std::unique_ptr<SafeBrowsingCheck> check = 352 std::unique_ptr<SafeBrowsingCheck> check =
353 base::MakeUnique<SafeBrowsingCheck>( 353 base::MakeUnique<SafeBrowsingCheck>(
354 url_chain, std::vector<SBFullHash>(), client, BINURL, 354 url_chain, std::vector<SBFullHash>(), client, BINURL,
355 std::vector<SBThreatType>(1, SB_THREAT_TYPE_BINARY_MALWARE_URL)); 355 std::vector<SBThreatType>(1, SB_THREAT_TYPE_URL_BINARY_MALWARE));
356 std::vector<SBPrefix> prefixes; 356 std::vector<SBPrefix> prefixes;
357 SafeBrowsingDatabase::GetDownloadUrlPrefixes(url_chain, &prefixes); 357 SafeBrowsingDatabase::GetDownloadUrlPrefixes(url_chain, &prefixes);
358 StartSafeBrowsingCheck( 358 StartSafeBrowsingCheck(
359 std::move(check), 359 std::move(check),
360 base::Bind(&LocalSafeBrowsingDatabaseManager::CheckDownloadUrlOnSBThread, 360 base::Bind(&LocalSafeBrowsingDatabaseManager::CheckDownloadUrlOnSBThread,
361 this, prefixes)); 361 this, prefixes));
362 return false; 362 return false;
363 } 363 }
364 364
365 bool LocalSafeBrowsingDatabaseManager::CheckExtensionIDs( 365 bool LocalSafeBrowsingDatabaseManager::CheckExtensionIDs(
(...skipping 896 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 base::BindOnce(&LocalSafeBrowsingDatabaseManager::TimeoutCallback, 1262 base::BindOnce(&LocalSafeBrowsingDatabaseManager::TimeoutCallback,
1263 check_ptr->weak_ptr_factory_->GetWeakPtr(), check_ptr), 1263 check_ptr->weak_ptr_factory_->GetWeakPtr(), check_ptr),
1264 check_timeout_); 1264 check_timeout_);
1265 } 1265 }
1266 1266
1267 bool LocalSafeBrowsingDatabaseManager::IsDownloadProtectionEnabled() const { 1267 bool LocalSafeBrowsingDatabaseManager::IsDownloadProtectionEnabled() const {
1268 return enable_download_protection_; 1268 return enable_download_protection_;
1269 } 1269 }
1270 1270
1271 } // namespace safe_browsing 1271 } // namespace safe_browsing
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698