Revert of Move fetching logic out of ApplicationManager, eliminate url mappings.

mojo/runner/BUILD.gn

 # 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.
 
 import("//mojo/generate_mojo_shell_assets_list.gni")
 import("//mojo/public/mojo_application.gni")
 import("//testing/test.gni")
 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 
 # We don't support building in the component build since mojo apps are
@@ skipping 78 matching lines @@
     "//mojo/shell",
   ]
 
   deps = [
     "//base",
   ]
 }
 
 source_set("lib") {
   sources = [
+    "about_fetcher.cc",
+    "about_fetcher.h",
     "child_process.cc",
     "child_process.h",
     "child_process_host.cc",
     "child_process_host.h",
     "context.cc",
     "context.h",
     "init.cc",
     "init.h",
     "out_of_process_native_runner.cc",
     "out_of_process_native_runner.h",
     "scoped_user_data_dir.cc",
     "scoped_user_data_dir.h",
     "task_runners.cc",
     "task_runners.h",
+    "url_resolver.cc",
+    "url_resolver.h",
   ]
 
   deps = [
     ":child_process_bindings",
     ":in_process_native_runner",
     ":native_application_support",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//base:base_static",
     "//components/devtools_service/public/cpp",
     "//components/devtools_service/public/interfaces",
     "//mojo/application/public/cpp",
     "//mojo/common:tracing_impl",
-    "//mojo/fetcher",
     "//mojo/message_pump",
     "//mojo/services/network/public/interfaces",
     "//mojo/services/tracing/public/cpp",
     "//mojo/services/tracing/public/interfaces",
     "//mojo/shell",
     "//mojo/util:filename_util",
     "//third_party/mojo/src/mojo/edk/system",
     "//ui/gl",
     "//url",
   ]
@@ skipping 272 matching lines @@
 
   deps = [
     "//mojo/application/public/interfaces",
   ]
 
   import_dirs = [ "//mojo/services" ]
 }
 
 test("mojo_runner_unittests") {
   sources = [
-    "../fetcher/about_fetcher_unittest.cc",
-    "../fetcher/url_resolver_unittest.cc",
+    "about_fetcher_unittest.cc",
     "child_process_host_unittest.cc",
     "data_pipe_peek_unittest.cc",
     "in_process_native_runner_unittest.cc",
     "native_runner_unittest.cc",
     "shell_test_base.cc",
     "shell_test_base.h",
     "shell_test_base_android.cc",
     "shell_test_base_unittest.cc",
     "shell_test_main.cc",
+    "url_resolver_unittest.cc",
   ]
 
   deps = [
     ":in_process_native_runner",
     ":lib",
     "//base",
     "//base:i18n",
     "//base/test:test_support",
     "//mojo/application/public/cpp",
     "//mojo/common",
@@ skipping 38 matching lines @@
   ]
 
   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",
   ]
 }