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

mojo/shell/application_manager_unittest.cc

 // Copyright 2014 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.
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 456 matching lines @@
 
   void set_create_test_fetcher(bool create_test_fetcher) {
     create_test_fetcher_ = create_test_fetcher;
   }
 
   void set_fetcher_url(const GURL& url) { fetcher_url_ = url; }
 
   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_)
       new TestMimeTypeFetcher(loader_callback, fetcher_url_, mime_type_);
   }
 
  private:
   bool create_test_fetcher_;
   GURL fetcher_url_;
   std::string mime_type_;
@@ skipping 418 matching lines @@
   params->set_filter(GetPermissiveCapabilityFilter());
   params->set_connect_callback(
       [&content_handler_id](uint32_t t) { content_handler_id = t; });
   application_manager_->ConnectToApplication(params.Pass());
   EXPECT_EQ(0u, content_handler_id);
 }
 
 }  // namespace
 }  // namespace shell
 }  // namespace mojo