Move package_manager into mojo/shell

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 "mojo/fetcher/about_fetcher.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #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/package_manager/package_manager_impl.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
+#include "mojo/shell/package_manager/package_manager_impl.h"
 #include "mojo/util/filename_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace fetcher {
 namespace {
 
 class TestContentHandler : public ApplicationDelegate,
                            public InterfaceFactory<ContentHandler>,
                            public ContentHandler {
@@ skipping 87 matching lines @@
     params->set_services(std::move(service_provider_request));
     application_manager_->ConnectToApplication(std::move(params));
 
     run_loop.Run();
   }
 
   // Overridden from testing::Test:
   void SetUp() override {
     base::FilePath shell_dir;
     PathService::Get(base::DIR_MODULE, &shell_dir);
-    scoped_ptr<package_manager::PackageManagerImpl> package_manager(
-        new package_manager::PackageManagerImpl(shell_dir, nullptr));
+    scoped_ptr<shell::PackageManagerImpl> package_manager(
+      new shell::PackageManagerImpl(shell_dir, nullptr));
     package_manager->RegisterContentHandler(
         "text/html", GURL("test:html_content_handler"));
     application_manager_.reset(
         new shell::ApplicationManager(std::move(package_manager)));
     application_manager_->SetLoaderForURL(
         make_scoped_ptr(new TestLoader(&html_content_handler_)),
         GURL("test:html_content_handler"));
   }
 
   void TearDown() override { application_manager_.reset(); }
@@ skipping 27 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