NaCl: Update to use new embedding interface provided by chrome_main.h

BUG=https://code.google.com/p/nativeclient/issues/detail?id=3734
BUG=https://code.google.com/p/nativeclient/issues/detail?id=2832

Review URL: https://codereview.chromium.org/137623018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249370 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 19 insertions, 8 deletions

diff --git a/components/nacl/loader/nacl_listener.cc b/components/nacl/loader/nacl_listener.cc
index 0866f26..3afbff97 100644
--- a/components/nacl/loader/nacl_listener.cc
+++ b/components/nacl/loader/nacl_listener.cc
@@ -24,7 +24,8 @@
 #include "ipc/ipc_switches.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/ipc_sync_message_filter.h"
-#include "native_client/src/trusted/service_runtime/sel_main_chrome.h"
+#include "native_client/src/public/chrome_main.h"
+#include "native_client/src/public/nacl_app.h"
 #include "native_client/src/trusted/validator/nacl_file_info.h"
 
 #if defined(OS_POSIX)
@@ -233,11 +234,26 @@ bool NaClListener::OnMessageReceived(const IPC::Message& msg) {
 }
 
 void NaClListener::OnStart(const nacl::NaClStartParams& params) {
+#if defined(OS_LINUX) || defined(OS_MACOSX)
+  int urandom_fd = dup(base::GetUrandomFD());
+  if (urandom_fd < 0) {
+    LOG(ERROR) << "Failed to dup() the urandom FD";
+    return;
+  }
+  NaClChromeMainSetUrandomFd(urandom_fd);
+#endif
+
+  NaClChromeMainInit();
   struct NaClChromeMainArgs *args = NaClChromeMainArgsCreate();
   if (args == NULL) {
     LOG(ERROR) << "NaClChromeMainArgsCreate() failed";
     return;
   }
+  struct NaClApp *nap = NaClAppCreate();
+  if (nap == NULL) {
+    LOG(ERROR) << "NaClAppCreate() failed";
+    return;
+  }
 
   if (params.enable_ipc_proxy) {
     // Create the initial PPAPI IPC channel between the NaCl IRT and the
@@ -251,7 +267,7 @@ void NaClListener::OnStart(const nacl::NaClStartParams& params) {
 
     // Pass a NaClDesc to the untrusted side. This will hold a ref to the
     // NaClIPCAdapter.
-    args->initial_ipc_desc = ipc_adapter->MakeNaClDesc();
+    NaClAppSetDesc(nap, NACL_CHROME_DESC_BASE, ipc_adapter->MakeNaClDesc());
 #if defined(OS_POSIX)
     handle.socket = base::FileDescriptor(
         ipc_adapter->TakeClientFileDescriptor(), true);
@@ -263,11 +279,6 @@ void NaClListener::OnStart(const nacl::NaClStartParams& params) {
   std::vector<nacl::FileDescriptor> handles = params.handles;
 
 #if defined(OS_LINUX) || defined(OS_MACOSX)
-  args->urandom_fd = dup(base::GetUrandomFD());
-  if (args->urandom_fd < 0) {
-    LOG(ERROR) << "Failed to dup() the urandom FD";
-    return;
-  }
   args->number_of_cores = number_of_cores_;
   args->create_memory_object_func = CreateMemoryObject;
 # if defined(OS_MACOSX)
@@ -340,6 +351,6 @@ void NaClListener::OnStart(const nacl::NaClStartParams& params) {
     return;
   }
 #endif
-  NaClChromeMainStart(args);
+  NaClChromeMainStartApp(nap, args);
   NOTREACHED();
 }