NaCl: Remove unused process ID/handle arguments from launch_nacl_process()

This cleanup has been made possible by moving
sel_ldr_launcher_chrome.cc into the Chromium repo.

BUG=http://code.google.com/p/nativeclient/issues/detail?id=2750
TEST=build

Review URL: https://chromiumcodereview.appspot.com/10267027

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

3 files changed, 7 insertions, 32 deletions

diff --git a/ppapi/c/private/ppb_nacl_private.h b/ppapi/c/private/ppb_nacl_private.h
index 939f37f..1dcc9ee 100644
--- a/ppapi/c/private/ppb_nacl_private.h
+++ b/ppapi/c/private/ppb_nacl_private.h
@@ -8,19 +8,16 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
 
-#define PPB_NACL_PRIVATE_INTERFACE "PPB_NaCl(Private);0.3"
+#define PPB_NACL_PRIVATE_INTERFACE "PPB_NaCl(Private);0.4"
 
 struct PPB_NaCl_Private {
   // This function launches NaCl's sel_ldr process.  On success, the function
   // returns true, otherwise it returns false.  When it returns true, it will
-  // write |socket_count| nacl::Handles to imc_handles and will write the
-  // nacl::Handle of the created process to |nacl_process_handle|.  Finally,
-  // the function will write the process ID of the created process to
-  // |nacl_process_id|.  Unless EnableBackgroundSelLdrLaunch is called, this
-  // method must be invoked from the main thread.
+  // write |socket_count| nacl::Handles to imc_handles.  Unless
+  // EnableBackgroundSelLdrLaunch is called, this method must be invoked from
+  // the main thread.
   bool (*LaunchSelLdr)(const char* alleged_url, int socket_count,
-                       void* imc_handles, void* nacl_process_handle,
-                       int* nacl_process_id);
+                       void* imc_handles);
 
   // On POSIX systems, this function returns the file descriptor of
   // /dev/urandom.  On non-POSIX systems, this function returns 0.
diff --git a/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h b/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h
index 6ba93fe..7c60ad8 100644
--- a/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h
+++ b/ppapi/native_client/src/trusted/plugin/nacl_entry_points.h
@@ -17,9 +17,7 @@
 
 typedef bool (*LaunchNaClProcessFunc)(const char* url,
                                       int socket_count,
-                                      nacl::Handle* result_sockets,
-                                      nacl::Handle* nacl_process_handle,
-                                      int* nacl_process_id);
+                                      nacl::Handle* result_sockets);
 
 typedef int (*GetURandomFDFunc)(void);
 
diff --git a/ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc b/ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc
index f5b6c9f..c32209b 100644
--- a/ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc
+++ b/ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.cc
@@ -6,38 +6,18 @@
 
 #include "native_client/src/trusted/plugin/nacl_entry_points.h"
 
-#if NACL_WINDOWS
-# include <windows.h>
-#endif
-
 LaunchNaClProcessFunc launch_nacl_process = NULL;
 
 namespace plugin {
 
 bool SelLdrLauncherChrome::Start(const char* url) {
   // send a synchronous message to the browser process
-  // TODO(mseaborn): Remove the nacl_proc_handle and nacl_proc_id
-  // arguments.  Chromium is being changed not to give the renderer
-  // the Windows handle of the NaCl process.
-  nacl::Handle nacl_proc_handle;
-  int nacl_proc_id;
   // TODO(sehr): This is asserted to be one.  Remove this parameter.
   static const int kNumberOfChannelsToBeCreated = 1;
   if (!launch_nacl_process ||
-      !launch_nacl_process(url,
-                           kNumberOfChannelsToBeCreated,
-                           &channel_,
-                           &nacl_proc_handle,
-                           &nacl_proc_id)) {
+      !launch_nacl_process(url, kNumberOfChannelsToBeCreated, &channel_)) {
     return false;
   }
-
-#if NACL_WINDOWS
-  if (nacl_proc_handle != nacl::kInvalidHandle &&
-      nacl_proc_handle != NULL) {
-    CloseHandle(nacl_proc_handle);
-  }
-#endif
   return true;
 }