mojo: shell::Context should outlive the shell MessageLoop

mojo/shell/android/mojo_main.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/android/mojo_main.h"
 
 #include "base/android/java_handler_thread.h"
 #include "base/android/jni_string.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 19 matching lines @@
 LazyInstance<scoped_ptr<base::MessageLoop> > g_java_message_loop =
     LAZY_INSTANCE_INITIALIZER;
 
 LazyInstance<scoped_ptr<shell::Context> > g_context =
     LAZY_INSTANCE_INITIALIZER;
 
 LazyInstance<scoped_ptr<base::android::JavaHandlerThread> > g_shell_thread =
     LAZY_INSTANCE_INITIALIZER;
 
 void RunShell(std::vector<GURL> app_urls) {
-  shell::Context* shell_context = new shell::Context();
-  shell_context->set_ui_loop(g_java_message_loop.Get().get());
-
-  g_context.Get().reset(shell_context);
-  shell::Run(shell_context, app_urls);
+  g_context.Get()->Init();
+  g_context.Get()->set_ui_loop(g_java_message_loop.Get().get());
+  shell::Run(g_context.Get().get(), app_urls);
 }
 
 }  // namespace
 
 static void Init(JNIEnv* env, jclass clazz, jobject context) {
   base::android::ScopedJavaLocalRef<jobject> scoped_context(env, context);
 
   base::android::InitApplicationContext(env, scoped_context);
 
   base::CommandLine::Init(0, 0);
   mojo::shell::InitializeLogging();
 
+  // We want ~MessageLoop to happen prior to ~Context. Initializing
+  // LazyInstances is akin to stack-allocating objects; their destructors
+  // will be invoked first-in-last-out.
+  shell::Context* shell_context = new shell::Context();
+  g_context.Get().reset(shell_context);
   g_java_message_loop.Get().reset(new base::MessageLoopForUI);
   base::MessageLoopForUI::current()->Start();
 
   // TODO(abarth): At which point should we switch to cross-platform
   // initialization?
 
   gfx::GLSurface::InitializeOneOff();
 }
 
 static void Start(JNIEnv* env, jclass clazz, jstring jurl) {
@@ skipping 12 matching lines @@
   g_shell_thread.Get()->Start();
   g_shell_thread.Get()->message_loop()->PostTask(
       FROM_HERE, base::Bind(&RunShell, app_urls));
 }
 
 bool RegisterMojoMain(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace mojo