| Index: chrome/browser/host_content_settings_map.cc
|
| diff --git a/chrome/browser/host_content_settings_map.cc b/chrome/browser/host_content_settings_map.cc
|
| index 0e10e25a862363b6629da135c0efd1af56217ded..8dc11bdfdf405c7d33f486f176ccfa999ce5f9e3 100644
|
| --- a/chrome/browser/host_content_settings_map.cc
|
| +++ b/chrome/browser/host_content_settings_map.cc
|
| @@ -340,6 +340,8 @@ ContentSettings HostContentSettingsMap::GetContentSettings(
|
| const GURL& url) const {
|
| ContentSettings output = GetNonDefaultContentSettings(url);
|
|
|
| + AutoLock auto_lock(lock_);
|
| +
|
| // Make the remaining defaults explicit.
|
| for (int j = 0; j < CONTENT_SETTINGS_NUM_TYPES; ++j)
|
| if (output.settings[j] == CONTENT_SETTING_DEFAULT ||
|
|
|