diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 16:55:12 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 16:55:12 +0000 |
| commit | 92da891bc027629506c4bbec8323a50efffce219 (patch) | |
| tree | 2fc1d60edcc6b9e2a5dcd575aab47d0503b79ba1 /chrome/browser/extensions/extension_tts_engine_api.cc | |
| parent | 65050bb568fc85a6b7af9d264ce5439be91efb94 (diff) | |
| download | chromium_src-92da891bc027629506c4bbec8323a50efffce219.zip chromium_src-92da891bc027629506c4bbec8323a50efffce219.tar.gz chromium_src-92da891bc027629506c4bbec8323a50efffce219.tar.bz2 | |
Fix crash when TTS utterances are queued on shutdown.
BUG=99126
TEST=Adds new unit test.
Review URL: http://codereview.chromium.org/8437080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tts_engine_api.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_tts_engine_api.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_tts_engine_api.cc b/chrome/browser/extensions/extension_tts_engine_api.cc index fe845932..5eb86b9 100644 --- a/chrome/browser/extensions/extension_tts_engine_api.cc +++ b/chrome/browser/extensions/extension_tts_engine_api.cc @@ -80,6 +80,11 @@ bool GetMatchingExtensionVoice( Utterance* utterance, const Extension** matching_extension, size_t* voice_index) { + // This will only happen during unit testing. Otherwise, an utterance + // will always have an associated profile. + if (!utterance->profile()) + return false; + ExtensionService* service = utterance->profile()->GetExtensionService(); DCHECK(service); ExtensionEventRouter* event_router = |