Revert of Extract some stuff into PackageManager

mojo/mojo_shell.gyp

Index: mojo/mojo_shell.gyp
diff --git a/mojo/mojo_shell.gyp b/mojo/mojo_shell.gyp
index 62bba848a053cd3e02be5d1676d146bc36e9c140..598ef3dd115cd5283b7fe7bfd046a2e5a767bea5 100644
--- a/mojo/mojo_shell.gyp
+++ b/mojo/mojo_shell.gyp
@@ -25,7 +25,6 @@
       'shell/identity.cc',
       'shell/identity.h',
       'shell/native_runner.h',
-      'shell/package_manager.h',
       'shell/query_util.cc',
       'shell/query_util.h',
       'shell/static_application_loader.cc',
@@ -51,6 +50,8 @@
     'sources': [
       'fetcher/about_fetcher.cc',
       'fetcher/about_fetcher.h',
+      'fetcher/base_application_fetcher.cc',
+      'fetcher/base_application_fetcher.h',
       'fetcher/local_fetcher.cc',
       'fetcher/local_fetcher.h',
       'fetcher/network_fetcher.cc',
@@ -61,8 +62,6 @@
       'fetcher/update_fetcher.h',
       'fetcher/url_resolver.cc',
       'fetcher/url_resolver.h',
-      'package_manager/package_manager_impl.cc',
-      'package_manager/package_manager_impl.h',
     ],
     'dependencies': [
       '<(DEPTH)/base/base.gyp:base',
@@ -85,8 +84,6 @@
       'shell/application_manager_unittest.cc',
       'shell/capability_filter_unittest.cc',
       'shell/query_util_unittest.cc',
-      'shell/test_package_manager.cc',
-      'shell/test_package_manager.h',
     ],
     'dependencies': [
       '<(DEPTH)/mojo/mojo_shell.gyp:mojo_shell_lib',