Restore KeyedServiceFactory diagnostics for context use-after-destroy.

extensions/shell/browser/shell_content_browser_client.cc

Index: extensions/shell/browser/shell_content_browser_client.cc
diff --git a/extensions/shell/browser/shell_content_browser_client.cc b/extensions/shell/browser/shell_content_browser_client.cc
index 49482621dc2794ca8592ca6d185decef39c14571..76ae196be64cba3f61231205e151a7485ea7a5e2 100644
--- a/extensions/shell/browser/shell_content_browser_client.cc
+++ b/extensions/shell/browser/shell_content_browser_client.cc
@@ -12,6 +12,7 @@
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "components/guest_view/browser/guest_view_message_filter.h"
+#include "content/public/browser/browser_main_runner.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/site_instance.h"
@@ -179,6 +180,10 @@ void ShellContentBrowserClient::SiteInstanceGotProcess(
 
 void ShellContentBrowserClient::SiteInstanceDeleting(
     content::SiteInstance* site_instance) {
+  // Don't do anything if we're shutting down.
+  if (content::BrowserMainRunner::ExitedMainMessageLoop())

[sense (YandexTeam), 2017/03/15 08:36:15]

This check was added after fixing ProcessManager shutdown. Without it we have a
situation where ExtensionsRegistry is still alive and GetExtension() can return
valid extension. If we have an extension then we try to remove process from
ProcessMap (code below), but this action fails with the stack:

[6408:16572:0315/131518.862:443049313:FATAL:render_process_host_impl.cc(717)]
Check failed: !BrowserMainRunner::ExitedMainMessageLoop().
Backtrace:
        base::debug::StackTrace::StackTrace [0x000000000046578E+126]
(C:\browser\chromium\dev\src\base\debug\stack_trace_win.cc:217)
        base::debug::StackTrace::StackTrace [0x000000000046484F+31]
(C:\browser\chromium\dev\src\base\debug\stack_trace.cc:199)
        logging::LogMessage::~LogMessage [0x00000000004DC842+82]
(C:\browser\chromium\dev\src\base\logging.cc:537)
        content::RenderProcessHostImpl::RenderProcessHostImpl
[0x0000000182F7F299+2297]
(C:\browser\chromium\dev\src\content\browser\renderer_host\render_process_host_impl.cc:718)
        content::SiteInstanceImpl::GetProcess [0x00000001834E28CC+780]
(C:\browser\chromium\dev\src\content\browser\site_instance_impl.cc:204)
        extensions::ShellContentBrowserClient::SiteInstanceDeleting
[0x0000000141B6DDE8+168]
(C:\browser\chromium\dev\src\extensions\shell\browser\shell_content_browser_client.cc:189)

Maybe there is a better way to fix this?

+    return;
+
   // If this isn't an extension renderer there's nothing to do.
   const Extension* extension = GetExtension(site_instance);
   if (!extension)