NaCl: Cleanup: Get some definitions from header file

chrome/nacl/nacl_listener.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 "chrome/nacl/nacl_listener.h"
 
 #include <errno.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "chrome/common/nacl_messages.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_switches.h"
 #include "native_client/src/shared/imc/nacl_imc.h"
+#include "native_client/src/trusted/service_runtime/sel_main_chrome.h"
 
 #if defined(OS_LINUX)
 #include "content/public/common/child_process_sandbox_support_linux.h"
 #endif
 
 #if defined(OS_WIN)
 #include <fcntl.h>
 #include <io.h>
 #endif
 
-// This is ugly.  We need an interface header file for the exported
-// sel_ldr interfaces.
-// TODO(gregoryd,sehr): Add an interface header.
-#if defined(OS_WIN)
-typedef HANDLE NaClHandle;
-#else
-typedef int NaClHandle;
-#endif  // NaClHandle
-
 #if defined(OS_MACOSX)
 namespace {
 
 // On Mac OS X, shm_open() works in the sandbox but does not give us
 // an FD that we can map as PROT_EXEC.  Rather than doing an IPC to
 // get an executable SHM region when CreateMemoryObject() is called,
 // we preallocate one on startup, since NaCl's sel_ldr only needs one
 // of them.  This saves a round trip.
 
 base::subtle::Atomic32 g_shm_fd = -1;
@@ skipping 16 matching lines @@
       return result_fd;
     }
   }
   // Fall back to NaCl's default implementation.
   return -1;
 }
 
 }  // namespace
 #endif  // defined(OS_MACOSX)
 
-extern "C" void NaClMainForChromium(int handle_count,
-                                    const NaClHandle* handles,
-                                    int debug);
-extern "C" void NaClSetIrtFileDesc(int fd);
-
 NaClListener::NaClListener() : debug_enabled_(false) {}
 
 NaClListener::~NaClListener() {}
 
 void NaClListener::Listen() {
   std::string channel_name =
       CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kProcessChannelID);
   IPC::Channel channel(channel_name, IPC::Channel::MODE_CLIENT, this);
   CHECK(channel.Connect());
@@ skipping 37 matching lines @@
   NaClSetIrtFileDesc(irt_desc);
 
   scoped_array<NaClHandle> array(new NaClHandle[handles.size()]);
   for (size_t i = 0; i < handles.size(); i++) {
     array[i] = nacl::ToNativeHandle(handles[i]);
   }
   NaClMainForChromium(static_cast<int>(handles.size()), array.get(),
                       debug_enabled_);
   NOTREACHED();
 }