Index: chrome/browser/safe_browsing/download_protection_service.cc |
diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc |
index d8bb7267bf001ff228fb38e29a7352464fedc39d..784898f2e67c5fa4751b587f87a24f3838063515 100644 |
--- a/chrome/browser/safe_browsing/download_protection_service.cc |
+++ b/chrome/browser/safe_browsing/download_protection_service.cc |
@@ -1295,7 +1295,7 @@ class DownloadProtectionService::PPAPIDownloadRequest |
} |
void WhitelistCheckComplete(bool was_on_whitelist) { |
- DVLOG(2) << __FUNCTION__ << " was_on_whitelist:" << was_on_whitelist; |
+ DVLOG(2) << __func__ << " was_on_whitelist:" << was_on_whitelist; |
if (was_on_whitelist) { |
RecordCountOfWhitelistedDownload(URL_WHITELIST); |
if (!ShouldSampleWhitelistedDownload()) { |
@@ -1313,7 +1313,7 @@ class DownloadProtectionService::PPAPIDownloadRequest |
} |
void SendRequest() { |
- DVLOG(2) << __FUNCTION__; |
+ DVLOG(2) << __func__; |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
ClientDownloadRequest request; |
@@ -1384,13 +1384,13 @@ class DownloadProtectionService::PPAPIDownloadRequest |
void OnRequestTimedOut() { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
- DVLOG(2) << __FUNCTION__; |
+ DVLOG(2) << __func__; |
Finish(RequestOutcome::TIMEDOUT, UNKNOWN); |
} |
void Finish(RequestOutcome reason, DownloadCheckResult response) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
- DVLOG(2) << __FUNCTION__ << " response: " << response; |
+ DVLOG(2) << __func__ << " response: " << response; |
UMA_HISTOGRAM_SPARSE_SLOWLY( |
"SBClientDownload.base::RunLoop()DownloadRequest.RequestOutcome", |
static_cast<int>(reason)); |
@@ -1596,7 +1596,7 @@ void DownloadProtectionService::CheckPPAPIDownloadRequest( |
const std::vector<base::FilePath::StringType>& alternate_extensions, |
Profile* profile, |
const CheckDownloadCallback& callback) { |
- DVLOG(1) << __FUNCTION__ << " url:" << requestor_url |
+ DVLOG(1) << __func__ << " url:" << requestor_url |
<< " default_file_path:" << default_file_path.value(); |
std::unique_ptr<PPAPIDownloadRequest> request(new PPAPIDownloadRequest( |
requestor_url, default_file_path, alternate_extensions, profile, callback, |