mojo: shell::Context should outlive the shell MessageLoop

mojo/shell/shell_test_helper.cc

Index: mojo/shell/shell_test_helper.cc
diff --git a/mojo/shell/shell_test_helper.cc b/mojo/shell/shell_test_helper.cc
index 37f8ed2e6ca871be00b76a4e5d9e9f11bacdce13..52eebc9d14716197f4309ef15833e7a1205c99d0 100644
--- a/mojo/shell/shell_test_helper.cc
+++ b/mojo/shell/shell_test_helper.cc
@@ -24,17 +24,17 @@ ShellTestHelper::~ShellTestHelper() {
 }
 
 void ShellTestHelper::Init() {
-  context_.reset(new Context);
-  test_api_.reset(new ServiceManager::TestAPI(context_->service_manager()));
+  context_.Init();
+  test_api_.reset(new ServiceManager::TestAPI(context_.service_manager()));
   base::FilePath service_dir;
   CHECK(PathService::Get(base::DIR_MODULE, &service_dir));
-  context_->mojo_url_resolver()->SetBaseURL(
+  context_.mojo_url_resolver()->SetBaseURL(
       net::FilePathToFileURL(service_dir));
 }
 
 void ShellTestHelper::SetLoaderForURL(scoped_ptr<ServiceLoader> loader,
                                       const GURL& url) {
-  context_->service_manager()->SetLoaderForURL(loader.Pass(), url);
+  context_.service_manager()->SetLoaderForURL(loader.Pass(), url);
 }
 
 }  // namespace shell