chrome/browser/safe_browsing/safe_browsing_service.cc - Issue 2061593002: Fix crash when switching to a profile that cannot be opened

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/safe_browsing/safe_browsing_service.cc

Issue 2061593002: Fix crash when switching to a profile that cannot be opened (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bug-614753-fix

Patch Set: Respond to pkasting@'s comments Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/profiles/profile_manager_browsertest.cc ('K') | « chrome/browser/profiles/profile_window.cc ('k') | chrome/browser/ui/profile_error_dialog.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/safe_browsing_service.cc

diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc

index ce6cb4def26772497f10c0638b56e37d837d451d..a5fdb281cc2becfc7de484bc3e8fb0e0e9ccee76 100644

--- a/chrome/browser/safe_browsing/safe_browsing_service.cc

+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc

@@ -642,12 +642,12 @@ void SafeBrowsingService::AddPrefService(PrefService* pref_service) {

}

void SafeBrowsingService::RemovePrefService(PrefService* pref_service) {

+ // It is possible to have RemovePrefService called without a prior call to

+ // AddPrefService if profile initialization fails.

if (prefs_map_.find(pref_service) != prefs_map_.end()) {

delete prefs_map_[pref_service];

prefs_map_.erase(pref_service);

RefreshState();

- } else {

- NOTREACHED();

}