mojo: remove need for ShellTestBase::InitMojo

mojo/shell/shell_test_base.cc

Index: mojo/shell/shell_test_base.cc
diff --git a/mojo/shell/shell_test_base.cc b/mojo/shell/shell_test_base.cc
index b4f0e4b646ab8c396b79006399a8e639d62df479..de3fd4f432357b25cf26f8869b496c1879444500 100644
--- a/mojo/shell/shell_test_base.cc
+++ b/mojo/shell/shell_test_base.cc
@@ -9,7 +9,6 @@
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "build/build_config.h"
-#include "mojo/shell/context.h"
 #include "net/base/filename_util.h"
 #include "url/gurl.h"
 
@@ -23,20 +22,10 @@ ShellTestBase::ShellTestBase() {
 ShellTestBase::~ShellTestBase() {
 }
 
-void ShellTestBase::InitMojo() {
-  DCHECK(!message_loop_);
-  DCHECK(!shell_context_);
-  message_loop_.reset(new base::MessageLoop());
-  shell_context_.reset(new Context());
-}
-
 void ShellTestBase::LaunchServiceInProcess(
     const GURL& service_url,
     const std::string& service_name,
     ScopedMessagePipeHandle client_handle) {
-  DCHECK(message_loop_);
-  DCHECK(shell_context_);
-
   base::FilePath base_dir = base::MakeAbsoluteFilePath(
       base::CommandLine::ForCurrentProcess()->GetProgram().DirName());
   // On Mac and Windows, libraries are dumped beside the executables.
@@ -46,10 +35,10 @@ void ShellTestBase::LaunchServiceInProcess(
   // On Linux, they're under lib/.
   base::FilePath service_dir(base_dir.AppendASCII("lib"));
 #endif
-  shell_context_->mojo_url_resolver()->set_origin(
+  shell_context_.mojo_url_resolver()->set_origin(
       net::FilePathToFileURL(service_dir).spec());
 
-  shell_context_->service_manager()->ConnectToService(
+  shell_context_.service_manager()->ConnectToService(
       service_url, service_name, client_handle.Pass(), GURL());
 }