Revert of Extract some stuff into PackageManager

mojo/fetcher/about_fetcher_unittest.cc

Index: mojo/fetcher/about_fetcher_unittest.cc
diff --git a/mojo/fetcher/about_fetcher_unittest.cc b/mojo/fetcher/about_fetcher_unittest.cc
index b69d349eb2a387ccffdae470c5c84863b1d36454..79c487a21d4b950b4e1e29d3dd247746814ccbd0 100644
--- a/mojo/fetcher/about_fetcher_unittest.cc
+++ b/mojo/fetcher/about_fetcher_unittest.cc
@@ -15,7 +15,7 @@
 #include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/fetcher/about_fetcher.h"
-#include "mojo/package_manager/package_manager_impl.h"
+#include "mojo/fetcher/base_application_fetcher.h"
 #include "mojo/runner/context.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
@@ -125,15 +125,13 @@
     runner::Context::EnsureEmbedderIsInitialized();
     base::FilePath shell_dir;
     PathService::Get(base::DIR_MODULE, &shell_dir);
-    scoped_ptr<package_manager::PackageManagerImpl> package_manager(
-        new package_manager::PackageManagerImpl(shell_dir));
-    package_manager->RegisterContentHandler(
-        "text/html", GURL("test:html_content_handler"));
-    application_manager_.reset(
-        new shell::ApplicationManager(package_manager.Pass()));
+    application_manager_.reset(new shell::ApplicationManager(
+        make_scoped_ptr(new BaseApplicationFetcher(shell_dir))));
     application_manager_->SetLoaderForURL(
         make_scoped_ptr(new TestLoader(&html_content_handler_)),
         GURL("test:html_content_handler"));
+    application_manager_->RegisterContentHandler(
+        "text/html", GURL("test:html_content_handler"));
   }
 
   void TearDown() override { application_manager_.reset(); }