NaCl: Cleanup: Get some definitions from header file

chrome/nacl/nacl_listener.cc

Index: chrome/nacl/nacl_listener.cc
diff --git a/chrome/nacl/nacl_listener.cc b/chrome/nacl/nacl_listener.cc
index 55f7e432f62d97a77b58583414b5717d5843e164..81ea2ac0456f018d0574fecb47adabc79a2a0ff8 100644
--- a/chrome/nacl/nacl_listener.cc
+++ b/chrome/nacl/nacl_listener.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -14,6 +14,7 @@
 #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"
@@ -24,15 +25,6 @@
 #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 {
 
@@ -69,11 +61,6 @@ int CreateMemoryObject(size_t size, bool executable) {
 }  // 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() {}