summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoenotcharles <joenotcharles@chromium.org>2016-01-13 22:40:38 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-14 06:41:49 +0000
commit81ebeb8adecb5d85610dbbc40bf07fcc7d83c9d9 (patch)
tree8cb02e043981bc355a0166870384e96e739b9e0c
parentffbee6c4d0eb8e80e741179c1c4b4f790a091ec8 (diff)
downloadchromium_src-81ebeb8adecb5d85610dbbc40bf07fcc7d83c9d9.zip
chromium_src-81ebeb8adecb5d85610dbbc40bf07fcc7d83c9d9.tar.gz
chromium_src-81ebeb8adecb5d85610dbbc40bf07fcc7d83c9d9.tar.bz2
Move SafeBrowsing trace events to the loader category
BUG=576750 Review URL: https://codereview.chromium.org/1582843003 Cr-Commit-Position: refs/heads/master@{#369352}
-rw-r--r--chrome/browser/renderer_host/safe_browsing_resource_throttle.cc2
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_service.cc2
-rw-r--r--components/safe_browsing_db/util.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/renderer_host/safe_browsing_resource_throttle.cc b/chrome/browser/renderer_host/safe_browsing_resource_throttle.cc
index 2247d17..9ed2c95 100644
--- a/chrome/browser/renderer_host/safe_browsing_resource_throttle.cc
+++ b/chrome/browser/renderer_host/safe_browsing_resource_throttle.cc
@@ -322,7 +322,7 @@ void SafeBrowsingResourceThrottle::OnBlockingPageComplete(bool proceed) {
}
bool SafeBrowsingResourceThrottle::CheckUrl(const GURL& url) {
- TRACE_EVENT1("SafeBrowsing", "SafeBrowsingResourceThrottle::CheckUrl", "url",
+ TRACE_EVENT1("loader", "SafeBrowsingResourceThrottle::CheckUrl", "url",
url.spec());
CHECK_EQ(state_, STATE_NONE);
// To reduce aggregate latency on mobile, check only the most dangerous
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index 92479c8..ed7aea9 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -368,7 +368,7 @@ void SafeBrowsingService::AddDownloadManager(
void SafeBrowsingService::OnResourceRequest(const net::URLRequest* request) {
#if defined(FULL_SAFE_BROWSING)
- TRACE_EVENT1("SafeBrowsing", "SafeBrowsingServer::OnResourceRequest", "url",
+ TRACE_EVENT1("loader", "SafeBrowsingService::OnResourceRequest", "url",
request->url().spec());
if (resource_request_detector_)
resource_request_detector_->OnResourceRequest(request);
diff --git a/components/safe_browsing_db/util.cc b/components/safe_browsing_db/util.cc
index 7bc2a7e..a7912e0 100644
--- a/components/safe_browsing_db/util.cc
+++ b/components/safe_browsing_db/util.cc
@@ -305,7 +305,7 @@ void UrlToFullHashes(const GURL& url,
std::vector<SBFullHash>* full_hashes) {
// Include this function in traces because it's not cheap so it should be
// called sparingly.
- TRACE_EVENT2("SafeBrowsing", "UrlToFullHashes", "url", url.spec(),
+ TRACE_EVENT2("loader", "safe_browsing::UrlToFullHashes", "url", url.spec(),
"include_whitelist_hashes", include_whitelist_hashes);
std::vector<std::string> hosts;
if (url.HostIsIPAddress()) {