Revert of Don't use resolved url for instance identity in ApplicationManager

mojo/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_PACKAGE_MANAGER_PACKAGE_MANAGER_IMPL_H_
 #define MOJO_PACKAGE_MANAGER_PACKAGE_MANAGER_IMPL_H_
 
 #include "base/files/file_path.h"
 #include "mojo/fetcher/url_resolver.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
@@ skipping 29 matching lines @@
       const GURL& alias,
       const GURL& content_handler_package,
       const std::string& qualifier);
 
  private:
   using ApplicationPackagedAlias = std::map<GURL, std::pair<GURL, std::string>>;
   using MimeTypeToURLMap = std::map<std::string, GURL>;
 
   // Overridden from shell::PackageManager:
   void SetApplicationManager(shell::ApplicationManager* manager) override;
+  GURL ResolveURL(const GURL& url) override;
   void FetchRequest(
       URLRequestPtr request,
       const shell::Fetcher::FetchCallback& loader_callback) override;
   bool HandleWithContentHandler(shell::Fetcher* fetcher,
-                                const GURL& url,
+                                const GURL& unresolved_url,
                                 base::TaskRunner* task_runner,
                                 URLResponsePtr* new_response,
                                 GURL* content_handler_url,
                                 std::string* qualifier) override;
 
-  GURL ResolveURL(const GURL& url);
 
   shell::ApplicationManager* application_manager_;
   scoped_ptr<fetcher::URLResolver> url_resolver_;
   const bool disable_cache_;
   NetworkServicePtr network_service_;
   URLLoaderFactoryPtr url_loader_factory_;
   ApplicationPackagedAlias application_package_alias_;
   MimeTypeToURLMap mime_type_to_url_;
 
   DISALLOW_COPY_AND_ASSIGN(PackageManagerImpl);
 };
 
 }  // namespace package_manager
 }  // namespace mojo
 
 #endif  // MOJO_PACKAGE_MANAGER_PACKAGE_MANAGER_IMPL_H_