Change Mojo URLs to structured names

mojo/shell/background/tests/test_application_catalog_store.cc

 // Copyright 2016 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 "mojo/shell/background/tests/test_application_catalog_store.h"
 
-#include "url/gurl.h"
-
 using package_manager::ApplicationCatalogStore;
 
 namespace mojo {
 namespace shell {
 
 TestApplicationCatalogStore::TestApplicationCatalogStore(
     scoped_ptr<base::ListValue> store)
     : store_(std::move(store)) {}
 
 TestApplicationCatalogStore::~TestApplicationCatalogStore() {}
 
 const base::ListValue* TestApplicationCatalogStore::GetStore() {
   get_store_called_ = true;
   return store_.get();
 }
 
 void TestApplicationCatalogStore::UpdateStore(
     scoped_ptr<base::ListValue> store) {}
 
 scoped_ptr<base::DictionaryValue> BuildPermissiveSerializedAppInfo(
-    const GURL& url,
-    const std::string& name) {
+    const std::string& name,
+    const std::string& display_name) {
   scoped_ptr<base::DictionaryValue> app(new base::DictionaryValue);
-  app->SetString(ApplicationCatalogStore::kUrlKey, url.spec());
   app->SetString(ApplicationCatalogStore::kNameKey, name);
+  app->SetString(ApplicationCatalogStore::kDisplayNameKey, display_name);
 
   scoped_ptr<base::DictionaryValue> capabilities(new base::DictionaryValue);
   scoped_ptr<base::ListValue> interfaces(new base::ListValue);
   interfaces->AppendString("*");
   capabilities->Set("*", std::move(interfaces));
 
   app->Set(ApplicationCatalogStore::kCapabilitiesKey, std::move(capabilities));
 
   return app;
 }
 
 }  // namespace shell
 }  // namespace mojo