Clean up the runner directory.

- Remove obsolete or unnecessary tests
- Move fetcher/data_pipe_peek tests to mojo_shell_unittests
- Run the new mojo_runner_host_unittests.

R=sky@chromium.org
BUG=none

Review URL: https://codereview.chromium.org/1439523002

Cr-Commit-Position: refs/heads/master@{#359163}

mojo/BUILD.gn

@@ -96,8 +96,6 @@ group("tests") {
 
   deps += [
     "//mojo/package_manager:unittests",
-    "//mojo/runner:apptests",
-    "//mojo/runner:mojo_runner_unittests",
     "//mojo/services/network:apptests",
     "//mojo/shell:mojo_shell_unittests",
   ]

mojo/fetcher/about_fetcher_unittest.cc

@@ -16,7 +16,6 @@
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/fetcher/about_fetcher.h"
 #include "mojo/package_manager/package_manager_impl.h"
-#include "mojo/runner/context.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/util/filename_util.h"
@@ -124,7 +123,6 @@ class AboutFetcherTest : public testing::Test {
 
   // Overridden from testing::Test:
   void SetUp() override {
-    runner::Context::EnsureEmbedderIsInitialized();
     base::FilePath shell_dir;
     PathService::Get(base::DIR_MODULE, &shell_dir);
     scoped_ptr<package_manager::PackageManagerImpl> package_manager(

mojo/fetcher/data_fetcher_unittest.cc

@@ -11,7 +11,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "mojo/runner/context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
 
@@ -57,9 +56,6 @@ class DataFetcherTest : public testing::Test {
   ~DataFetcherTest() override {}
 
  protected:
-  // Overridden from testing::Test:
-  void SetUp() override { runner::Context::EnsureEmbedderIsInitialized(); }
-
   void TestFetchURL(const std::string& url,
                     uint32_t expected_status_code,
                     const std::string& expected_mime_type,

mojo/fetcher/network_fetcher_unittest.cc

@@ -12,7 +12,6 @@
 #include "base/run_loop.h"
 #include "mojo/fetcher/network_fetcher.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
-#include "mojo/runner/context.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -121,7 +120,6 @@ class NetworkFetcherTest : public testing::Test {
  protected:
   // Overridden from testing::Test:
   void SetUp() override {
-    runner::Context::EnsureEmbedderIsInitialized();
     // Automatically destroyed when |url_loader_factory_| is closed.
     new TestURLLoaderFactoryImpl(GetProxy(&url_loader_factory_));
   }

mojo/runner/BUILD.gn

@@ -13,6 +13,7 @@ group("runner") {
   deps = [
     ":mojo_runner",
     "//mojo/runner/child",
+    "//mojo/runner/host",
   ]
 }
 
@@ -201,7 +202,6 @@ if (is_android) {
       "android/apk/src/org/chromium/mojo/shell/AndroidHandler.java",
       "android/apk/src/org/chromium/mojo/shell/Bootstrap.java",
       "android/apk/src/org/chromium/mojo/shell/ShellMain.java",
-      "android/tests/src/org/chromium/mojo/shell/ShellTestBase.java",
     ]
     jni_package = "mojo/shell"
   }
@@ -362,89 +362,4 @@ if (is_android) {
     ]
     dir = mojo_runner_test_assets_dir
   }
-
-  android_library("mojo_runner_tests_java") {
-    java_files =
-        [ "android/tests/src/org/chromium/mojo/shell/ShellTestBase.java" ]
-
-    deps = [
-      ":java",
-      "//base:base_java",
-    ]
-  }
-}
-
-test("mojo_runner_unittests") {
-  sources = [
-    "../fetcher/about_fetcher_unittest.cc",
-    "../fetcher/data_fetcher_unittest.cc",
-    "../fetcher/network_fetcher_unittest.cc",
-    "../fetcher/url_resolver_unittest.cc",
-    "data_pipe_peek_unittest.cc",
-    "native_runner_unittest.cc",
-    "register_local_aliases.cc",
-    "register_local_aliases.h",
-    "shell_test_base.cc",
-    "shell_test_base.h",
-    "shell_test_base_android.cc",
-    "shell_test_base_unittest.cc",
-    "shell_test_main.cc",
-  ]
-
-  deps = [
-    ":lib",
-    "//base",
-    "//base:i18n",
-    "//base/test:test_support",
-    "//mojo/application/public/cpp",
-    "//mojo/common",
-    "//mojo/environment:chromium",
-    "//mojo/fetcher",
-    "//mojo/message_pump",
-    "//mojo/package_manager",
-    "//mojo/services/test_service:bindings",
-    "//mojo/shell",
-    "//mojo/util:filename_util",
-    "//testing/gtest",
-    "//third_party/mojo/src/mojo/edk/system",
-    "//third_party/mojo/src/mojo/public/cpp/bindings",
-    "//url",
-  ]
-
-  data_deps = [
-    "//mojo/services/test_service:test_app",
-    "//mojo/services/test_service:test_request_tracker_app",
-  ]
-
-  if (is_android) {
-    sources += [ "android/background_application_loader_unittest.cc" ]
-
-    deps += [ ":jni_headers" ]
-
-    apk_deps = [
-      ":build_mojo_runner_test_assets",
-      ":mojo_runner_tests_java",
-    ]
-
-    apk_asset_location = mojo_runner_test_assets_dir
-  }
-}
-
-mojo_native_application("apptests") {
-  output_name = "runner_apptests"
-
-  testonly = true
-
-  sources = [
-    # TODO(jam): needs http_server service. http://crbug.com/479316
-    #"shell_apptest.cc",
-  ]
-
-  deps = [
-    "//base",
-    "//mojo/application/public/cpp:test_support",
-    "//mojo/runner/test:bindings",
-    "//mojo/services/network/public/interfaces",
-    "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
-  ]
 }

mojo/runner/host/BUILD.gn

@@ -12,7 +12,7 @@ group("host") {
 
   deps = [
     ":lib",
-    ":unittests",
+    ":mojo_runner_host_unittests",
   ]
 }
 
@@ -86,9 +86,7 @@ source_set("lib") {
   }
 }
 
-test("unittests") {
-  output_name = "mojo_runner_host_unittests"
-
+test("mojo_runner_host_unittests") {
   sources = [
     "child_process_host_unittest.cc",
     "host_unittests.cc",