Commit ac63420b authored by Xinghui Lu's avatar Xinghui Lu Committed by Commit Bot

Allow GetVerdictCacheManager to return nullptr.

Same as GetPasswordProtectionService, it is ok to return nullptr for
GetVerdictCacheManager, since SafeBrowsingService::GetVerdictCacheManager
already returns nullptr when safe browsing is off.

The validity of cache manager is already measured from the caller:
uma/p/chrome/timeline_v2/?sid=c936612232d60ca29d3ad4da77436787

Bug: 1049694
Change-Id: I53016d115bb33ab37dbd6eb78bca08bcaf9cb91c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2057864Reviewed-by: default avatarVarun Khaneja <vakh@chromium.org>
Commit-Queue: Xinghui Lu <xinghuilu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742462}
parent ec6178ac
...@@ -250,8 +250,11 @@ VerdictCacheManager* SafeBrowsingService::GetVerdictCacheManager( ...@@ -250,8 +250,11 @@ VerdictCacheManager* SafeBrowsingService::GetVerdictCacheManager(
base::WeakPtr<VerdictCacheManager> base::WeakPtr<VerdictCacheManager>
SafeBrowsingService::GetVerdictCacheManagerWeakPtr(Profile* profile) const { SafeBrowsingService::GetVerdictCacheManagerWeakPtr(Profile* profile) const {
if (profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled)) if (profile->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled)) {
return services_delegate_->GetVerdictCacheManager(profile)->GetWeakPtr(); VerdictCacheManager* cache_manager =
services_delegate_->GetVerdictCacheManager(profile);
return cache_manager ? cache_manager->GetWeakPtr() : nullptr;
}
return nullptr; return nullptr;
} }
......
...@@ -86,8 +86,7 @@ VerdictCacheManager* ServicesDelegate::GetVerdictCacheManager( ...@@ -86,8 +86,7 @@ VerdictCacheManager* ServicesDelegate::GetVerdictCacheManager(
Profile* profile) const { Profile* profile) const {
DCHECK(profile); DCHECK(profile);
auto it = cache_manager_map_.find(profile); auto it = cache_manager_map_.find(profile);
DCHECK(it != cache_manager_map_.end()); return it != cache_manager_map_.end() ? it->second.get() : nullptr;
return it->second.get();
} }
void ServicesDelegate::ShutdownServices() { void ServicesDelegate::ShutdownServices() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment