Index: chrome/browser/extensions/extension_content_settings_store.cc |
diff --git a/chrome/browser/extensions/extension_content_settings_store.cc b/chrome/browser/extensions/extension_content_settings_store.cc |
index 14713a1cdc41c1d84121635426f1843bc97ffb65..78614b190fd084bfaf061077a78232ce16e79597 100644 |
--- a/chrome/browser/extensions/extension_content_settings_store.cc |
+++ b/chrome/browser/extensions/extension_content_settings_store.cc |
@@ -194,16 +194,19 @@ const OriginIdentifierValueMap* ExtensionContentSettingsStore::GetValueMap( |
const std::string& ext_id, |
ExtensionPrefsScope scope) const { |
ExtensionEntryMap::const_iterator i = FindEntry(ext_id); |
- if (i != entries_.end()) { |
- switch (scope) { |
- case kExtensionPrefsScopeRegular: |
- return &(i->second->settings); |
- case kExtensionPrefsScopeIncognitoPersistent: |
- return &(i->second->incognito_persistent_settings); |
- case kExtensionPrefsScopeIncognitoSessionOnly: |
- return &(i->second->incognito_session_only_settings); |
- } |
+ if (i == entries_.end()) |
+ return NULL; |
+ |
+ switch (scope) { |
+ case kExtensionPrefsScopeRegular: |
+ return &(i->second->settings); |
+ case kExtensionPrefsScopeIncognitoPersistent: |
+ return &(i->second->incognito_persistent_settings); |
+ case kExtensionPrefsScopeIncognitoSessionOnly: |
+ return &(i->second->incognito_session_only_settings); |
} |
+ |
+ NOTREACHED(); |
return NULL; |
} |
@@ -214,6 +217,8 @@ void ExtensionContentSettingsStore::ClearContentSettingsForExtension( |
{ |
base::AutoLock lock(lock_); |
OriginIdentifierValueMap* map = GetValueMap(ext_id, scope); |
+ if (!map) |
+ return; |
notify = !map->empty(); |
map->clear(); |
} |