diff options
Diffstat (limited to 'chrome/browser/safe_browsing')
5 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/safe_browsing/browser_feature_extractor.cc b/chrome/browser/safe_browsing/browser_feature_extractor.cc index a40c66d..48c166c 100644 --- a/chrome/browser/safe_browsing/browser_feature_extractor.cc +++ b/chrome/browser/safe_browsing/browser_feature_extractor.cc @@ -133,7 +133,7 @@ BrowserFeatureExtractor::BrowserFeatureExtractor( ClientSideDetectionService* service) : tab_(tab), service_(service), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) { + weak_factory_(this) { DCHECK(tab); } diff --git a/chrome/browser/safe_browsing/client_side_detection_host.cc b/chrome/browser/safe_browsing/client_side_detection_host.cc index 1b4900b..d9107dd 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host.cc @@ -248,7 +248,7 @@ ClientSideDetectionHost* ClientSideDetectionHost::Create( ClientSideDetectionHost::ClientSideDetectionHost(WebContents* tab) : content::WebContentsObserver(tab), csd_service_(NULL), - weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)), + weak_factory_(this), unsafe_unique_page_id_(-1) { DCHECK(tab); // Note: csd_service_ and sb_service will be NULL here in testing. diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc index 2d190b9..0a4f445 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc @@ -70,7 +70,7 @@ ClientSideDetectionService::CacheState::CacheState(bool phish, base::Time time) ClientSideDetectionService::ClientSideDetectionService( net::URLRequestContextGetter* request_context_getter) : enabled_(false), - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)), + weak_factory_(this), request_context_getter_(request_context_getter) { registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CREATED, content::NotificationService::AllBrowserContextsAndSources()); diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc index a46d678..fb18d94 100644 --- a/chrome/browser/safe_browsing/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection_service.cc @@ -290,7 +290,7 @@ class DownloadProtectionService::CheckClientDownloadRequest pingback_enabled_(service_->enabled()), finished_(false), type_(ClientDownloadRequest::WIN_EXECUTABLE), - ALLOW_THIS_IN_INITIALIZER_LIST(weakptr_factory_(this)), + weakptr_factory_(this), start_time_(base::TimeTicks::Now()) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); item_->AddObserver(this); diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc index 6304a39..c969b66 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database.cc @@ -427,7 +427,7 @@ SafeBrowsingDatabaseNew::SafeBrowsingDatabaseNew() download_store_(NULL), csd_whitelist_store_(NULL), download_whitelist_store_(NULL), - ALLOW_THIS_IN_INITIALIZER_LIST(reset_factory_(this)), + reset_factory_(this), corruption_detected_(false), change_detected_(false) { DCHECK(browse_store_.get()); @@ -449,7 +449,7 @@ SafeBrowsingDatabaseNew::SafeBrowsingDatabaseNew( csd_whitelist_store_(csd_whitelist_store), download_whitelist_store_(download_whitelist_store), extension_blacklist_store_(extension_blacklist_store), - ALLOW_THIS_IN_INITIALIZER_LIST(reset_factory_(this)), + reset_factory_(this), corruption_detected_(false) { DCHECK(browse_store_.get()); } |