[modular] Use fuchsia-pkg URLs.

This gets rid of some log spam. But there are more instances left.

TESTED=run_modular_tests.sh

Change-Id: I852cdb56bf585beb85ff15b6ae71e2176d7b7ac2
diff --git a/bin/basemgr/basemgr_settings.cc b/bin/basemgr/basemgr_settings.cc
index 5c504d8..93ebb25 100644
--- a/bin/basemgr/basemgr_settings.cc
+++ b/bin/basemgr/basemgr_settings.cc
@@ -15,11 +15,13 @@
 
 BasemgrSettings::BasemgrSettings(const fxl::CommandLine& command_line) {
   base_shell.url = command_line.GetOptionValueWithDefault(
-      "base_shell", "userpicker_base_shell");
+      "base_shell",
+      "fuchsia-pkg://fuchsia.com/userpicker_base_shell#meta/userpicker_base_shell.cmx");
   story_shell.url =
       command_line.GetOptionValueWithDefault("story_shell", "mondrian");
-  sessionmgr.url =
-      command_line.GetOptionValueWithDefault("sessionmgr", "sessionmgr");
+  sessionmgr.url = command_line.GetOptionValueWithDefault(
+      "sessionmgr",
+      "fuchsia-pkg://fuchsia.com/sessionmgr#meta/sessionmgr.cmx");
   session_shell.url = command_line.GetOptionValueWithDefault(
       "session_shell", "ermine_session_shell");
   account_provider.url = command_line.GetOptionValueWithDefault(
diff --git a/bin/sessionmgr/sessionmgr_impl.cc b/bin/sessionmgr/sessionmgr_impl.cc
index be538a4..72e8998 100644
--- a/bin/sessionmgr/sessionmgr_impl.cc
+++ b/bin/sessionmgr/sessionmgr_impl.cc
@@ -54,18 +54,30 @@
 namespace {
 
 constexpr char kAppId[] = "modular_sessionmgr";
+
 constexpr char kMaxwellComponentNamespace[] = "maxwell";
 constexpr char kMaxwellUrl[] = "maxwell";
-constexpr char kContextEngineUrl[] = "context_engine";
+
+constexpr char kContextEngineUrl[] =
+    "fuchsia-pkg://fuchsia.com/context_engine#meta/context_engine.cmx";
 constexpr char kContextEngineComponentNamespace[] = "context_engine";
-constexpr char kModuleResolverUrl[] = "module_resolver";
+
+constexpr char kModuleResolverUrl[] =
+    "fuchsia-pkg://fuchsia.com/module_resolver#meta/module_resolver.cmx";
+
 constexpr char kUserEnvironmentLabelPrefix[] = "user-";
+
 constexpr char kMessageQueuePath[] = "/data/MESSAGE_QUEUES/v1/";
+
 constexpr char kSessionShellComponentNamespace[] = "user-shell-namespace";
 constexpr char kSessionShellLinkName[] = "user-shell-link";
+
 constexpr char kLedgerDashboardUrl[] = "ledger_dashboard";
 constexpr char kLedgerDashboardEnvLabel[] = "ledger-dashboard";
-constexpr char kClipboardAgentUrl[] = "clipboard_agent";
+
+constexpr char kClipboardAgentUrl[] =
+    "fuchsia-pkg://fuchsia.com/clipboard_agent#meta/clipboard_agent.cmx";
+
 constexpr char kLedgerRepositoryDirectory[] = "/data/LEDGER";
 
 // The name in the outgoing debug directory (hub) for developer session control
diff --git a/bin/sessionmgr/user_intelligence_provider_impl.cc b/bin/sessionmgr/user_intelligence_provider_impl.cc
index b916645..415ded3 100644
--- a/bin/sessionmgr/user_intelligence_provider_impl.cc
+++ b/bin/sessionmgr/user_intelligence_provider_impl.cc
@@ -21,7 +21,8 @@
 
 constexpr char kUsageLogUrl[] = "usage_log";
 constexpr char kKronkUrl[] = "kronk";
-constexpr char kStoryInfoAgentUrl[] = "story_info";
+constexpr char kStoryInfoAgentUrl[] =
+    "fuchsia-pkg://fuchsia.com/story_info#meta/story_info.cmx";
 static constexpr modular::RateLimitedRetry::Threshold kSessionAgentRetryLimit =
     {3, zx::sec(45)};
 
diff --git a/lib/ledger_client/constants.h b/lib/ledger_client/constants.h
index 00c7b7a..18b7f47 100644
--- a/lib/ledger_client/constants.h
+++ b/lib/ledger_client/constants.h
@@ -8,8 +8,9 @@
 namespace modular {
 
 inline constexpr char kCloudProviderFirestoreAppUrl[] =
-    "cloud_provider_firestore";
-inline constexpr char kLedgerAppUrl[] = "ledger";
+    "fuchsia-pkg://fuchsia.com/cloud_provider_firestore#meta/cloud_provider_firestore.cmx";
+inline constexpr char kLedgerAppUrl[] =
+    "fuchsia-pkg://fuchsia.com/ledger#meta/ledger.cmx";
 
 // Hard-coded communal Ledger instance.
 inline constexpr char kFirebaseProjectId[] = "fuchsia-ledger";