Index: content/browser/browser_main_loop.cc |
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
index 50d0d8260023e27e578585f37344b5151a9b4a86..4c988c3d414fcdbb7f323d2b09866db75f03592b 100644 |
--- a/content/browser/browser_main_loop.cc |
+++ b/content/browser/browser_main_loop.cc |
@@ -51,6 +51,7 @@ |
#include "content/common/host_shared_bitmap_manager.h" |
#include "content/public/browser/browser_main_parts.h" |
#include "content/public/browser/content_browser_client.h" |
+#include "content/public/browser/mojo_shell_context.h" |
#include "content/public/browser/render_process_host.h" |
#include "content/public/browser/tracing_controller.h" |
#include "content/public/common/content_switches.h" |
@@ -867,6 +868,8 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() { |
base::Bind(base::IgnoreResult(&base::ThreadRestrictions::SetIOAllowed), |
true)); |
+ mojo_shell_context_.reset(); |
+ |
#if !defined(OS_IOS) |
if (RenderProcessHost::run_renderer_in_process()) |
RenderProcessHostImpl::ShutDownInProcessRenderer(); |
@@ -1223,6 +1226,8 @@ int BrowserMainLoop::BrowserThreadsStarted() { |
#endif // !defined(OS_IOS) |
+ mojo_shell_context_ = MojoShellContext::Create(); |
+ |
return result_code_; |
} |