mojo: shell::Context should outlive the shell MessageLoop

mojo/shell/context.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/shell/context.h"
 
 #include "build/build_config.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 65 matching lines @@
   }
 
   virtual void OnServiceError(ServiceManager* manager,
                               const GURL& url) OVERRIDE {
   }
 
   scoped_ptr<ApplicationImpl> app_;
   DISALLOW_COPY_AND_ASSIGN(NativeViewportServiceLoader);
 };
 
-Context::Context()
-    : task_runners_(base::MessageLoop::current()->message_loop_proxy()) {
+Context::Context() {}

[jamesr, 2014/07/28 20:11:27]

could you DCHECK that base::MessageLoop::current() is NULL here?

[tim (not reviewing), 2014/07/28 22:16:37]

Good idea. Done.

+
+void Context::Init() {
   setup.Get();
+  task_runners_.reset(
+      new TaskRunners(base::MessageLoop::current()->message_loop_proxy()));
 
   for (size_t i = 0; i < arraysize(kLocalMojoURLs); ++i)
     mojo_url_resolver_.AddLocalFileMapping(GURL(kLocalMojoURLs[i]));
 
   base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
   scoped_ptr<DynamicServiceRunnerFactory> runner_factory;
   if (cmdline->HasSwitch(switches::kEnableMultiprocess))
     runner_factory.reset(new OutOfProcessDynamicServiceRunnerFactory());
   else
     runner_factory.reset(new InProcessDynamicServiceRunnerFactory());
@@ skipping 63 matching lines @@
   service_manager_.set_default_loader(scoped_ptr<ServiceLoader>());
   service_manager_.TerminateShellConnections();
 }
 
 Context::~Context() {
   Shutdown();
 }
 
 }  // namespace shell
 }  // namespace mojo