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

Unified Diff: chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector.cc

Issue 1420053005: Move code in components/safe_browsing_db and chrome/browser/s_b/ under the safe_browsing namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@02_components_move
Patch Set: Merging the latest changes from trunk. Created 5 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/incident_reporting/off_domain_inclusion_detector.cc
diff --git a/chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector.cc b/chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector.cc
index ed258e7d127cdbc0407dceac869582b6067434cd..dda84689bfb09e7c16ad920d05038c612ad35747 100644
--- a/chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/off_domain_inclusion_detector.cc
@@ -56,13 +56,14 @@ struct OffDomainInclusionDetector::OffDomainInclusionInfo {
};
OffDomainInclusionDetector::OffDomainInclusionDetector(
- const scoped_refptr<SafeBrowsingDatabaseManager>& database_manager)
+ const scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>&
Nathan Parker 2015/11/05 22:00:52 using safe_browsing::SafeBrowsingDatabaseManager
vakh (old account. dont use) 2015/11/07 01:22:56 Done.
+ database_manager)
: OffDomainInclusionDetector(database_manager,
- ReportAnalysisEventCallback()) {
-}
+ ReportAnalysisEventCallback()) {}
OffDomainInclusionDetector::OffDomainInclusionDetector(
- const scoped_refptr<SafeBrowsingDatabaseManager>& database_manager,
+ const scoped_refptr<safe_browsing::SafeBrowsingDatabaseManager>&
+ database_manager,
const ReportAnalysisEventCallback& report_analysis_event_callback)
: database_manager_(database_manager),
report_analysis_event_callback_(report_analysis_event_callback),
@@ -220,7 +221,8 @@ void OffDomainInclusionDetector::BeginAnalysis(
const GURL copied_request_url(off_domain_inclusion_info->request_url);
BrowserThread::PostTaskAndReplyWithResult(
BrowserThread::IO, FROM_HERE,
- base::Bind(&SafeBrowsingDatabaseManager::MatchInclusionWhitelistUrl,
+ base::Bind(&safe_browsing::SafeBrowsingDatabaseManager::
+ MatchInclusionWhitelistUrl,
database_manager_, copied_request_url),
base::Bind(
&OffDomainInclusionDetector::ContinueAnalysisOnWhitelistResult,

Powered by Google App Engine
This is Rietveld 408576698