| Index: extensions/renderer/dispatcher.cc
|
| diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
|
| index 36134d8788062f22c8bd44f1fccb51943bb7f76a..185d47b24064a92c63d0cb1010553f1b12dfe9c4 100644
|
| --- a/extensions/renderer/dispatcher.cc
|
| +++ b/extensions/renderer/dispatcher.cc
|
| @@ -506,9 +506,10 @@ void Dispatcher::WebKitInitialized() {
|
| }
|
|
|
| void Dispatcher::IdleNotification() {
|
| - if (is_extension_process_) {
|
| + if (is_extension_process_ && forced_idle_timer_) {
|
| // Dampen the forced delay as well if the extension stays idle for long
|
| - // periods of time.
|
| + // periods of time. (forced_idle_timer_ can be NULL after
|
| + // OnRenderProcessShutdown has been called.)
|
| int64 forced_delay_ms =
|
| std::max(RenderThread::Get()->GetIdleNotificationDelayInMs(),
|
| kMaxExtensionIdleHandlerDelayMs);
|
|
|