3 files changed, 6 insertions, 4 deletions
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.cc b/ppapi/native_client/src/trusted/plugin/plugin.cc
index c89daa0..9f35eb7 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.cc
+++ b/ppapi/native_client/src/trusted/plugin/plugin.cc
@@ -605,7 +605,7 @@ bool Plugin::LoadNaClModuleCommon(nacl::DescWrapper* wrapper,
   }
 
   bool service_runtime_started =
-      new_service_runtime->Start(wrapper, error_info);
+      new_service_runtime->Start(wrapper, error_info, manifest_base_url());
   PLUGIN_PRINTF(("Plugin::LoadNaClModuleCommon (service_runtime_started=%d)\n",
                  service_runtime_started));
   if (!service_runtime_started) {
diff --git a/ppapi/native_client/src/trusted/plugin/service_runtime.cc b/ppapi/native_client/src/trusted/plugin/service_runtime.cc
index 7ac2792..e8817318 100644
--- a/ppapi/native_client/src/trusted/plugin/service_runtime.cc
+++ b/ppapi/native_client/src/trusted/plugin/service_runtime.cc
@@ -658,7 +658,7 @@ bool ServiceRuntime::InitCommunication(nacl::DescWrapper* nacl_desc,
 }
 
 bool ServiceRuntime::Start(nacl::DescWrapper* nacl_desc,
-                           ErrorInfo* error_info) {
+                           ErrorInfo* error_info, nacl::string url) {
   PLUGIN_PRINTF(("ServiceRuntime::Start (nacl_desc=%p)\n",
                  reinterpret_cast<void*>(nacl_desc)));
 
@@ -671,7 +671,7 @@ bool ServiceRuntime::Start(nacl::DescWrapper* nacl_desc,
     return false;
   }
   nacl::Handle sockets[3];
-  if (!tmp_subprocess->Start(NACL_ARRAY_SIZE(sockets), sockets)) {
+  if (!tmp_subprocess->Start(NACL_ARRAY_SIZE(sockets), sockets, url.c_str())) {
     PLUGIN_PRINTF(("ServiceRuntime::Start (start failed)\n"));
     error_info->SetReport(ERROR_SEL_LDR_LAUNCH,
                           "ServiceRuntime: failed to start");
diff --git a/ppapi/native_client/src/trusted/plugin/service_runtime.h b/ppapi/native_client/src/trusted/plugin/service_runtime.h
index 77add65..1729cc5 100644
--- a/ppapi/native_client/src/trusted/plugin/service_runtime.h
+++ b/ppapi/native_client/src/trusted/plugin/service_runtime.h
@@ -217,7 +217,9 @@ class ServiceRuntime {
   // to be started is passed through |nacl_file_desc|.  On success, returns
   // true.  On failure, returns false and |error_string| is set to something
   // describing the error.
-  bool Start(nacl::DescWrapper* nacl_file_desc, ErrorInfo* error_info);
+  bool Start(nacl::DescWrapper* nacl_file_desc,
+             ErrorInfo* error_info,
+             nacl::string url);
 
   // Starts the application channel to the nexe.
   SrpcClient* SetupAppChannel();