Don't use resolved url for instance identity in ApplicationManager

R=yzshen@chromium.org
http://crbug.com/533085

Review URL: https://codereview.chromium.org/1346143004

Cr-Commit-Position: refs/heads/master@{#349541}

2 files changed, 9 insertions, 10 deletions

diff --git a/mojo/package_manager/package_manager_impl.cc b/mojo/package_manager/package_manager_impl.cc
index 8d8e19e..b85e9de 100644
--- a/mojo/package_manager/package_manager_impl.cc
+++ b/mojo/package_manager/package_manager_impl.cc
@@ -56,10 +56,6 @@ void PackageManagerImpl::SetApplicationManager(
   application_manager_ = manager;
 }
 
-GURL PackageManagerImpl::ResolveURL(const GURL& url) {
-  return url_resolver_.get() ? url_resolver_->ResolveMojoURL(url) : url;
-}
-
 void PackageManagerImpl::FetchRequest(
     URLRequestPtr request,
     const shell::Fetcher::FetchCallback& loader_callback) {
@@ -75,7 +71,6 @@ void PackageManagerImpl::FetchRequest(
   }
 
   GURL resolved_url = ResolveURL(url);
-
   if (resolved_url.SchemeIsFile()) {
     // LocalFetcher uses the network service to infer MIME types from URLs.
     // Skip this for mojo URLs to avoid recursively loading the network service.
@@ -121,7 +116,7 @@ void PackageManagerImpl::FetchRequest(
 }
 
 bool PackageManagerImpl::HandleWithContentHandler(shell::Fetcher* fetcher,
-                                                  const GURL& unresolved_url,
+                                                  const GURL& url,
                                                   base::TaskRunner* task_runner,
                                                   URLResponsePtr* new_response,
                                                   GURL* content_handler_url,
@@ -152,11 +147,11 @@ bool PackageManagerImpl::HandleWithContentHandler(shell::Fetcher* fetcher,
   }
 
   // The response URL matches a registered content handler.
-  auto alias_iter = application_package_alias_.find(unresolved_url);
+  auto alias_iter = application_package_alias_.find(url);
   if (alias_iter != application_package_alias_.end()) {
     // We replace the qualifier with the one our package alias requested.
     *new_response = URLResponse::New();
-    (*new_response)->url = unresolved_url.spec();
+    (*new_response)->url = url.spec();
 
     // Why can't we use this in single process mode? Because of
     // base::AtExitManager. If you link in ApplicationRunner into your code, and
@@ -176,5 +171,9 @@ bool PackageManagerImpl::HandleWithContentHandler(shell::Fetcher* fetcher,
   return false;
 }
 
+GURL PackageManagerImpl::ResolveURL(const GURL& url) {
+  return url_resolver_.get() ? url_resolver_->ResolveMojoURL(url) : url;
+}
+
 }  // namespace package_manager
 }  // namespace mojo
diff --git a/mojo/package_manager/package_manager_impl.h b/mojo/package_manager/package_manager_impl.h
index 56961be4..19620cf 100644
--- a/mojo/package_manager/package_manager_impl.h
+++ b/mojo/package_manager/package_manager_impl.h
@@ -47,17 +47,17 @@ class PackageManagerImpl : public shell::PackageManager {
 
   // 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& unresolved_url,
+                                const GURL& 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_;