Fix android tests.

shell/shell_test_base.cc

 // Copyright 2014 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 "shell/shell_test_base.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "build/build_config.h"
 #include "shell/filename_util.h"
 #include "url/gurl.h"
 
 namespace mojo {
 namespace shell {
 namespace test {
 
 ShellTestBase::ShellTestBase() {
 }
 
 ShellTestBase::~ShellTestBase() {
 }
 
 void ShellTestBase::SetUp() {
+  shell_context_.Init();
   SetUpTestApplications();

[qsr, 2015/01/28 16:22:45]

The issue there is that Init is calling SetBaseURL, so the changes in
SetUpTestApplications were not taken into account.

I'm not sure it is such a good idea that Init will erase some pre configuration,
but if this is the intention, then calling anything on the context that might be
overridden should CHECK(false).

-  shell_context_.Init();
 }
 
 ScopedMessagePipeHandle ShellTestBase::ConnectToService(
     const GURL& application_url,
     const std::string& service_name) {
   return shell_context_.ConnectToServiceByName(application_url, service_name)
       .Pass();
 }
 
 #if !defined(OS_ANDROID)
 void ShellTestBase::SetUpTestApplications() {
   // Set the MojoURLResolver origin to be the same as the base file path for
   // local files. This is primarily for test convenience, so that references
   // to unknown mojo: urls that do not have specific local file or custom
   // mappings registered on the URL resolver are treated as shared libraries.
   base::FilePath service_dir;
   CHECK(PathService::Get(base::DIR_MODULE, &service_dir));
   shell_context_.mojo_url_resolver()->SetBaseURL(
       FilePathToFileURL(service_dir));
 }
 #endif
 
 }  // namespace test
 }  // namespace shell
 }  // namespace mojo