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

mojo/shell/application_manager_unittest.cc

Index: mojo/shell/application_manager_unittest.cc
diff --git a/mojo/shell/application_manager_unittest.cc b/mojo/shell/application_manager_unittest.cc
index 8cc0456236a4cca79976c25cd077e0402bdc86a1..c626b01e557fd0a5c0605e6ff12b388eee6218f3 100644
--- a/mojo/shell/application_manager_unittest.cc
+++ b/mojo/shell/application_manager_unittest.cc
@@ -474,6 +474,16 @@
   void set_mime_type(const std::string& mime_type) { mime_type_ = mime_type; }
 
   // TestPackageManager:
+  GURL ResolveURL(const GURL& url) override {
+    GURL resolved_url = url;
+    // The shell automatically map mojo URLs.
+    if (resolved_url.scheme() == "mojo") {
+      url::Replacements<char> replacements;
+      replacements.SetScheme("file", url::Component(0, 4));
+      resolved_url = resolved_url.ReplaceComponents(replacements);
+    }
+    return resolved_url;
+  }
   void FetchRequest(URLRequestPtr request,
                     const Fetcher::FetchCallback& loader_callback) override {
     if (create_test_fetcher_)