diff options
Diffstat (limited to 'chrome/browser/safe_browsing')
-rw-r--r-- | chrome/browser/safe_browsing/protocol_manager.cc | 12 | ||||
-rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_database_bloom.cc | 22 | ||||
-rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_service.cc | 18 |
3 files changed, 26 insertions, 26 deletions
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index eb556c0..f800ce1 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -329,7 +329,7 @@ bool SafeBrowsingProtocolManager::HandleServiceResponse(const GURL& url, // New chunks to download. if (!chunk_urls.empty()) { - UMA_HISTOGRAM_COUNTS(L"SB2.UpdateUrls", chunk_urls.size()); + UMA_HISTOGRAM_COUNTS("SB2.UpdateUrls", chunk_urls.size()); for (size_t i = 0; i < chunk_urls.size(); ++i) chunk_request_urls_.push_back(chunk_urls[i]); } @@ -352,13 +352,13 @@ bool SafeBrowsingProtocolManager::HandleServiceResponse(const GURL& url, } case CHUNK_REQUEST: { if (sb_service_->new_safe_browsing()) - UMA_HISTOGRAM_TIMES(L"SB2.ChunkRequest", + UMA_HISTOGRAM_TIMES("SB2.ChunkRequest", base::Time::Now() - chunk_request_start_); const ChunkUrl chunk_url = chunk_request_urls_.front(); bool re_key = false; std::deque<SBChunk>* chunks = new std::deque<SBChunk>; - UMA_HISTOGRAM_COUNTS(L"SB2.ChunkSize", length); + UMA_HISTOGRAM_COUNTS("SB2.ChunkSize", length); update_size_ += length; if (!parser.ParseChunk(data, length, client_key_, chunk_url.mac, @@ -565,9 +565,9 @@ void SafeBrowsingProtocolManager::OnChunkInserted() { if (chunk_request_urls_.empty()) { // Don't pollute old implementation histograms with new implemetation data. if (sb_service_->new_safe_browsing()) - UMA_HISTOGRAM_LONG_TIMES(L"SB2.Update", Time::Now() - last_update_); + UMA_HISTOGRAM_LONG_TIMES("SB2.Update", Time::Now() - last_update_); else - UMA_HISTOGRAM_LONG_TIMES(L"SB.Update", Time::Now() - last_update_); + UMA_HISTOGRAM_LONG_TIMES("SB.Update", Time::Now() - last_update_); UpdateFinished(true); } else { IssueChunkRequest(); @@ -627,7 +627,7 @@ void SafeBrowsingProtocolManager::HandleGetHashError() { } void SafeBrowsingProtocolManager::UpdateFinished(bool success) { - UMA_HISTOGRAM_COUNTS(L"SB2.UpdateSize", update_size_); + UMA_HISTOGRAM_COUNTS("SB2.UpdateSize", update_size_); update_size_ = 0; sb_service_->UpdateFinished(success); } diff --git a/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc b/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc index 996cb52..e69ae04 100644 --- a/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc +++ b/chrome/browser/safe_browsing/safe_browsing_database_bloom.cc @@ -91,7 +91,7 @@ void SafeBrowsingDatabaseBloom::LoadBloomFilter() { if (!file_util::GetFileSize(bloom_filter_filename_, &size_64) || size_64 == 0) { - UMA_HISTOGRAM_COUNTS(L"SB2.FilterMissing", 1); + UMA_HISTOGRAM_COUNTS("SB2.FilterMissing", 1); return; } @@ -403,7 +403,7 @@ void SafeBrowsingDatabaseBloom::InsertChunks(const std::string& list_name, chunks->pop_front(); } - UMA_HISTOGRAM_TIMES(L"SB2.ChunkInsert", base::Time::Now() - insert_start); + UMA_HISTOGRAM_TIMES("SB2.ChunkInsert", base::Time::Now() - insert_start); delete chunks; @@ -1316,7 +1316,7 @@ void SafeBrowsingDatabaseBloom::BuildBloomFilter() { int rv = insert_transaction_->Commit(); if (rv != SQLITE_OK) { NOTREACHED() << "SafeBrowsing update transaction failed to commit."; - UMA_HISTOGRAM_COUNTS(L"SB2.FailedUpdate", 1); + UMA_HISTOGRAM_COUNTS("SB2.FailedUpdate", 1); return; } @@ -1337,28 +1337,28 @@ void SafeBrowsingDatabaseBloom::BuildBloomFilter() { // Gather statistics. #if defined(OS_WIN) metric->GetIOCounters(&io_after); - UMA_HISTOGRAM_COUNTS(L"SB2.BuildReadBytes", + UMA_HISTOGRAM_COUNTS("SB2.BuildReadBytes", static_cast<int>(io_after.ReadTransferCount - io_before.ReadTransferCount)); - UMA_HISTOGRAM_COUNTS(L"SB2.BuildWriteBytes", + UMA_HISTOGRAM_COUNTS("SB2.BuildWriteBytes", static_cast<int>(io_after.WriteTransferCount - io_before.WriteTransferCount)); - UMA_HISTOGRAM_COUNTS(L"SB2.BuildReadOperations", + UMA_HISTOGRAM_COUNTS("SB2.BuildReadOperations", static_cast<int>(io_after.ReadOperationCount - io_before.ReadOperationCount)); - UMA_HISTOGRAM_COUNTS(L"SB2.BuildWriteOperations", + UMA_HISTOGRAM_COUNTS("SB2.BuildWriteOperations", static_cast<int>(io_after.WriteOperationCount - io_before.WriteOperationCount)); #endif SB_DLOG(INFO) << "SafeBrowsingDatabaseImpl built bloom filter in " << bloom_gen.InMilliseconds() << " ms total. prefix count: "<< add_count_; - UMA_HISTOGRAM_LONG_TIMES(L"SB2.BuildFilter", bloom_gen); - UMA_HISTOGRAM_COUNTS(L"SB2.AddPrefixes", add_count_); - UMA_HISTOGRAM_COUNTS(L"SB2.SubPrefixes", subs); + UMA_HISTOGRAM_LONG_TIMES("SB2.BuildFilter", bloom_gen); + UMA_HISTOGRAM_COUNTS("SB2.AddPrefixes", add_count_); + UMA_HISTOGRAM_COUNTS("SB2.SubPrefixes", subs); int64 size_64; if (file_util::GetFileSize(filename_, &size_64)) - UMA_HISTOGRAM_COUNTS(L"SB2.DatabaseBytes", static_cast<int>(size_64)); + UMA_HISTOGRAM_COUNTS("SB2.DatabaseBytes", static_cast<int>(size_64)); } void SafeBrowsingDatabaseBloom::GetCachedFullHashes( diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index f79c238..04e55a7 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -184,7 +184,7 @@ bool SafeBrowsingService::CheckUrl(const GURL& url, Client* client) { if (!resetting_) { Time start_time = Time::Now(); bool need_check = database_->NeedToCheckUrl(url); - UMA_HISTOGRAM_TIMES(L"SB.BloomFilter", Time::Now() - start_time); + UMA_HISTOGRAM_TIMES("SB.BloomFilter", Time::Now() - start_time); if (!need_check) return true; // The url is definitely safe. } @@ -223,7 +223,7 @@ bool SafeBrowsingService::CheckUrlNew(const GURL& url, Client* client) { &full_hits, protocol_manager_->last_update()); - UMA_HISTOGRAM_TIMES(L"SB2.FilterCheck", base::Time::Now() - check_start); + UMA_HISTOGRAM_TIMES("SB2.FilterCheck", base::Time::Now() - check_start); if (!prefix_match) return true; // URL is okay. @@ -383,7 +383,7 @@ void SafeBrowsingService::OnCheckDone(SafeBrowsingCheck* check) { if (!enabled_ || checks_.find(check) == checks_.end()) return; - UMA_HISTOGRAM_TIMES(L"SB.Database", Time::Now() - check->start); + UMA_HISTOGRAM_TIMES("SB.Database", Time::Now() - check->start); if (check->client && check->need_get_hash) { // We have a partial match so we need to query Google for the full hash. // Clean up will happen in HandleGetHashResults. @@ -464,9 +464,9 @@ void SafeBrowsingService::HandleGetHashResults( DCHECK(enabled_); if (new_safe_browsing_) - UMA_HISTOGRAM_LONG_TIMES(L"SB2.Network", Time::Now() - check->start); + UMA_HISTOGRAM_LONG_TIMES("SB2.Network", Time::Now() - check->start); else - UMA_HISTOGRAM_LONG_TIMES(L"SB.Network", Time::Now() - check->start); + UMA_HISTOGRAM_LONG_TIMES("SB.Network", Time::Now() - check->start); std::vector<SBPrefix> prefixes = check->prefix_hits; OnHandleGetHashResults(check, full_hashes); // 'check' is deleted here. @@ -711,9 +711,9 @@ SafeBrowsingService::UrlCheckResult SafeBrowsingService::GetResultFromListname( void SafeBrowsingService::LogPauseDelay(TimeDelta time) { if (new_safe_browsing_) - UMA_HISTOGRAM_LONG_TIMES(L"SB2.Delay", time); + UMA_HISTOGRAM_LONG_TIMES("SB2.Delay", time); else - UMA_HISTOGRAM_LONG_TIMES(L"SB.Delay", time); + UMA_HISTOGRAM_LONG_TIMES("SB.Delay", time); } void SafeBrowsingService::CacheHashResults( @@ -748,10 +748,10 @@ void SafeBrowsingService::HandleResume() { void SafeBrowsingService::RunQueuedClients() { DCHECK(MessageLoop::current() == io_loop_); - HISTOGRAM_COUNTS(L"SB.QueueDepth", queued_checks_.size()); + HISTOGRAM_COUNTS("SB.QueueDepth", queued_checks_.size()); while (!queued_checks_.empty()) { QueuedCheck check = queued_checks_.front(); - HISTOGRAM_TIMES(L"SB.QueueDelay", Time::Now() - check.start); + HISTOGRAM_TIMES("SB.QueueDelay", Time::Now() - check.start); CheckUrl(check.url, check.client); queued_checks_.pop_front(); } |