Extract some stuff into PackageManager

mojo/fetcher/about_fetcher_unittest.cc

 // Copyright 2015 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 "base/at_exit.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/interface_factory.h"
 #include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/fetcher/about_fetcher.h"
-#include "mojo/fetcher/base_application_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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace fetcher {
 namespace {
 
@@ skipping 89 matching lines @@
         shell::EmptyConnectCallback());
 
     run_loop.Run();
   }
 
   // Overridden from testing::Test:
   void SetUp() override {
     runner::Context::EnsureEmbedderIsInitialized();
     base::FilePath shell_dir;
     PathService::Get(base::DIR_MODULE, &shell_dir);
-    application_manager_.reset(new shell::ApplicationManager(
-        make_scoped_ptr(new BaseApplicationFetcher(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_->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(); }
 
  private:
   base::ShadowingAtExitManager at_exit_;
   TestContentHandler html_content_handler_;
   base::MessageLoop loop_;
   scoped_ptr<shell::ApplicationManager> application_manager_;
 
@@ skipping 20 matching lines @@
   const URLResponse* response = html_content_handler()->latest_response();
   EXPECT_EQ("about:some_unrecognized_url", response->url);
   EXPECT_EQ(404u, response->status_code);
   EXPECT_EQ("text/html", response->mime_type);
   EXPECT_FALSE(response->body.is_valid());
 }
 
 }  // namespace
 }  // namespace fetcher
 }  // namespace mojo