diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-12 21:32:23 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-12 21:32:23 +0000 |
| commit | 68cf384df83820b48633eecc585640125cdc5375 (patch) | |
| tree | 36247b6cc2c2c4f912c7a2fec2cd911b1c178d44 /chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc | |
| parent | 58d0874fb951a874acd91310855c5489b21790be (diff) | |
| download | chromium_src-68cf384df83820b48633eecc585640125cdc5375.zip chromium_src-68cf384df83820b48633eecc585640125cdc5375.tar.gz chromium_src-68cf384df83820b48633eecc585640125cdc5375.tar.bz2 | |
Merge 144583 - sync: fix reentrancy crash in ModelAssociationManager
Don't call OnTypesLoaded unless we're IDLE, since we could be in the middle of some
other process.
Add a CHECK to ensure we don't re-enter ModelAssociationManager::Initialize.
BUG=134550
TEST=trigger unrecoverable error with data type while data type configuration is in progress, don't crash.
Review URL: https://chromiumcodereview.appspot.com/10687002
TBR=tim@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10696207
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@146446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc')
0 files changed, 0 insertions, 0 deletions