Move fetchers into mojo/shell/fetcher

mojo/shell/package_manager/package_manager_impl.h

 // 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.
 
 #ifndef MOJO_SHELL_PACKAGE_MANAGER_PACKAGE_MANAGER_IMPL_H_
 #define MOJO_SHELL_PACKAGE_MANAGER_PACKAGE_MANAGER_IMPL_H_
 
 #include <stdint.h>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
-#include "mojo/fetcher/url_resolver.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader_factory.mojom.h"
+#include "mojo/shell/fetcher/url_resolver.h"
 #include "mojo/shell/package_manager.h"
 
 namespace base {
 class TaskRunner;
 }
 
 namespace mojo {
 class ContentHandler;
 namespace shell {
 class ContentHandlerConnection;
@@ skipping 58 matching lines @@
   // Returns a running ContentHandler for |content_handler_identity|, if there
   // is not one running one is started for |source_identity|.
   ContentHandlerConnection* GetContentHandler(
       const Identity& content_handler_identity,
       const Identity& source_identity);
 
   void OnContentHandlerConnectionClosed(
       ContentHandlerConnection* content_handler);
 
   ApplicationManager* application_manager_;
-  scoped_ptr<fetcher::URLResolver> url_resolver_;
+  scoped_ptr<URLResolver> url_resolver_;
   const bool disable_cache_;
   NetworkServicePtr network_service_;
   URLLoaderFactoryPtr url_loader_factory_;
   ApplicationPackagedAlias application_package_alias_;
   MimeTypeToURLMap mime_type_to_url_;
   IdentityToContentHandlerMap identity_to_content_handler_;
   // Counter used to assign ids to content handlers.
   uint32_t content_handler_id_counter_;
   base::TaskRunner* task_runner_;
   base::FilePath shell_file_root_;
 
   DISALLOW_COPY_AND_ASSIGN(PackageManagerImpl);
 };
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_PACKAGE_MANAGER_PACKAGE_MANAGER_IMPL_H_