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

mojo/package_manager/package_manager_impl.h

Index: mojo/package_manager/package_manager_impl.h
diff --git a/mojo/package_manager/package_manager_impl.h b/mojo/package_manager/package_manager_impl.h
index 19620cf5f9079852030043a76bf966e5415de382..56961be4ba1b2a11888fe7543d642e59856109b8 100644
--- a/mojo/package_manager/package_manager_impl.h
+++ b/mojo/package_manager/package_manager_impl.h
@@ -47,17 +47,17 @@
 
   // 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_;