Index: content/browser/browser_main_loop.cc |
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
index 17c6ebedb1ff5c38473b8ce8f60fdef1305d5d12..01b7be0ad159ad7fa6f4d52c929c4aebfd87d6dc 100644 |
--- a/content/browser/browser_main_loop.cc |
+++ b/content/browser/browser_main_loop.cc |
@@ -49,6 +49,7 @@ |
#include "content/public/browser/browser_main_parts.h" |
#include "content/public/browser/browser_shutdown.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" |
@@ -846,6 +847,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(); |
@@ -1204,6 +1207,9 @@ int BrowserMainLoop::BrowserThreadsStarted() { |
#endif // !defined(OS_IOS) |
+ mojo_shell_context_ = MojoShellContext::Create(); |
+ GetContentClient()->browser()->ConfigureMojoShell(mojo_shell_context_.get()); |
+ |
return result_code_; |
} |